December 2023 - Linux-stable-mirror

stable-rc/queue/6.1 baseline: 111 runs, 3 regressions (v6.1.68-106-gdfaaf0666f4b)

by kernelci.org bot

stable-rc/queue/6.1 baseline: 111 runs, 3 regressions (v6.1.68-106-gdfaaf0666f4b) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions -------------------+-------+---------------+----------+-----------+------------ r8a77960-ulcb | arm64 | lab-collabora | gcc-10 | defconfig | 1 sun50i-h6-pine-h64 | arm64 | lab-clabbe | gcc-10 | defconfig | 1 sun50i-h6-pine-h64 | arm64 | lab-collabora | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/job/stable-rc/branch/queue%2F6.1/kernel/v6.1.68-1… Test: baseline Tree: stable-rc Branch: queue/6.1 Describe: v6.1.68-106-gdfaaf0666f4b URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: dfaaf0666f4b0e8c0c373f37876d20c20ef7c375 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions -------------------+-------+---------------+----------+-----------+------------ r8a77960-ulcb | arm64 | lab-collabora | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/65815d3cfa8a4b7efae134e6 Results: 4 PASS, 2 FAIL, 1 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.68-106-gdfaaf0666f4b… HTML log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.68-106-gdfaaf0666f4b… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/65815d3cfa8a4b7efae134eb failing since 26 days (last pass: v6.1.31-26-gef50524405c2, first fail: v6.1.63-176-gecc0fed1ffa4) 2023-12-19T09:14:25.807290 / # # 2023-12-19T09:14:25.909414 export SHELL=/bin/sh 2023-12-19T09:14:25.909643 # 2023-12-19T09:14:26.010443 / # export SHELL=/bin/sh. /lava-12312051/environment 2023-12-19T09:14:26.011106 2023-12-19T09:14:26.112405 / # . /lava-12312051/environment/lava-12312051/bin/lava-test-runner /lava-12312051/1 2023-12-19T09:14:26.113516 2023-12-19T09:14:26.115555 / # /lava-12312051/bin/lava-test-runner /lava-12312051/1 2023-12-19T09:14:26.179208 + export 'TESTRUN_ID=1_bootrr' 2023-12-19T09:14:26.179722 + cd /lav<8>[ 19.093063] <LAVA_SIGNAL_STARTRUN 1_bootrr 12312051_1.5.2.4.5> ... (28 line(s) more) platform | arch | lab | compiler | defconfig | regressions -------------------+-------+---------------+----------+-----------+------------ sun50i-h6-pine-h64 | arm64 | lab-clabbe | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/65815d3c3183c0e089e13476 Results: 5 PASS, 1 FAIL, 1 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.68-106-gdfaaf0666f4b… HTML log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.68-106-gdfaaf0666f4b… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/65815d3c3183c0e089e1347b failing since 26 days (last pass: v6.1.22-372-g971903477e72, first fail: v6.1.63-176-gecc0fed1ffa4) 2023-12-19T09:06:46.560334 <8>[ 18.055588] <LAVA_SIGNAL_ENDRUN 0_dmesg 448913_1.5.2.4.1> 2023-12-19T09:06:46.665312 / # # 2023-12-19T09:06:46.767022 export SHELL=/bin/sh 2023-12-19T09:06:46.767745 # 2023-12-19T09:06:46.868753 / # export SHELL=/bin/sh. /lava-448913/environment 2023-12-19T09:06:46.869356 2023-12-19T09:06:46.970407 / # . /lava-448913/environment/lava-448913/bin/lava-test-runner /lava-448913/1 2023-12-19T09:06:46.971368 2023-12-19T09:06:46.975683 / # /lava-448913/bin/lava-test-runner /lava-448913/1 2023-12-19T09:06:47.048741 + export 'TESTRUN_ID=1_bootrr' ... (12 line(s) more) platform | arch | lab | compiler | defconfig | regressions -------------------+-------+---------------+----------+-----------+------------ sun50i-h6-pine-h64 | arm64 | lab-collabora | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/65815d3d4f05eb2ff7e134af Results: 5 PASS, 1 FAIL, 1 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.68-106-gdfaaf0666f4b… HTML log: https://storage.kernelci.org//stable-rc/queue-6.1/v6.1.68-106-gdfaaf0666f4b… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/65815d3d4f05eb2ff7e134b4 failing since 26 days (last pass: v6.1.22-372-g971903477e72, first fail: v6.1.63-176-gecc0fed1ffa4) 2023-12-19T09:14:36.663266 / # # 2023-12-19T09:14:36.765355 export SHELL=/bin/sh 2023-12-19T09:14:36.766051 # 2023-12-19T09:14:36.867456 / # export SHELL=/bin/sh. /lava-12312056/environment 2023-12-19T09:14:36.868137 2023-12-19T09:14:36.969490 / # . /lava-12312056/environment/lava-12312056/bin/lava-test-runner /lava-12312056/1 2023-12-19T09:14:36.970544 2023-12-19T09:14:36.987404 / # /lava-12312056/bin/lava-test-runner /lava-12312056/1 2023-12-19T09:14:37.053130 + export 'TESTRUN_ID=1_bootrr' 2023-12-19T09:14:37.053624 + cd /lava-1231205<8>[ 19.184402] <LAVA_SIGNAL_STARTRUN 1_bootrr 12312056_1.5.2.4.5> ... (11 line(s) more)

10 months, 1 week

1
0
0 0

KernelCI stable-rc/linux-5.4.y report (19/12/2023)

by Shreeya Patel

Hi Everyone, Please find the KernelCI report for stable-rc/linux-5.4.y for this week. ## stable-rc HEAD for linux-5.4.y: Date: 2023-12-18 https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/… ## Build failures: No build failures seen for the stable-rc/linux-5.4.y commit head \o/ ## Boot failures: No **new** boot failures seen for the stable-rc/linux-5.4.y commit head \o/ Tested-by: kernelci.org bot <bot(a)kernelci.org> Thanks, Shreeya Patel

10 months, 1 week

1
0
0 0

KernelCI stable-rc/linux-5.10.y report (19/12/2023)

by Shreeya Patel

Hi Everyone, Please find the KernelCI report for stable-rc/linux-5.10.y for this week. ## stable-rc HEAD for linux-5.10.y: Date: 2023-12-18 https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/… ## Build failures: arm64: - defconfig and defconfig+arm64-chromebook (gcc-10) - Build details :- https://linux.kernelci.org/build/id/65806f8b090acab9cbe134e1/ - Errors :- drivers/gpu/drm/sun4i/sun4i_crtc.c:63:37: error: implicit declaration of function ‘drm_atomic_get_old_crtc_state’ [-Werror=implicit-function-declaration] arm: - multi_v7_defconfig (gcc-10) - Build details :- https://linux.kernelci.org/build/id/65806f2d8bfb9b6ed5e13499/ - Errors :- drivers/gpu/drm/sun4i/sun4i_crtc.c:63:37: error: implicit declaration of function ‘drm_atomic_get_old_crtc_state’ [-Werror=implicit-function-declaration] ## Boot failures: No **new** boot failures seen for the stable-rc/linux-5.10.y commit head \o/ Tested-by: kernelci.org bot <bot(a)kernelci.org> Thanks, Shreeya Patel

10 months, 1 week

1
0
0 0

KernelCI stable-rc/linux-5.15.y report (19/12/2023)

by Shreeya Patel

Hi Everyone, Please find the KernelCI report for stable-rc/linux-5.15.y for this week. ## stable-rc HEAD for linux-5.15.y: Date: 2023-12-18 https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/… ## Build failures: No build failures seen for the stable-rc/linux-5.15.y commit head \o/ ## Boot failures: No **new** boot failures seen for the stable-rc/linux-5.15.y commit head \o/ Tested-by: kernelci.org bot <bot(a)kernelci.org> Thanks, Shreeya Patel

10 months, 1 week

1
0
0 0

stable-rc/queue/5.10 baseline: 104 runs, 6 regressions (v5.10.204-60-g55a7662a657f)

by kernelci.org bot

stable-rc/queue/5.10 baseline: 104 runs, 6 regressions (v5.10.204-60-g55a7662a657f) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions -------------------+-------+---------------+----------+----------------------------+------------ beaglebone-black | arm | lab-broonie | gcc-10 | omap2plus_defconfig | 1 r8a77960-ulcb | arm64 | lab-collabora | gcc-10 | defconfig | 1 rk3399-gru-kevin | arm64 | lab-collabora | gcc-10 | defconfig+arm64-chromebook | 2 sun50i-h6-pine-h64 | arm64 | lab-clabbe | gcc-10 | defconfig | 1 sun50i-h6-pine-h64 | arm64 | lab-collabora | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/job/stable-rc/branch/queue%2F5.10/kernel/v5.10.20… Test: baseline Tree: stable-rc Branch: queue/5.10 Describe: v5.10.204-60-g55a7662a657f URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: 55a7662a657ff853af91cde3dd39e2200d958ac9 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions -------------------+-------+---------------+----------+----------------------------+------------ beaglebone-black | arm | lab-broonie | gcc-10 | omap2plus_defconfig | 1 Details: https://kernelci.org/test/plan/id/65815ad5251a53aa64e13480 Results: 51 PASS, 4 FAIL, 1 SKIP Full config: omap2plus_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.204-60-g55a7662a65… HTML log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.204-60-g55a7662a65… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/65815ad5251a53aa64e134b6 failing since 308 days (last pass: v5.10.167-127-g921934d621e4, first fail: v5.10.167-139-gf9519a5a1701) 2023-12-19T08:56:35.341182 <8>[ 18.699307] <LAVA_SIGNAL_ENDRUN 0_dmesg 372893_1.5.2.4.1> 2023-12-19T08:56:35.452826 / # # 2023-12-19T08:56:35.555838 export SHELL=/bin/sh 2023-12-19T08:56:35.556730 # 2023-12-19T08:56:35.658843 / # export SHELL=/bin/sh. /lava-372893/environment 2023-12-19T08:56:35.659735 2023-12-19T08:56:35.761910 / # . /lava-372893/environment/lava-372893/bin/lava-test-runner /lava-372893/1 2023-12-19T08:56:35.763257 2023-12-19T08:56:35.767348 / # /lava-372893/bin/lava-test-runner /lava-372893/1 2023-12-19T08:56:35.864735 + export 'TESTRUN_ID=1_bootrr' ... (11 line(s) more) platform | arch | lab | compiler | defconfig | regressions -------------------+-------+---------------+----------+----------------------------+------------ r8a77960-ulcb | arm64 | lab-collabora | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/65815aba626e75a84de1347e Results: 4 PASS, 2 FAIL, 1 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.204-60-g55a7662a65… HTML log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.204-60-g55a7662a65… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/65815aba626e75a84de13483 failing since 26 days (last pass: v5.10.181-18-g1622068b57a4, first fail: v5.10.201-98-g6f84b6dba25c) 2023-12-19T09:03:52.342872 / # # 2023-12-19T09:03:52.445054 export SHELL=/bin/sh 2023-12-19T09:03:52.445772 # 2023-12-19T09:03:52.547177 / # export SHELL=/bin/sh. /lava-12311888/environment 2023-12-19T09:03:52.547892 2023-12-19T09:03:52.649385 / # . /lava-12311888/environment/lava-12311888/bin/lava-test-runner /lava-12311888/1 2023-12-19T09:03:52.650481 2023-12-19T09:03:52.667167 / # /lava-12311888/bin/lava-test-runner /lava-12311888/1 2023-12-19T09:03:52.715918 + export 'TESTRUN_ID=1_bootrr' 2023-12-19T09:03:52.716447 + cd /lav<8>[ 16.495124] <LAVA_SIGNAL_STARTRUN 1_bootrr 12311888_1.5.2.4.5> ... (28 line(s) more) platform | arch | lab | compiler | defconfig | regressions -------------------+-------+---------------+----------+----------------------------+------------ rk3399-gru-kevin | arm64 | lab-collabora | gcc-10 | defconfig+arm64-chromebook | 2 Details: https://kernelci.org/test/plan/id/65815bf8e5ec8c3522e13487 Results: 84 PASS, 2 FAIL, 1 SKIP Full config: defconfig+arm64-chromebook Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.204-60-g55a7662a65… HTML log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.204-60-g55a7662a65… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.rockchip-usb2phy1-probed: https://kernelci.org/test/case/id/65815bf8e5ec8c3522e1348d failing since 280 days (last pass: v5.10.172-529-g06956b9e9396, first fail: v5.10.173-69-gfcbe6bd469ed) 2023-12-19T09:01:28.689834 /lava-12312008/1/../bin/lava-test-case 2023-12-19T09:01:28.700993 <8>[ 62.105120] <LAVA_SIGNAL_TESTCASE TEST_CASE_ID=rockchip-usb2phy1-probed RESULT=fail> * baseline.bootrr.rockchip-usb2phy0-probed: https://kernelci.org/test/case/id/65815bf8e5ec8c3522e1348e failing since 280 days (last pass: v5.10.172-529-g06956b9e9396, first fail: v5.10.173-69-gfcbe6bd469ed) 2023-12-19T09:01:27.653879 /lava-12312008/1/../bin/lava-test-case 2023-12-19T09:01:27.664471 <8>[ 61.068527] <LAVA_SIGNAL_TESTCASE TEST_CASE_ID=rockchip-usb2phy0-probed RESULT=fail> platform | arch | lab | compiler | defconfig | regressions -------------------+-------+---------------+----------+----------------------------+------------ sun50i-h6-pine-h64 | arm64 | lab-clabbe | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/65815ad08ec4296377e134df Results: 5 PASS, 1 FAIL, 1 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.204-60-g55a7662a65… HTML log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.204-60-g55a7662a65… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/65815ad08ec4296377e134e4 failing since 26 days (last pass: v5.10.181-18-g1622068b57a4, first fail: v5.10.201-98-g6f84b6dba25c) 2023-12-19T08:56:23.404112 <8>[ 16.954925] <LAVA_SIGNAL_ENDRUN 0_dmesg 448910_1.5.2.4.1> 2023-12-19T08:56:23.509170 / # # 2023-12-19T08:56:23.610750 export SHELL=/bin/sh 2023-12-19T08:56:23.611358 # 2023-12-19T08:56:23.712340 / # export SHELL=/bin/sh. /lava-448910/environment 2023-12-19T08:56:23.712919 2023-12-19T08:56:23.813918 / # . /lava-448910/environment/lava-448910/bin/lava-test-runner /lava-448910/1 2023-12-19T08:56:23.814811 2023-12-19T08:56:23.819433 / # /lava-448910/bin/lava-test-runner /lava-448910/1 2023-12-19T08:56:23.885452 + export 'TESTRUN_ID=1_bootrr' ... (11 line(s) more) platform | arch | lab | compiler | defconfig | regressions -------------------+-------+---------------+----------+----------------------------+------------ sun50i-h6-pine-h64 | arm64 | lab-collabora | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/65815ace4c16ffdef3e134f6 Results: 5 PASS, 1 FAIL, 1 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.204-60-g55a7662a65… HTML log: https://storage.kernelci.org//stable-rc/queue-5.10/v5.10.204-60-g55a7662a65… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/65815ace4c16ffdef3e134fb failing since 26 days (last pass: v5.10.181-18-g1622068b57a4, first fail: v5.10.201-98-g6f84b6dba25c) 2023-12-19T09:04:07.804413 / # # 2023-12-19T09:04:07.906484 export SHELL=/bin/sh 2023-12-19T09:04:07.907175 # 2023-12-19T09:04:08.008563 / # export SHELL=/bin/sh. /lava-12311889/environment 2023-12-19T09:04:08.009261 2023-12-19T09:04:08.110683 / # . /lava-12311889/environment/lava-12311889/bin/lava-test-runner /lava-12311889/1 2023-12-19T09:04:08.111739 2023-12-19T09:04:08.128790 / # /lava-12311889/bin/lava-test-runner /lava-12311889/1 2023-12-19T09:04:08.172845 + export 'TESTRUN_ID=1_bootrr' 2023-12-19T09:04:08.188027 + cd /lava-1231188<8>[ 18.241804] <LAVA_SIGNAL_STARTRUN 1_bootrr 12311889_1.5.2.4.5> ... (10 line(s) more)

10 months, 1 week

1
0
0 0

[PATCH 4.19 00/36] 4.19.303-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.19.303 release. There are 36 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 20 Dec 2023 13:50:31 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.303-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.19.303-rc1 Naveen N Rao <naveen(a)kernel.org> powerpc/ftrace: Fix stack teardown in ftrace_no_trace Naveen N Rao <naveen(a)kernel.org> powerpc/ftrace: Create a dummy stackframe to fix stack unwind Adrian Hunter <adrian.hunter(a)intel.com> mmc: block: Be sure to wait while busy in CQE error recovery Steven Rostedt (Google) <rostedt(a)goodmis.org> ring-buffer: Fix memory leak of free page Florent Revest <revest(a)chromium.org> team: Fix use-after-free when an option instance allocation fails James Houghton <jthoughton(a)google.com> arm64: mm: Always make sw-dirty PTEs hw-dirty in pte_modify Baokun Li <libaokun1(a)huawei.com> ext4: prevent the normalized size from exceeding EXT_MAX_BLOCKS Mark Rutland <mark.rutland(a)arm.com> perf: Fix perf_event_validate_size() lockdep splat Denis Benato <benato.denis96(a)gmail.com> HID: hid-asus: add const to read-only outgoing usb buffer Lech Perczak <lech.perczak(a)gmail.com> net: usb: qmi_wwan: claim interface 4 for ZTE MF290 Linus Torvalds <torvalds(a)linux-foundation.org> asm-generic: qspinlock: fix queued_spin_value_unlocked() implementation Aoba K <nexp_0x17(a)outlook.com> HID: multitouch: Add quirk for HONOR GLO-GXXX touchpad Denis Benato <benato.denis96(a)gmail.com> HID: hid-asus: reset the backlight brightness level on resume Oliver Neukum <oneukum(a)suse.com> HID: add ALWAYS_POLL quirk for Apple kb Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> platform/x86: intel_telemetry: Fix kernel doc descriptions Coly Li <colyli(a)suse.de> bcache: avoid NULL checking to c->root in run_cache_set() Coly Li <colyli(a)suse.de> bcache: add code comments for bch_btree_node_get() and __bch_btree_node_alloc() Coly Li <colyli(a)suse.de> bcache: avoid oversize memory allocation by small stripe_size Ming Lei <ming.lei(a)redhat.com> blk-throttle: fix lockdep warning of "cgroup_mutex or RCU read lock required!" Jens Axboe <axboe(a)kernel.dk> cred: switch to using atomic_long_t Bjorn Helgaas <bhelgaas(a)google.com> Revert "PCI: acpiphp: Reassign resources on bridge if necessary" Hyunwoo Kim <v4bel(a)theori.io> appletalk: Fix Use-After-Free in atalk_ioctl Andrew Halaney <ahalaney(a)redhat.com> net: stmmac: Handle disabled MDIO busses from devicetree Rasmus Villemoes <linux(a)rasmusvillemoes.dk> net: stmmac: use dev_err_probe() for reporting mdio bus registration failure Eric Dumazet <edumazet(a)google.com> net: prevent mss overflow in skb_segment() Nikolay Kuratov <kniv(a)yandex-team.ru> vsock/virtio: Fix unsigned integer wrap around in virtio_transport_has_space() Yusong Gao <a869920004(a)gmail.com> sign-file: Fix incorrect return values check Dong Chenchen <dongchenchen2(a)huawei.com> net: Remove acked SYN flag from packet in the transmit queue correctly Dinghao Liu <dinghao.liu(a)zju.edu.cn> qed: Fix a potential use-after-free in qed_cxt_tables_alloc Hyunwoo Kim <v4bel(a)theori.io> net/rose: Fix Use-After-Free in rose_ioctl Hyunwoo Kim <v4bel(a)theori.io> atm: Fix Use-After-Free in do_vcc_ioctl Chengfeng Ye <dg573847474(a)gmail.com> atm: solos-pci: Fix potential deadlock on &tx_queue_lock Chengfeng Ye <dg573847474(a)gmail.com> atm: solos-pci: Fix potential deadlock on &cli_queue_lock Stefan Wahren <wahrenst(a)gmx.net> qca_spi: Fix reset behavior Stefan Wahren <wahrenst(a)gmx.net> qca_debug: Fix ethtool -G iface tx behavior Stefan Wahren <wahrenst(a)gmx.net> qca_debug: Prevent crash on TX ring changes ------------- Diffstat: Makefile | 4 +- arch/arm64/include/asm/pgtable.h | 6 +++ arch/powerpc/kernel/trace/ftrace_64_mprofile.S | 17 ++++-- block/blk-throttle.c | 2 + drivers/atm/solos-pci.c | 8 +-- drivers/hid/hid-asus.c | 25 +++++++-- drivers/hid/hid-multitouch.c | 5 ++ drivers/hid/hid-quirks.c | 1 + drivers/md/bcache/bcache.h | 1 + drivers/md/bcache/btree.c | 7 +++ drivers/md/bcache/super.c | 4 +- drivers/mmc/core/core.c | 2 + drivers/mmc/core/mmc_ops.c | 5 +- drivers/mmc/core/mmc_ops.h | 2 + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 1 + drivers/net/ethernet/qualcomm/qca_debug.c | 17 +++--- drivers/net/ethernet/qualcomm/qca_spi.c | 20 ++++++- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 6 ++- drivers/net/team/team.c | 4 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/pci/hotplug/acpiphp_glue.c | 9 ++-- drivers/platform/x86/intel_telemetry_core.c | 4 +- fs/ext4/mballoc.c | 4 ++ include/asm-generic/qspinlock.h | 2 +- include/linux/cred.h | 6 +-- kernel/cred.c | 66 +++++++++++------------ kernel/events/core.c | 10 ++++ kernel/trace/ring_buffer.c | 2 + net/appletalk/ddp.c | 9 ++-- net/atm/ioctl.c | 7 ++- net/core/skbuff.c | 3 +- net/ipv4/tcp_output.c | 6 +++ net/rose/af_rose.c | 4 +- net/vmw_vsock/virtio_transport_common.c | 2 +- scripts/sign-file.c | 12 ++--- 36 files changed, 197 insertions(+), 89 deletions(-)

10 months, 1 week

6
45
0 0

[PATCH 4.14 00/26] 4.14.334-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.334 release. There are 26 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 20 Dec 2023 13:50:31 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.334-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.14.334-rc1 Naveen N Rao <naveen(a)kernel.org> powerpc/ftrace: Fix stack teardown in ftrace_no_trace Naveen N Rao <naveen(a)kernel.org> powerpc/ftrace: Create a dummy stackframe to fix stack unwind Steven Rostedt (Google) <rostedt(a)goodmis.org> ring-buffer: Fix memory leak of free page Florent Revest <revest(a)chromium.org> team: Fix use-after-free when an option instance allocation fails Baokun Li <libaokun1(a)huawei.com> ext4: prevent the normalized size from exceeding EXT_MAX_BLOCKS Denis Benato <benato.denis96(a)gmail.com> HID: hid-asus: add const to read-only outgoing usb buffer Lech Perczak <lech.perczak(a)gmail.com> net: usb: qmi_wwan: claim interface 4 for ZTE MF290 Linus Torvalds <torvalds(a)linux-foundation.org> asm-generic: qspinlock: fix queued_spin_value_unlocked() implementation Aoba K <nexp_0x17(a)outlook.com> HID: multitouch: Add quirk for HONOR GLO-GXXX touchpad Denis Benato <benato.denis96(a)gmail.com> HID: hid-asus: reset the backlight brightness level on resume Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> platform/x86: intel_telemetry: Fix kernel doc descriptions Coly Li <colyli(a)suse.de> bcache: add code comments for bch_btree_node_get() and __bch_btree_node_alloc() Ming Lei <ming.lei(a)redhat.com> blk-throttle: fix lockdep warning of "cgroup_mutex or RCU read lock required!" Jens Axboe <axboe(a)kernel.dk> cred: switch to using atomic_long_t Hyunwoo Kim <v4bel(a)theori.io> appletalk: Fix Use-After-Free in atalk_ioctl Nikolay Kuratov <kniv(a)yandex-team.ru> vsock/virtio: Fix unsigned integer wrap around in virtio_transport_has_space() Yusong Gao <a869920004(a)gmail.com> sign-file: Fix incorrect return values check Dong Chenchen <dongchenchen2(a)huawei.com> net: Remove acked SYN flag from packet in the transmit queue correctly Dinghao Liu <dinghao.liu(a)zju.edu.cn> qed: Fix a potential use-after-free in qed_cxt_tables_alloc Hyunwoo Kim <v4bel(a)theori.io> net/rose: Fix Use-After-Free in rose_ioctl Hyunwoo Kim <v4bel(a)theori.io> atm: Fix Use-After-Free in do_vcc_ioctl Chengfeng Ye <dg573847474(a)gmail.com> atm: solos-pci: Fix potential deadlock on &tx_queue_lock Chengfeng Ye <dg573847474(a)gmail.com> atm: solos-pci: Fix potential deadlock on &cli_queue_lock Stefan Wahren <wahrenst(a)gmx.net> qca_spi: Fix reset behavior Stefan Wahren <wahrenst(a)gmx.net> qca_debug: Fix ethtool -G iface tx behavior Stefan Wahren <wahrenst(a)gmx.net> qca_debug: Prevent crash on TX ring changes ------------- Diffstat: Makefile | 4 +- arch/powerpc/kernel/trace/ftrace_64_mprofile.S | 9 +++- block/blk-throttle.c | 2 + drivers/atm/solos-pci.c | 8 ++-- drivers/hid/hid-asus.c | 25 ++++++++-- drivers/hid/hid-multitouch.c | 5 ++ drivers/md/bcache/btree.c | 7 +++ drivers/net/ethernet/qlogic/qed/qed_cxt.c | 1 + drivers/net/ethernet/qualcomm/qca_debug.c | 17 +++---- drivers/net/ethernet/qualcomm/qca_spi.c | 20 +++++++- drivers/net/team/team.c | 4 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/platform/x86/intel_telemetry_core.c | 4 +- fs/ext4/mballoc.c | 4 ++ include/asm-generic/qspinlock.h | 2 +- include/linux/cred.h | 6 +-- kernel/cred.c | 66 +++++++++++++------------- kernel/trace/ring_buffer.c | 2 + net/appletalk/ddp.c | 9 ++-- net/atm/ioctl.c | 7 ++- net/ipv4/tcp_output.c | 6 +++ net/rose/af_rose.c | 4 +- net/vmw_vsock/virtio_transport_common.c | 2 +- scripts/sign-file.c | 12 ++--- 24 files changed, 152 insertions(+), 75 deletions(-)

10 months, 1 week

5
30
0 0

stable-rc/queue/4.14 build: 16 builds: 0 failed, 16 passed, 21 warnings (v4.14.333-26-g807dd53ac94a)

by kernelci.org bot

stable-rc/queue/4.14 build: 16 builds: 0 failed, 16 passed, 21 warnings (v4.14.333-26-g807dd53ac94a) Full Build Summary: https://kernelci.org/build/stable-rc/branch/queue%2F4.14/kernel/v4.14.333-2… Tree: stable-rc Branch: queue/4.14 Git Describe: v4.14.333-26-g807dd53ac94a Git Commit: 807dd53ac94af2e0b91bb47b6a58ff84c670dc17 Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Built: 6 unique architectures Warnings Detected: arc: arm64: arm: i386: allnoconfig (gcc-10): 3 warnings i386_defconfig (gcc-10): 3 warnings tinyconfig (gcc-10): 3 warnings mips: x86_64: allnoconfig (gcc-10): 3 warnings tinyconfig (gcc-10): 3 warnings x86_64_defconfig (gcc-10): 3 warnings x86_64_defconfig+x86-board (gcc-10): 3 warnings Warnings summary: 7 ld: warning: creating DT_TEXTREL in a PIE 4 ld: arch/x86/boot/compressed/head_64.o: warning: relocation in read-only section `.head.text' 4 Warning: synced file at 'tools/objtool/arch/x86/include/asm/insn.h' differs from latest kernel version at 'arch/x86/include/asm/insn.h' 3 ld: arch/x86/boot/compressed/head_32.o: warning: relocation in read-only section `.head.text' 3 arch/x86/entry/entry_32.S:480: Warning: no instruction mnemonic suffix given and no register operands; using default for `btr' Section mismatches summary: 3 WARNING: modpost: Found 1 section mismatch(es). ================================================================================ Detailed per-defconfig build reports: -------------------------------------------------------------------------------- 32r2el_defconfig (mips, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- allnoconfig (i386, gcc-10) — PASS, 0 errors, 3 warnings, 0 section mismatches Warnings: arch/x86/entry/entry_32.S:480: Warning: no instruction mnemonic suffix given and no register operands; using default for `btr' ld: arch/x86/boot/compressed/head_32.o: warning: relocation in read-only section `.head.text' ld: warning: creating DT_TEXTREL in a PIE -------------------------------------------------------------------------------- allnoconfig (x86_64, gcc-10) — PASS, 0 errors, 3 warnings, 0 section mismatches Warnings: Warning: synced file at 'tools/objtool/arch/x86/include/asm/insn.h' differs from latest kernel version at 'arch/x86/include/asm/insn.h' ld: arch/x86/boot/compressed/head_64.o: warning: relocation in read-only section `.head.text' ld: warning: creating DT_TEXTREL in a PIE -------------------------------------------------------------------------------- defconfig (arm64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches Section mismatches: WARNING: modpost: Found 1 section mismatch(es). -------------------------------------------------------------------------------- defconfig+arm64-chromebook (arm64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches Section mismatches: WARNING: modpost: Found 1 section mismatch(es). -------------------------------------------------------------------------------- haps_hs_smp_defconfig (arc, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- i386_defconfig (i386, gcc-10) — PASS, 0 errors, 3 warnings, 0 section mismatches Warnings: arch/x86/entry/entry_32.S:480: Warning: no instruction mnemonic suffix given and no register operands; using default for `btr' ld: arch/x86/boot/compressed/head_32.o: warning: relocation in read-only section `.head.text' ld: warning: creating DT_TEXTREL in a PIE -------------------------------------------------------------------------------- imx_v6_v7_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- multi_v5_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches Section mismatches: WARNING: modpost: Found 1 section mismatch(es). -------------------------------------------------------------------------------- multi_v7_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- omap2plus_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tinyconfig (x86_64, gcc-10) — PASS, 0 errors, 3 warnings, 0 section mismatches Warnings: Warning: synced file at 'tools/objtool/arch/x86/include/asm/insn.h' differs from latest kernel version at 'arch/x86/include/asm/insn.h' ld: arch/x86/boot/compressed/head_64.o: warning: relocation in read-only section `.head.text' ld: warning: creating DT_TEXTREL in a PIE -------------------------------------------------------------------------------- tinyconfig (i386, gcc-10) — PASS, 0 errors, 3 warnings, 0 section mismatches Warnings: arch/x86/entry/entry_32.S:480: Warning: no instruction mnemonic suffix given and no register operands; using default for `btr' ld: arch/x86/boot/compressed/head_32.o: warning: relocation in read-only section `.head.text' ld: warning: creating DT_TEXTREL in a PIE -------------------------------------------------------------------------------- vexpress_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- x86_64_defconfig (x86_64, gcc-10) — PASS, 0 errors, 3 warnings, 0 section mismatches Warnings: Warning: synced file at 'tools/objtool/arch/x86/include/asm/insn.h' differs from latest kernel version at 'arch/x86/include/asm/insn.h' ld: arch/x86/boot/compressed/head_64.o: warning: relocation in read-only section `.head.text' ld: warning: creating DT_TEXTREL in a PIE -------------------------------------------------------------------------------- x86_64_defconfig+x86-board (x86_64, gcc-10) — PASS, 0 errors, 3 warnings, 0 section mismatches Warnings: Warning: synced file at 'tools/objtool/arch/x86/include/asm/insn.h' differs from latest kernel version at 'arch/x86/include/asm/insn.h' ld: arch/x86/boot/compressed/head_64.o: warning: relocation in read-only section `.head.text' ld: warning: creating DT_TEXTREL in a PIE --- For more info write to <info(a)kernelci.org>

10 months, 1 week

1
0
0 0

stable-rc/linux-5.10.y build: 19 builds: 0 failed, 19 passed, 5 warnings (v5.10.204-61-g163d4e782432)

by kernelci.org bot

stable-rc/linux-5.10.y build: 19 builds: 0 failed, 19 passed, 5 warnings (v5.10.204-61-g163d4e782432) Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-5.10.y/kernel/v5.10.204-6… Tree: stable-rc Branch: linux-5.10.y Git Describe: v5.10.204-61-g163d4e782432 Git Commit: 163d4e78243233162937b69caa8e5368a4fba1b0 Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Built: 7 unique architectures Warnings Detected: arc: arm64: arm: i386: mips: 32r2el_defconfig (gcc-10): 1 warning riscv: rv32_defconfig (gcc-10): 4 warnings x86_64: Warnings summary: 2 <stdin>:830:2: warning: #warning syscall fstat64 not implemented [-Wcpp] 2 <stdin>:1127:2: warning: #warning syscall fstatat64 not implemented [-Wcpp] 1 WARNING: modpost: Symbol info of vmlinux is missing. Unresolved symbol check will be entirely skipped. ================================================================================ Detailed per-defconfig build reports: -------------------------------------------------------------------------------- 32r2el_defconfig (mips, gcc-10) — PASS, 0 errors, 1 warning, 0 section mismatches Warnings: WARNING: modpost: Symbol info of vmlinux is missing. Unresolved symbol check will be entirely skipped. -------------------------------------------------------------------------------- allnoconfig (i386, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- allnoconfig (x86_64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- defconfig (riscv, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- defconfig (arm64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- defconfig+arm64-chromebook (arm64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- haps_hs_smp_defconfig (arc, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- i386_defconfig (i386, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- imx_v6_v7_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- multi_v5_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- multi_v7_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- nommu_k210_defconfig (riscv, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- omap2plus_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- rv32_defconfig (riscv, gcc-10) — PASS, 0 errors, 4 warnings, 0 section mismatches Warnings: <stdin>:830:2: warning: #warning syscall fstat64 not implemented [-Wcpp] <stdin>:1127:2: warning: #warning syscall fstatat64 not implemented [-Wcpp] <stdin>:830:2: warning: #warning syscall fstat64 not implemented [-Wcpp] <stdin>:1127:2: warning: #warning syscall fstatat64 not implemented [-Wcpp] -------------------------------------------------------------------------------- tinyconfig (i386, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tinyconfig (x86_64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- vexpress_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- x86_64_defconfig (x86_64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- x86_64_defconfig+x86-board (x86_64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches --- For more info write to <info(a)kernelci.org>

10 months, 1 week

1
0
0 0

[PATCH net v3] net: ks8851: Fix TX stall caused by TX buffer overrun

by Ronald Wahl

From: Ronald Wahl <ronald.wahl(a)raritan.com> There is a bug in the ks8851 Ethernet driver that more data is written to the hardware TX buffer than actually available. This is caused by wrong accounting of the free TX buffer space. The driver maintains a tx_space variable that represents the TX buffer space that is deemed to be free. The ks8851_start_xmit_spi() function adds an SKB to a queue if tx_space is large enough and reduces tx_space by the amount of buffer space it will later need in the TX buffer and then schedules a work item. If there is not enough space then the TX queue is stopped. The worker function ks8851_tx_work() dequeues all the SKBs and writes the data into the hardware TX buffer. The last packet will trigger an interrupt after it was send. Here it is assumed that all data fits into the TX buffer. In the interrupt routine (which runs asynchronously because it is a threaded interrupt) tx_space is updated with the current value from the hardware. Also the TX queue is woken up again. Now it could happen that after data was sent to the hardware and before handling the TX interrupt new data is queued in ks8851_start_xmit_spi() when the TX buffer space had still some space left. When the interrupt is actually handled tx_space is updated from the hardware but now we already have new SKBs queued that have not been written to the hardware TX buffer yet. Since tx_space has been overwritten by the value from the hardware the space is not accounted for. Now we have more data queued then buffer space available in the hardware and ks8851_tx_work() will potentially overrun the hardware TX buffer. In many cases it will still work because often the buffer is written out fast enough so that no overrun occurs but for example if the peer throttles us via flow control then an overrun may happen. This can be fixed in different ways. The most simple way would be to set tx_space to 0 before writing data to the hardware TX buffer preventing the queuing of more SKBs until the TX interrupt has been handled. I have chosen a slightly more efficient (and still rather simple) way and track the amount of data that is already queued and not yet written to the hardware. When new SKBs are to be queued the already queued amount of data is honoured when checking free TX buffer space. I tested this with a setup of two linked KS8851 running iperf3 between the two in bidirectional mode. Before the fix I got a stall after some minutes. With the fix I saw now issues anymore after hours. Fixes: 3ba81f3ece3c ("net: Micrel KS8851 SPI network driver") Cc: "David S. Miller" <davem(a)davemloft.net> Cc: Eric Dumazet <edumazet(a)google.com> Cc: Jakub Kicinski <kuba(a)kernel.org> Cc: Paolo Abeni <pabeni(a)redhat.com> Cc: Ben Dooks <ben.dooks(a)codethink.co.uk> Cc: Tristram Ha <Tristram.Ha(a)microchip.com> Cc: netdev(a)vger.kernel.org Cc: stable(a)vger.kernel.org # 5.10+ Signed-off-by: Ronald Wahl <ronald.wahl(a)raritan.com> --- V3: - Add missing kdoc of structure fields - Avoid potential NULL pointer dereference - Fix stack variable declaration order V2: - Added Fixes: tag (issue actually present from the beginning) - cosmetics reported by checkpatch drivers/net/ethernet/micrel/ks8851.h | 3 ++ drivers/net/ethernet/micrel/ks8851_common.c | 20 +++++----- drivers/net/ethernet/micrel/ks8851_spi.c | 42 +++++++++++++-------- 3 files changed, 40 insertions(+), 25 deletions(-) diff --git a/drivers/net/ethernet/micrel/ks8851.h b/drivers/net/ethernet/micrel/ks8851.h index fecd43754cea..e5ec0a363aff 100644 --- a/drivers/net/ethernet/micrel/ks8851.h +++ b/drivers/net/ethernet/micrel/ks8851.h @@ -350,6 +350,8 @@ union ks8851_tx_hdr { * @rxd: Space for receiving SPI data, in DMA-able space. * @txd: Space for transmitting SPI data, in DMA-able space. * @msg_enable: The message flags controlling driver output (see ethtool). + * @tx_space: Free space in the hardware TX buffer (cached copy of KS_TXMIR). + * @queued_len: Space required in hardware TX buffer for queued packets in txq. * @fid: Incrementing frame id tag. * @rc_ier: Cached copy of KS_IER. * @rc_ccr: Cached copy of KS_CCR. @@ -399,6 +401,7 @@ struct ks8851_net { struct work_struct rxctrl_work; struct sk_buff_head txq; + unsigned int queued_len; struct eeprom_93cx6 eeprom; struct regulator *vdd_reg; diff --git a/drivers/net/ethernet/micrel/ks8851_common.c b/drivers/net/ethernet/micrel/ks8851_common.c index cfbc900d4aeb..0bf13b38b8f5 100644 --- a/drivers/net/ethernet/micrel/ks8851_common.c +++ b/drivers/net/ethernet/micrel/ks8851_common.c @@ -362,16 +362,18 @@ static irqreturn_t ks8851_irq(int irq, void *_ks) handled |= IRQ_RXPSI; if (status & IRQ_TXI) { - handled |= IRQ_TXI; + unsigned short tx_space = ks8851_rdreg16(ks, KS_TXMIR); - /* no lock here, tx queue should have been stopped */ + netif_dbg(ks, intr, ks->netdev, + "%s: txspace %d\n", __func__, tx_space); - /* update our idea of how much tx space is available to the - * system */ - ks->tx_space = ks8851_rdreg16(ks, KS_TXMIR); + spin_lock(&ks->statelock); + ks->tx_space = tx_space; + if (netif_queue_stopped(ks->netdev)) + netif_wake_queue(ks->netdev); + spin_unlock(&ks->statelock); - netif_dbg(ks, intr, ks->netdev, - "%s: txspace %d\n", __func__, ks->tx_space); + handled |= IRQ_TXI; } if (status & IRQ_RXI) @@ -414,9 +416,6 @@ static irqreturn_t ks8851_irq(int irq, void *_ks) if (status & IRQ_LCI) mii_check_link(&ks->mii); - if (status & IRQ_TXI) - netif_wake_queue(ks->netdev); - return IRQ_HANDLED; } @@ -500,6 +499,7 @@ static int ks8851_net_open(struct net_device *dev) ks8851_wrreg16(ks, KS_ISR, ks->rc_ier); ks8851_wrreg16(ks, KS_IER, ks->rc_ier); + ks->queued_len = 0; netif_start_queue(ks->netdev); netif_dbg(ks, ifup, ks->netdev, "network device up\n"); diff --git a/drivers/net/ethernet/micrel/ks8851_spi.c b/drivers/net/ethernet/micrel/ks8851_spi.c index 70bc7253454f..88e26c120b48 100644 --- a/drivers/net/ethernet/micrel/ks8851_spi.c +++ b/drivers/net/ethernet/micrel/ks8851_spi.c @@ -286,6 +286,18 @@ static void ks8851_wrfifo_spi(struct ks8851_net *ks, struct sk_buff *txp, netdev_err(ks->netdev, "%s: spi_sync() failed\n", __func__); } +/** + * calc_txlen - calculate size of message to send packet + * @len: Length of data + * + * Returns the size of the TXFIFO message needed to send + * this packet. + */ +static unsigned int calc_txlen(unsigned int len) +{ + return ALIGN(len + 4, 4); +} + /** * ks8851_rx_skb_spi - receive skbuff * @ks: The device state @@ -305,7 +317,9 @@ static void ks8851_rx_skb_spi(struct ks8851_net *ks, struct sk_buff *skb) */ static void ks8851_tx_work(struct work_struct *work) { + unsigned int dequeued_len = 0; struct ks8851_net_spi *kss; + unsigned short tx_space; struct ks8851_net *ks; unsigned long flags; struct sk_buff *txb; @@ -322,6 +336,8 @@ static void ks8851_tx_work(struct work_struct *work) last = skb_queue_empty(&ks->txq); if (txb) { + dequeued_len += calc_txlen(txb->len); + ks8851_wrreg16_spi(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_SDA); ks8851_wrfifo_spi(ks, txb, last); @@ -332,6 +348,13 @@ static void ks8851_tx_work(struct work_struct *work) } } + tx_space = ks8851_rdreg16_spi(ks, KS_TXMIR); + + spin_lock(&ks->statelock); + ks->queued_len -= dequeued_len; + ks->tx_space = tx_space; + spin_unlock(&ks->statelock); + ks8851_unlock_spi(ks, &flags); } @@ -346,18 +369,6 @@ static void ks8851_flush_tx_work_spi(struct ks8851_net *ks) flush_work(&kss->tx_work); } -/** - * calc_txlen - calculate size of message to send packet - * @len: Length of data - * - * Returns the size of the TXFIFO message needed to send - * this packet. - */ -static unsigned int calc_txlen(unsigned int len) -{ - return ALIGN(len + 4, 4); -} - /** * ks8851_start_xmit_spi - transmit packet using SPI * @skb: The buffer to transmit @@ -386,16 +397,17 @@ static netdev_tx_t ks8851_start_xmit_spi(struct sk_buff *skb, spin_lock(&ks->statelock); - if (needed > ks->tx_space) { + if (ks->queued_len + needed > ks->tx_space) { netif_stop_queue(dev); ret = NETDEV_TX_BUSY; } else { - ks->tx_space -= needed; + ks->queued_len += needed; skb_queue_tail(&ks->txq, skb); } spin_unlock(&ks->statelock); - schedule_work(&kss->tx_work); + if (ret == NETDEV_TX_OK) + schedule_work(&kss->tx_work); return ret; } -- 2.43.0

10 months, 1 week

3
2
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror December 2023