June 2019 - Linux-stable-mirror

[PATCH 4.4] include/linux/bitops.h: sanitize rotate primitives

by Matthias Kaehlcke

From: Rasmus Villemoes <linux(a)rasmusvillemoes.dk> commit ef4d6f6b275c498f8e5626c99dbeefdc5027f843 upstream. The ror32 implementation (word >> shift) | (word << (32 - shift) has undefined behaviour if shift is outside the [1, 31] range. Similarly for the 64 bit variants. Most callers pass a compile-time constant (naturally in that range), but there's an UBSAN report that these may actually be called with a shift count of 0. Instead of special-casing that, we can make them DTRT for all values of shift while also avoiding UB. For some reason, this was already partly done for rol32 (which was well-defined for [0, 31]). gcc 8 recognizes these patterns as rotates, so for example __u32 rol32(__u32 word, unsigned int shift) { return (word << (shift & 31)) | (word >> ((-shift) & 31)); } compiles to 0000000000000020 <rol32>: 20: 89 f8 mov %edi,%eax 22: 89 f1 mov %esi,%ecx 24: d3 c0 rol %cl,%eax 26: c3 retq Older compilers unfortunately do not do as well, but this only affects the small minority of users that don't pass constants. Due to integer promotions, ro[lr]8 were already well-defined for shifts in [0, 8], and ro[lr]16 were mostly well-defined for shifts in [0, 16] (only mostly - u16 gets promoted to _signed_ int, so if bit 15 is set, word << 16 is undefined). For consistency, update those as well. Link: http://lkml.kernel.org/r/20190410211906.2190-1-linux@rasmusvillemoes.dk Signed-off-by: Rasmus Villemoes <linux(a)rasmusvillemoes.dk> Reported-by: Ido Schimmel <idosch(a)mellanox.com> Tested-by: Ido Schimmel <idosch(a)mellanox.com> Reviewed-by: Will Deacon <will.deacon(a)arm.com> Cc: Vadim Pasternak <vadimp(a)mellanox.com> Cc: Andrey Ryabinin <aryabinin(a)virtuozzo.com> Cc: Jacek Anaszewski <jacek.anaszewski(a)gmail.com> Cc: Pavel Machek <pavel(a)ucw.cz> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> Signed-off-by: Matthias Kaehlcke <mka(a)chromium.org> --- Hi Greg and Sasha, Please pick this patch for 4.4. Issues were observed on arm32 with newer kernels built with clang for rotations with a shift count of zero. (sorry for the spam, the patch applied cleanly to all kernel versions, in retrospect I probably should have just sent it once ...) Thanks Matthias --- include/linux/bitops.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/linux/bitops.h b/include/linux/bitops.h index e76d03f44c80..83edade218fa 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -68,7 +68,7 @@ static __always_inline unsigned long hweight_long(unsigned long w) */ static inline __u64 rol64(__u64 word, unsigned int shift) { - return (word << shift) | (word >> (64 - shift)); + return (word << (shift & 63)) | (word >> ((-shift) & 63)); } /** @@ -78,7 +78,7 @@ static inline __u64 rol64(__u64 word, unsigned int shift) */ static inline __u64 ror64(__u64 word, unsigned int shift) { - return (word >> shift) | (word << (64 - shift)); + return (word >> (shift & 63)) | (word << ((-shift) & 63)); } /** @@ -88,7 +88,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift) */ static inline __u32 rol32(__u32 word, unsigned int shift) { - return (word << shift) | (word >> ((-shift) & 31)); + return (word << (shift & 31)) | (word >> ((-shift) & 31)); } /** @@ -98,7 +98,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift) */ static inline __u32 ror32(__u32 word, unsigned int shift) { - return (word >> shift) | (word << (32 - shift)); + return (word >> (shift & 31)) | (word << ((-shift) & 31)); } /** @@ -108,7 +108,7 @@ static inline __u32 ror32(__u32 word, unsigned int shift) */ static inline __u16 rol16(__u16 word, unsigned int shift) { - return (word << shift) | (word >> (16 - shift)); + return (word << (shift & 15)) | (word >> ((-shift) & 15)); } /** @@ -118,7 +118,7 @@ static inline __u16 rol16(__u16 word, unsigned int shift) */ static inline __u16 ror16(__u16 word, unsigned int shift) { - return (word >> shift) | (word << (16 - shift)); + return (word >> (shift & 15)) | (word << ((-shift) & 15)); } /** @@ -128,7 +128,7 @@ static inline __u16 ror16(__u16 word, unsigned int shift) */ static inline __u8 rol8(__u8 word, unsigned int shift) { - return (word << shift) | (word >> (8 - shift)); + return (word << (shift & 7)) | (word >> ((-shift) & 7)); } /** @@ -138,7 +138,7 @@ static inline __u8 rol8(__u8 word, unsigned int shift) */ static inline __u8 ror8(__u8 word, unsigned int shift) { - return (word >> shift) | (word << (8 - shift)); + return (word >> (shift & 7)) | (word << ((-shift) & 7)); } /** -- 2.22.0.rc1.311.g5d7573a151-goog

4 years, 11 months

1
0
0 0

[PATCH 4.9] include/linux/bitops.h: sanitize rotate primitives

by Matthias Kaehlcke

From: Rasmus Villemoes <linux(a)rasmusvillemoes.dk> commit ef4d6f6b275c498f8e5626c99dbeefdc5027f843 upstream. The ror32 implementation (word >> shift) | (word << (32 - shift) has undefined behaviour if shift is outside the [1, 31] range. Similarly for the 64 bit variants. Most callers pass a compile-time constant (naturally in that range), but there's an UBSAN report that these may actually be called with a shift count of 0. Instead of special-casing that, we can make them DTRT for all values of shift while also avoiding UB. For some reason, this was already partly done for rol32 (which was well-defined for [0, 31]). gcc 8 recognizes these patterns as rotates, so for example __u32 rol32(__u32 word, unsigned int shift) { return (word << (shift & 31)) | (word >> ((-shift) & 31)); } compiles to 0000000000000020 <rol32>: 20: 89 f8 mov %edi,%eax 22: 89 f1 mov %esi,%ecx 24: d3 c0 rol %cl,%eax 26: c3 retq Older compilers unfortunately do not do as well, but this only affects the small minority of users that don't pass constants. Due to integer promotions, ro[lr]8 were already well-defined for shifts in [0, 8], and ro[lr]16 were mostly well-defined for shifts in [0, 16] (only mostly - u16 gets promoted to _signed_ int, so if bit 15 is set, word << 16 is undefined). For consistency, update those as well. Link: http://lkml.kernel.org/r/20190410211906.2190-1-linux@rasmusvillemoes.dk Signed-off-by: Rasmus Villemoes <linux(a)rasmusvillemoes.dk> Reported-by: Ido Schimmel <idosch(a)mellanox.com> Tested-by: Ido Schimmel <idosch(a)mellanox.com> Reviewed-by: Will Deacon <will.deacon(a)arm.com> Cc: Vadim Pasternak <vadimp(a)mellanox.com> Cc: Andrey Ryabinin <aryabinin(a)virtuozzo.com> Cc: Jacek Anaszewski <jacek.anaszewski(a)gmail.com> Cc: Pavel Machek <pavel(a)ucw.cz> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> Signed-off-by: Matthias Kaehlcke <mka(a)chromium.org> --- Hi Greg and Sasha, Please pick this patch for 4.9. Issues were observed on arm32 with newer kernels built with clang for rotations with a shift count of zero. Thanks Matthias Signed-off-by: Matthias Kaehlcke <mka(a)chromium.org> --- include/linux/bitops.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/linux/bitops.h b/include/linux/bitops.h index a83c822c35c2..4b61c71048ed 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -77,7 +77,7 @@ static __always_inline unsigned long hweight_long(unsigned long w) */ static inline __u64 rol64(__u64 word, unsigned int shift) { - return (word << shift) | (word >> (64 - shift)); + return (word << (shift & 63)) | (word >> ((-shift) & 63)); } /** @@ -87,7 +87,7 @@ static inline __u64 rol64(__u64 word, unsigned int shift) */ static inline __u64 ror64(__u64 word, unsigned int shift) { - return (word >> shift) | (word << (64 - shift)); + return (word >> (shift & 63)) | (word << ((-shift) & 63)); } /** @@ -97,7 +97,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift) */ static inline __u32 rol32(__u32 word, unsigned int shift) { - return (word << shift) | (word >> ((-shift) & 31)); + return (word << (shift & 31)) | (word >> ((-shift) & 31)); } /** @@ -107,7 +107,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift) */ static inline __u32 ror32(__u32 word, unsigned int shift) { - return (word >> shift) | (word << (32 - shift)); + return (word >> (shift & 31)) | (word << ((-shift) & 31)); } /** @@ -117,7 +117,7 @@ static inline __u32 ror32(__u32 word, unsigned int shift) */ static inline __u16 rol16(__u16 word, unsigned int shift) { - return (word << shift) | (word >> (16 - shift)); + return (word << (shift & 15)) | (word >> ((-shift) & 15)); } /** @@ -127,7 +127,7 @@ static inline __u16 rol16(__u16 word, unsigned int shift) */ static inline __u16 ror16(__u16 word, unsigned int shift) { - return (word >> shift) | (word << (16 - shift)); + return (word >> (shift & 15)) | (word << ((-shift) & 15)); } /** @@ -137,7 +137,7 @@ static inline __u16 ror16(__u16 word, unsigned int shift) */ static inline __u8 rol8(__u8 word, unsigned int shift) { - return (word << shift) | (word >> (8 - shift)); + return (word << (shift & 7)) | (word >> ((-shift) & 7)); } /** @@ -147,7 +147,7 @@ static inline __u8 rol8(__u8 word, unsigned int shift) */ static inline __u8 ror8(__u8 word, unsigned int shift) { - return (word >> shift) | (word << (8 - shift)); + return (word >> (shift & 7)) | (word << ((-shift) & 7)); } /** -- 2.22.0.rc1.311.g5d7573a151-goog

4 years, 11 months

1
0
0 0

[PATCH 4.14] include/linux/bitops.h: sanitize rotate primitives

by Matthias Kaehlcke

From: Rasmus Villemoes <linux(a)rasmusvillemoes.dk> commit ef4d6f6b275c498f8e5626c99dbeefdc5027f843 upstream The ror32 implementation (word >> shift) | (word << (32 - shift) has undefined behaviour if shift is outside the [1, 31] range. Similarly for the 64 bit variants. Most callers pass a compile-time constant (naturally in that range), but there's an UBSAN report that these may actually be called with a shift count of 0. Instead of special-casing that, we can make them DTRT for all values of shift while also avoiding UB. For some reason, this was already partly done for rol32 (which was well-defined for [0, 31]). gcc 8 recognizes these patterns as rotates, so for example __u32 rol32(__u32 word, unsigned int shift) { return (word << (shift & 31)) | (word >> ((-shift) & 31)); } compiles to 0000000000000020 <rol32>: 20: 89 f8 mov %edi,%eax 22: 89 f1 mov %esi,%ecx 24: d3 c0 rol %cl,%eax 26: c3 retq Older compilers unfortunately do not do as well, but this only affects the small minority of users that don't pass constants. Due to integer promotions, ro[lr]8 were already well-defined for shifts in [0, 8], and ro[lr]16 were mostly well-defined for shifts in [0, 16] (only mostly - u16 gets promoted to _signed_ int, so if bit 15 is set, word << 16 is undefined). For consistency, update those as well. Link: http://lkml.kernel.org/r/20190410211906.2190-1-linux@rasmusvillemoes.dk Signed-off-by: Rasmus Villemoes <linux(a)rasmusvillemoes.dk> Reported-by: Ido Schimmel <idosch(a)mellanox.com> Tested-by: Ido Schimmel <idosch(a)mellanox.com> Reviewed-by: Will Deacon <will.deacon(a)arm.com> Cc: Vadim Pasternak <vadimp(a)mellanox.com> Cc: Andrey Ryabinin <aryabinin(a)virtuozzo.com> Cc: Jacek Anaszewski <jacek.anaszewski(a)gmail.com> Cc: Pavel Machek <pavel(a)ucw.cz> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> Signed-off-by: Matthias Kaehlcke <mka(a)chromium.org> --- Hi Greg and Sasha, Please pick this patch for 4.14. Issues were observed on arm32 with newer kernels built with clang for rotations with a shift count of zero. Thanks Matthias --- include/linux/bitops.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/linux/bitops.h b/include/linux/bitops.h index d03c5dd6185d..fc64a43690f8 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -79,7 +79,7 @@ static __always_inline unsigned long hweight_long(unsigned long w) */ static inline __u64 rol64(__u64 word, unsigned int shift) { - return (word << shift) | (word >> (64 - shift)); + return (word << (shift & 63)) | (word >> ((-shift) & 63)); } /** @@ -89,7 +89,7 @@ static inline __u64 rol64(__u64 word, unsigned int shift) */ static inline __u64 ror64(__u64 word, unsigned int shift) { - return (word >> shift) | (word << (64 - shift)); + return (word >> (shift & 63)) | (word << ((-shift) & 63)); } /** @@ -99,7 +99,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift) */ static inline __u32 rol32(__u32 word, unsigned int shift) { - return (word << shift) | (word >> ((-shift) & 31)); + return (word << (shift & 31)) | (word >> ((-shift) & 31)); } /** @@ -109,7 +109,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift) */ static inline __u32 ror32(__u32 word, unsigned int shift) { - return (word >> shift) | (word << (32 - shift)); + return (word >> (shift & 31)) | (word << ((-shift) & 31)); } /** @@ -119,7 +119,7 @@ static inline __u32 ror32(__u32 word, unsigned int shift) */ static inline __u16 rol16(__u16 word, unsigned int shift) { - return (word << shift) | (word >> (16 - shift)); + return (word << (shift & 15)) | (word >> ((-shift) & 15)); } /** @@ -129,7 +129,7 @@ static inline __u16 rol16(__u16 word, unsigned int shift) */ static inline __u16 ror16(__u16 word, unsigned int shift) { - return (word >> shift) | (word << (16 - shift)); + return (word >> (shift & 15)) | (word << ((-shift) & 15)); } /** @@ -139,7 +139,7 @@ static inline __u16 ror16(__u16 word, unsigned int shift) */ static inline __u8 rol8(__u8 word, unsigned int shift) { - return (word << shift) | (word >> (8 - shift)); + return (word << (shift & 7)) | (word >> ((-shift) & 7)); } /** @@ -149,7 +149,7 @@ static inline __u8 rol8(__u8 word, unsigned int shift) */ static inline __u8 ror8(__u8 word, unsigned int shift) { - return (word >> shift) | (word << (8 - shift)); + return (word >> (shift & 7)) | (word << ((-shift) & 7)); } /** -- 2.22.0.rc1.311.g5d7573a151-goog

4 years, 11 months

1
0
0 0

✅ PASS: Stable queue: queue-4.19

by CKI Project

Hello, We ran automated tests on a patchset that was proposed for merging into this kernel tree. The patches were applied to: Kernel repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: 0df021b2e841 - Linux 4.19.47 The results of these automated tests are provided below. Overall result: PASSED Merge: OK Compile: OK Tests: OK Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Merge testing ------------- We cloned this repository and checked out the following commit: Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: 0df021b2e841 - Linux 4.19.47 We then merged the patchset with `git am`: bonding-802.3ad-fix-slave-link-initialization-transition-states.patch cxgb4-offload-vlan-flows-regardless-of-vlan-ethtype.patch inet-switch-ip-id-generator-to-siphash.patch ipv4-igmp-fix-another-memory-leak-in-igmpv3_del_delrec.patch ipv4-igmp-fix-build-error-if-config_ip_multicast.patch ipv6-consider-sk_bound_dev_if-when-binding-a-raw-socket-to-an-address.patch ipv6-fix-redirect-with-vrf.patch llc-fix-skb-leak-in-llc_build_and_send_ui_pkt.patch net-dsa-mv88e6xxx-fix-handling-of-upper-half-of-stats_type_port.patch net-fec-fix-the-clk-mismatch-in-failed_reset-path.patch net-gro-fix-use-after-free-read-in-napi_gro_frags.patch net-mvneta-fix-err-code-path-of-probe.patch net-mvpp2-fix-bad-mvpp2_txq_sched_token_cntr_reg-queue-value.patch net-phy-marvell10g-report-if-the-phy-fails-to-boot-firmware.patch net-sched-don-t-use-tc_action-order-during-action-dump.patch net-stmmac-fix-reset-gpio-free-missing.patch usbnet-fix-kernel-crash-after-disconnect.patch net-mlx5-avoid-double-free-in-fs-init-error-unwinding-path.patch tipc-avoid-copying-bytes-beyond-the-supplied-data.patch net-mlx5-allocate-root-ns-memory-using-kzalloc-to-match-kfree.patch net-mlx5e-disable-rxhash-when-cqe-compress-is-enabled.patch net-stmmac-dma-channel-control-register-need-to-be-init-first.patch bnxt_en-fix-aggregation-buffer-leak-under-oom-condition.patch net-tls-fix-state-removal-with-feature-flags-off.patch net-tls-don-t-ignore-netdev-notifications-if-no-tls-features.patch crypto-vmx-ghash-do-nosimd-fallback-manually.patch include-linux-compiler-.h-define-asm_volatile_goto.patch compiler.h-give-up-__compiletime_assert_fallback.patch jump_label-move-asm-goto-support-test-to-kconfig.patch xen-pciback-don-t-disable-pci_command-on-pci-device-reset.patch revert-tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration.patch tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration.patch Compile testing --------------- We compiled the kernel for 4 architectures: aarch64: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/aarch64/kernel-stable_queue_4.19-a… kernel build: https://artifacts.cki-project.org/builds/aarch64/kernel-stable_queue_4.19-a… ppc64le: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable_queue_4.19-p… kernel build: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable_queue_4.19-p… s390x: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/s390x/kernel-stable_queue_4.19-s39… kernel build: https://artifacts.cki-project.org/builds/s390x/kernel-stable_queue_4.19-s39… x86_64: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/x86_64/kernel-stable_queue_4.19-x8… kernel build: https://artifacts.cki-project.org/builds/x86_64/kernel-stable_queue_4.19-x8… Hardware testing ---------------- We booted each kernel and ran the following tests: aarch64: Host 1: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [1] Host 2: ✅ Boot test [0] ✅ LTP lite [2] ✅ AMTU (Abstract Machine Test Utility) [3] ✅ Ethernet drivers sanity [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ Usex - version 1.9-29 [9] ✅ stress: stress-ng [10] 🚧 ✅ Networking socket: fuzz [11] 🚧 ✅ Networking: igmp conformance test [12] 🚧 ✅ Networking route: pmtu [13] 🚧 ✅ Networking route_func: local [14] 🚧 ✅ Networking route_func: forward [14] ppc64le: Host 1: ✅ Boot test [0] ✅ LTP lite [2] ✅ AMTU (Abstract Machine Test Utility) [3] ✅ Ethernet drivers sanity [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ Usex - version 1.9-29 [9] ✅ stress: stress-ng [10] 🚧 ✅ Networking socket: fuzz [11] 🚧 ✅ Networking route: pmtu [13] 🚧 ✅ Networking route_func: local [14] 🚧 ✅ Networking route_func: forward [14] Host 2: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [1] s390x: Host 1: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [1] Host 2: ✅ Boot test [0] ✅ LTP lite [2] ✅ Ethernet drivers sanity [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ stress: stress-ng [10] 🚧 ✅ Networking socket: fuzz [11] 🚧 ✅ Networking: igmp conformance test [12] 🚧 ✅ Networking route: pmtu [13] 🚧 ✅ Networking route_func: local [14] 🚧 ✅ Networking route_func: forward [14] x86_64: Host 1: ✅ Boot test [0] ✅ LTP lite [2] ✅ AMTU (Abstract Machine Test Utility) [3] ✅ Ethernet drivers sanity [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ Usex - version 1.9-29 [9] ✅ stress: stress-ng [10] 🚧 ✅ Networking socket: fuzz [11] 🚧 ✅ Networking: igmp conformance test [12] 🚧 ✅ Networking route: pmtu [13] 🚧 ✅ Networking route_func: local [14] 🚧 ✅ Networking route_func: forward [14] Host 2: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [1] Test source: 💚 Pull requests are welcome for new tests or improvements to existing tests! [0]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [1]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/packages/se… [2]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [3]: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu [4]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [5]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/aud… [6]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… [7]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/iot… [8]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… [9]: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… [10]: https://github.com/CKI-project/tests-beaker/archive/master.zip#stress/stres… [11]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [12]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/i… [13]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [14]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… Waived tests (marked with 🚧) ----------------------------- This test run included waived tests. Such tests are executed but their results are not taken into account. Tests are waived when their results are not reliable enough, e.g. when they're just introduced or are being fixed.

4 years, 11 months

1
0
0 0

✅ PASS: Stable queue: queue-4.19

by CKI Project

Hello, We ran automated tests on a patchset that was proposed for merging into this kernel tree. The patches were applied to: Kernel repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: 0df021b2e841 - Linux 4.19.47 The results of these automated tests are provided below. Overall result: PASSED Merge: OK Compile: OK Tests: OK Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Merge testing ------------- We cloned this repository and checked out the following commit: Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: 0df021b2e841 - Linux 4.19.47 We then merged the patchset with `git am`: bonding-802.3ad-fix-slave-link-initialization-transition-states.patch cxgb4-offload-vlan-flows-regardless-of-vlan-ethtype.patch inet-switch-ip-id-generator-to-siphash.patch ipv4-igmp-fix-another-memory-leak-in-igmpv3_del_delrec.patch ipv4-igmp-fix-build-error-if-config_ip_multicast.patch ipv6-consider-sk_bound_dev_if-when-binding-a-raw-socket-to-an-address.patch ipv6-fix-redirect-with-vrf.patch llc-fix-skb-leak-in-llc_build_and_send_ui_pkt.patch net-dsa-mv88e6xxx-fix-handling-of-upper-half-of-stats_type_port.patch net-fec-fix-the-clk-mismatch-in-failed_reset-path.patch net-gro-fix-use-after-free-read-in-napi_gro_frags.patch net-mvneta-fix-err-code-path-of-probe.patch net-mvpp2-fix-bad-mvpp2_txq_sched_token_cntr_reg-queue-value.patch net-phy-marvell10g-report-if-the-phy-fails-to-boot-firmware.patch net-sched-don-t-use-tc_action-order-during-action-dump.patch net-stmmac-fix-reset-gpio-free-missing.patch usbnet-fix-kernel-crash-after-disconnect.patch net-mlx5-avoid-double-free-in-fs-init-error-unwinding-path.patch tipc-avoid-copying-bytes-beyond-the-supplied-data.patch net-mlx5-allocate-root-ns-memory-using-kzalloc-to-match-kfree.patch net-mlx5e-disable-rxhash-when-cqe-compress-is-enabled.patch net-stmmac-dma-channel-control-register-need-to-be-init-first.patch bnxt_en-fix-aggregation-buffer-leak-under-oom-condition.patch net-tls-fix-state-removal-with-feature-flags-off.patch net-tls-don-t-ignore-netdev-notifications-if-no-tls-features.patch crypto-vmx-ghash-do-nosimd-fallback-manually.patch include-linux-compiler-.h-define-asm_volatile_goto.patch compiler.h-give-up-__compiletime_assert_fallback.patch jump_label-move-asm-goto-support-test-to-kconfig.patch xen-pciback-don-t-disable-pci_command-on-pci-device-reset.patch Compile testing --------------- We compiled the kernel for 4 architectures: aarch64: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/aarch64/kernel-stable_queue_4.19-a… kernel build: https://artifacts.cki-project.org/builds/aarch64/kernel-stable_queue_4.19-a… ppc64le: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable_queue_4.19-p… kernel build: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable_queue_4.19-p… s390x: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/s390x/kernel-stable_queue_4.19-s39… kernel build: https://artifacts.cki-project.org/builds/s390x/kernel-stable_queue_4.19-s39… x86_64: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/x86_64/kernel-stable_queue_4.19-x8… kernel build: https://artifacts.cki-project.org/builds/x86_64/kernel-stable_queue_4.19-x8… Hardware testing ---------------- We booted each kernel and ran the following tests: aarch64: Host 1: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [1] Host 2: ✅ Boot test [0] ✅ LTP lite [2] ✅ AMTU (Abstract Machine Test Utility) [3] ✅ Ethernet drivers sanity [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ Usex - version 1.9-29 [9] 🚧 ✅ Networking socket: fuzz [11] 🚧 ✅ Networking: igmp conformance test [12] 🚧 ✅ Networking route: pmtu [13] 🚧 ✅ Networking route_func: local [14] 🚧 ✅ Networking route_func: forward [14] ppc64le: Host 1: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [1] Host 2: ✅ Boot test [0] ✅ LTP lite [2] ✅ AMTU (Abstract Machine Test Utility) [3] ✅ Ethernet drivers sanity [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ Usex - version 1.9-29 [9] ✅ stress: stress-ng [10] 🚧 ✅ Networking socket: fuzz [11] 🚧 ✅ Networking route: pmtu [13] 🚧 ✅ Networking route_func: local [14] 🚧 ✅ Networking route_func: forward [14] s390x: Host 1: ✅ Boot test [0] ✅ LTP lite [2] ✅ Ethernet drivers sanity [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ stress: stress-ng [10] 🚧 ✅ Networking socket: fuzz [11] 🚧 ✅ Networking: igmp conformance test [12] 🚧 ✅ Networking route: pmtu [13] 🚧 ✅ Networking route_func: local [14] 🚧 ✅ Networking route_func: forward [14] Host 2: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [1] x86_64: Host 1: ✅ Boot test [0] ✅ LTP lite [2] ✅ AMTU (Abstract Machine Test Utility) [3] ✅ Ethernet drivers sanity [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ Usex - version 1.9-29 [9] ✅ stress: stress-ng [10] 🚧 ✅ Networking socket: fuzz [11] 🚧 ✅ Networking: igmp conformance test [12] 🚧 ✅ Networking route: pmtu [13] 🚧 ✅ Networking route_func: local [14] 🚧 ✅ Networking route_func: forward [14] Host 2: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [1] Test source: 💚 Pull requests are welcome for new tests or improvements to existing tests! [0]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [1]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/packages/se… [2]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [3]: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu [4]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [5]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/aud… [6]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… [7]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/iot… [8]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… [9]: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… [10]: https://github.com/CKI-project/tests-beaker/archive/master.zip#stress/stres… [11]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [12]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/i… [13]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [14]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… Waived tests (marked with 🚧) ----------------------------- This test run included waived tests. Such tests are executed but their results are not taken into account. Tests are waived when their results are not reliable enough, e.g. when they're just introduced or are being fixed.

4 years, 11 months

1
0
0 0

✅ PASS: Test report for kernel 5.1.7-rc1-6b1cd91.cki (stable)

by CKI Project

Hello, We ran automated tests on a recent commit from this kernel tree: Kernel repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Commit: e674455b9242 - Linux 5.1.7-rc1 The results of these automated tests are provided below. Overall result: PASSED Merge: OK Compile: OK Tests: OK Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Compile testing --------------- We compiled the kernel for 4 architectures: aarch64: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/aarch64/kernel-stable-aarch64-e674… kernel build: https://artifacts.cki-project.org/builds/aarch64/kernel-stable-aarch64-e674… ppc64le: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable-ppc64le-e674… kernel build: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable-ppc64le-e674… s390x: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/s390x/kernel-stable-s390x-e674455b… kernel build: https://artifacts.cki-project.org/builds/s390x/kernel-stable-s390x-e674455b… x86_64: build options: -j20 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/x86_64/kernel-stable-x86_64-e67445… kernel build: https://artifacts.cki-project.org/builds/x86_64/kernel-stable-x86_64-e67445… Hardware testing ---------------- We booted each kernel and ran the following tests: aarch64: Host 1: ✅ Boot test [0] ✅ xfstests: ext4 [1] ✅ xfstests: xfs [1] ✅ selinux-policy: serge-testsuite [2] Host 2: ✅ Boot test [0] ✅ LTP lite [3] ✅ Loopdev Sanity [4] ✅ Memory function: memfd_create [5] ✅ AMTU (Abstract Machine Test Utility) [6] ✅ Ethernet drivers sanity [7] ✅ audit: audit testsuite test [8] ✅ httpd: mod_ssl smoke sanity [9] ✅ iotop: sanity [10] ✅ redhat-rpm-config: detect-kabi-provides sanity [11] ✅ redhat-rpm-config: kabi-whitelist-not-found sanity [12] ✅ tuned: tune-processes-through-perf [13] ✅ Usex - version 1.9-29 [14] ✅ lvm thinp sanity [15] ✅ storage: SCSI VPD [16] ✅ stress: stress-ng [17] 🚧 ✅ Networking socket: fuzz [18] 🚧 ✅ Networking sctp-auth: sockopts test [19] 🚧 ✅ Networking: igmp conformance test [20] 🚧 ✅ Networking route: pmtu [21] 🚧 ✅ Networking route_func: local [22] 🚧 ✅ Networking route_func: forward [22] 🚧 ✅ Networking TCP: keepalive test [23] 🚧 ✅ Networking UDP: socket [24] 🚧 ✅ Networking tunnel: vxlan basic [25] 🚧 ✅ Networking tunnel: geneve basic test [26] 🚧 ✅ Networking ipsec: basic netns transport [27] 🚧 ✅ Networking ipsec: basic netns tunnel [27] 🚧 ✅ Storage blktests [28] ppc64le: Host 1: ✅ Boot test [0] ✅ LTP lite [3] ✅ Loopdev Sanity [4] ✅ Memory function: memfd_create [5] ✅ AMTU (Abstract Machine Test Utility) [6] ✅ Ethernet drivers sanity [7] ✅ audit: audit testsuite test [8] ✅ httpd: mod_ssl smoke sanity [9] ✅ iotop: sanity [10] ✅ redhat-rpm-config: detect-kabi-provides sanity [11] ✅ redhat-rpm-config: kabi-whitelist-not-found sanity [12] ✅ tuned: tune-processes-through-perf [13] ✅ Usex - version 1.9-29 [14] ✅ lvm thinp sanity [15] ✅ stress: stress-ng [17] 🚧 ✅ Networking socket: fuzz [18] 🚧 ✅ Networking sctp-auth: sockopts test [19] 🚧 ✅ Networking route: pmtu [21] 🚧 ✅ Networking route_func: local [22] 🚧 ✅ Networking route_func: forward [22] 🚧 ✅ Networking TCP: keepalive test [23] 🚧 ✅ Networking UDP: socket [24] 🚧 ✅ Networking tunnel: vxlan basic [25] 🚧 ✅ Networking tunnel: geneve basic test [26] 🚧 ✅ Networking ipsec: basic netns tunnel [27] 🚧 ✅ Storage blktests [28] Host 2: ✅ Boot test [0] ✅ xfstests: ext4 [1] ✅ xfstests: xfs [1] ✅ selinux-policy: serge-testsuite [2] s390x: Host 1: ✅ Boot test [0] ✅ selinux-policy: serge-testsuite [2] Host 2: ✅ Boot test [0] ✅ kdump: sysrq-c [29] Host 3: ✅ Boot test [0] ✅ LTP lite [3] ✅ Loopdev Sanity [4] ✅ Memory function: memfd_create [5] ✅ Ethernet drivers sanity [7] ✅ audit: audit testsuite test [8] ✅ httpd: mod_ssl smoke sanity [9] ✅ iotop: sanity [10] ✅ redhat-rpm-config: detect-kabi-provides sanity [11] ✅ redhat-rpm-config: kabi-whitelist-not-found sanity [12] ✅ tuned: tune-processes-through-perf [13] ✅ lvm thinp sanity [15] ✅ stress: stress-ng [17] 🚧 ✅ Networking socket: fuzz [18] 🚧 ✅ Networking sctp-auth: sockopts test [19] 🚧 ✅ Networking: igmp conformance test [20] 🚧 ✅ Networking route: pmtu [21] 🚧 ✅ Networking route_func: local [22] 🚧 ✅ Networking route_func: forward [22] 🚧 ✅ Networking TCP: keepalive test [23] 🚧 ✅ Networking UDP: socket [24] 🚧 ✅ Networking tunnel: vxlan basic [25] 🚧 ✅ Networking tunnel: geneve basic test [26] 🚧 ✅ Networking ipsec: basic netns transport [27] 🚧 ✅ Networking ipsec: basic netns tunnel [27] 🚧 ✅ Storage blktests [28] x86_64: Host 1: ✅ Boot test [0] ✅ kdump: sysrq-c - megaraid_sas [29] Host 2: ✅ Boot test [0] ✅ xfstests: ext4 [1] ✅ xfstests: xfs [1] ✅ selinux-policy: serge-testsuite [2] Host 3: ✅ Boot test [0] ✅ kdump: sysrq-c [29] Host 4: ✅ Boot test [0] ✅ LTP lite [3] ✅ Loopdev Sanity [4] ✅ Memory function: memfd_create [5] ✅ AMTU (Abstract Machine Test Utility) [6] ✅ Ethernet drivers sanity [7] ✅ audit: audit testsuite test [8] ✅ httpd: mod_ssl smoke sanity [9] ✅ iotop: sanity [10] ✅ redhat-rpm-config: detect-kabi-provides sanity [11] ✅ redhat-rpm-config: kabi-whitelist-not-found sanity [12] ✅ tuned: tune-processes-through-perf [13] ✅ Usex - version 1.9-29 [14] ✅ lvm thinp sanity [15] ✅ storage: SCSI VPD [16] ✅ stress: stress-ng [17] 🚧 ✅ Networking socket: fuzz [18] 🚧 ✅ Networking sctp-auth: sockopts test [19] 🚧 ✅ Networking: igmp conformance test [20] 🚧 ✅ Networking route: pmtu [21] 🚧 ✅ Networking route_func: local [22] 🚧 ✅ Networking route_func: forward [22] 🚧 ✅ Networking TCP: keepalive test [23] 🚧 ✅ Networking UDP: socket [24] 🚧 ✅ Networking tunnel: vxlan basic [25] 🚧 ✅ Networking tunnel: geneve basic test [26] 🚧 ✅ Networking ipsec: basic netns transport [27] 🚧 ✅ Networking ipsec: basic netns tunnel [27] 🚧 ✅ Storage blktests [28] Test source: 💚 Pull requests are welcome for new tests or improvements to existing tests! [0]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [1]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… [2]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/packages/se… [3]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [4]: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… [5]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/memory/func… [6]: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu [7]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [8]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/aud… [9]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… [10]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/iot… [11]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/red… [12]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/red… [13]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… [14]: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… [15]: https://github.com/CKI-project/tests-beaker/archive/master.zip#storage/lvm/… [16]: https://github.com/CKI-project/tests-beaker/archive/master.zip#storage/scsi… [17]: https://github.com/CKI-project/tests-beaker/archive/master.zip#stress/stres… [18]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [19]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/s… [20]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/i… [21]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [22]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [23]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/t… [24]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/u… [25]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [26]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [27]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [28]: https://github.com/CKI-project/tests-beaker/archive/master.zip#storage/blk [29]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/kdump/kdump… Waived tests (marked with 🚧) ----------------------------- This test run included waived tests. Such tests are executed but their results are not taken into account. Tests are waived when their results are not reliable enough, e.g. when they're just introduced or are being fixed.

4 years, 11 months

1
0
0 0

[PATCH v4 5/5] drm: don't block fb changes for async plane updates

by Helen Koike

In the case of a normal sync update, the preparation of framebuffers (be it calling drm_atomic_helper_prepare_planes() or doing setups with drm_framebuffer_get()) are performed in the new_state and the respective cleanups are performed in the old_state. In the case of async updates, the preparation is also done in the new_state but the cleanups are done in the new_state (because updates are performed in place, i.e. in the current state). The current code blocks async udpates when the fb is changed, turning async updates into sync updates, slowing down cursor updates and introducing regressions in igt tests with errors of type: "CRITICAL: completed 97 cursor updated in a period of 30 flips, we expect to complete approximately 15360 updates, with the threshold set at 7680" Fb changes in async updates were prevented to avoid the following scenario: - Async update, oldfb = NULL, newfb = fb1, prepare fb1, cleanup fb1 - Async update, oldfb = fb1, newfb = fb2, prepare fb2, cleanup fb2 - Non-async commit, oldfb = fb2, newfb = fb1, prepare fb1, cleanup fb2 (wrong) Where we have a single call to prepare fb2 but double cleanup call to fb2. To solve the above problems, instead of blocking async fb changes, we place the old framebuffer in the new_state object, so when the code performs cleanups in the new_state it will cleanup the old_fb and we will have the following scenario instead: - Async update, oldfb = NULL, newfb = fb1, prepare fb1, no cleanup - Async update, oldfb = fb1, newfb = fb2, prepare fb2, cleanup fb1 - Non-async commit, oldfb = fb2, newfb = fb1, prepare fb1, cleanup fb2 Where calls to prepare/cleanup are balanced. Cc: <stable(a)vger.kernel.org> # v4.14+ Fixes: 25dc194b34dd ("drm: Block fb changes for async plane updates") Suggested-by: Boris Brezillon <boris.brezillon(a)collabora.com> Signed-off-by: Helen Koike <helen.koike(a)collabora.com> Reviewed-by: Boris Brezillon <boris.brezillon(a)collabora.com> Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas(a)amd.com> --- Changes in v4: - update docs in atomic_async_update callback Changes in v3: - Add Reviewed-by tags - Add TODO in drm_atomic_helper_async_commit() Changes in v2: - Change the order of the patch in the series, add this as the last one. - Add documentation - s/ballanced/balanced drivers/gpu/drm/drm_atomic_helper.c | 22 ++++++++++++---------- include/drm/drm_modeset_helper_vtables.h | 8 ++++++++ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index acf993cb8e52..ac81d8440b40 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1610,15 +1610,6 @@ int drm_atomic_helper_async_check(struct drm_device *dev, old_plane_state->crtc != new_plane_state->crtc) return -EINVAL; - /* - * FIXME: Since prepare_fb and cleanup_fb are always called on - * the new_plane_state for async updates we need to block framebuffer - * changes. This prevents use of a fb that's been cleaned up and - * double cleanups from occuring. - */ - if (old_plane_state->fb != new_plane_state->fb) - return -EINVAL; - funcs = plane->helper_private; if (!funcs->atomic_async_update) return -EINVAL; @@ -1649,6 +1640,8 @@ EXPORT_SYMBOL(drm_atomic_helper_async_check); * drm_atomic_async_check() succeeds. Async commits are not supposed to swap * the states like normal sync commits, but just do in-place changes on the * current state. + * + * TODO: Implement full swap instead of doing in-place changes. */ void drm_atomic_helper_async_commit(struct drm_device *dev, struct drm_atomic_state *state) @@ -1659,6 +1652,9 @@ void drm_atomic_helper_async_commit(struct drm_device *dev, int i; for_each_new_plane_in_state(state, plane, plane_state, i) { + struct drm_framebuffer *new_fb = plane_state->fb; + struct drm_framebuffer *old_fb = plane->state->fb; + funcs = plane->helper_private; funcs->atomic_async_update(plane, plane_state); @@ -1667,11 +1663,17 @@ void drm_atomic_helper_async_commit(struct drm_device *dev, * plane->state in-place, make sure at least common * properties have been properly updated. */ - WARN_ON_ONCE(plane->state->fb != plane_state->fb); + WARN_ON_ONCE(plane->state->fb != new_fb); WARN_ON_ONCE(plane->state->crtc_x != plane_state->crtc_x); WARN_ON_ONCE(plane->state->crtc_y != plane_state->crtc_y); WARN_ON_ONCE(plane->state->src_x != plane_state->src_x); WARN_ON_ONCE(plane->state->src_y != plane_state->src_y); + + /* + * Make sure the FBs have been swapped so that cleanups in the + * new_state performs a cleanup in the old FB. + */ + WARN_ON_ONCE(plane_state->fb != old_fb); } } EXPORT_SYMBOL(drm_atomic_helper_async_commit); diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h index f9c94c2a1364..f7bbd0b0ecd1 100644 --- a/include/drm/drm_modeset_helper_vtables.h +++ b/include/drm/drm_modeset_helper_vtables.h @@ -1185,6 +1185,14 @@ struct drm_plane_helper_funcs { * current one with the new plane configurations in the new * plane_state. * + * Drivers should also swap the framebuffers between current plane + * state (&drm_plane.state) and new_state. + * This is required since cleanup for async commits is performed on + * the new state, rather than old state like for traditional commits. + * Since we want to give up the reference on the current (old) fb + * instead of our brand new one, swap them in the driver during the + * async commit. + * * FIXME: * - It only works for single plane updates * - Async Pageflips are not supported yet -- 2.20.1

4 years, 11 months

1
0
0 0

[PATCH v4 4/5] drm/vc4: fix fb references in async update

by Helen Koike

Async update callbacks are expected to set the old_fb in the new_state so prepare/cleanup framebuffers are balanced. Calling drm_atomic_set_fb_for_plane() (which gets a reference of the new fb and put the old fb) is not required, as it's taken care by drm_mode_cursor_universal() when calling drm_atomic_helper_update_plane(). Cc: <stable(a)vger.kernel.org> # v4.19+ Fixes: 539c320bfa97 ("drm/vc4: update cursors asynchronously through atomic") Suggested-by: Boris Brezillon <boris.brezillon(a)collabora.com> Signed-off-by: Helen Koike <helen.koike(a)collabora.com> Reviewed-by: Boris Brezillon <boris.brezillon(a)collabora.com> --- Hello, I tested on a Raspberry Pi model B rev2 with igt plane_cursor_legacy and kms_cursor_legacy and I didn't see any regressions. Changes in v4: None Changes in v3: None Changes in v2: - Added reviewed-by tag - updated CC stable and Fixes tag drivers/gpu/drm/vc4/vc4_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index be2274924b34..441e06d45c89 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -1020,7 +1020,7 @@ static void vc4_plane_atomic_async_update(struct drm_plane *plane, { struct vc4_plane_state *vc4_state, *new_vc4_state; - drm_atomic_set_fb_for_plane(plane->state, state->fb); + swap(plane->state->fb, state->fb); plane->state->crtc_x = state->crtc_x; plane->state->crtc_y = state->crtc_y; plane->state->crtc_w = state->crtc_w; -- 2.20.1

4 years, 11 months

1
0
0 0

[PATCH v4 3/5] drm/msm: fix fb references in async update

by Helen Koike

Async update callbacks are expected to set the old_fb in the new_state so prepare/cleanup framebuffers are balanced. Cc: <stable(a)vger.kernel.org> # v4.14+ Fixes: 224a4c970987 ("drm/msm: update cursors asynchronously through atomic") Suggested-by: Boris Brezillon <boris.brezillon(a)collabora.com> Signed-off-by: Helen Koike <helen.koike(a)collabora.com> Acked-by: Rob Clark <robdclark(a)gmail.com> --- Hello, This was tested on the dragonboard 410c using igt plane_cursor_legacy and kms_cursor_legacy and I didn't see any regressions. Changes in v4: - add acked by tag Changes in v3: None Changes in v2: - update CC stable and Fixes tag drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c index 9d9fb6c5fd68..1105c2433f14 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c @@ -502,6 +502,8 @@ static int mdp5_plane_atomic_async_check(struct drm_plane *plane, static void mdp5_plane_atomic_async_update(struct drm_plane *plane, struct drm_plane_state *new_state) { + struct drm_framebuffer *old_fb = plane->state->fb; + plane->state->src_x = new_state->src_x; plane->state->src_y = new_state->src_y; plane->state->crtc_x = new_state->crtc_x; @@ -524,6 +526,8 @@ static void mdp5_plane_atomic_async_update(struct drm_plane *plane, *to_mdp5_plane_state(plane->state) = *to_mdp5_plane_state(new_state); + + new_state->fb = old_fb; } static const struct drm_plane_helper_funcs mdp5_plane_helper_funcs = { -- 2.20.1

4 years, 11 months

1
0
0 0

[PATCH v3 5/5] drm: don't block fb changes for async plane updates

by Helen Koike

In the case of a normal sync update, the preparation of framebuffers (be it calling drm_atomic_helper_prepare_planes() or doing setups with drm_framebuffer_get()) are performed in the new_state and the respective cleanups are performed in the old_state. In the case of async updates, the preparation is also done in the new_state but the cleanups are done in the new_state (because updates are performed in place, i.e. in the current state). The current code blocks async udpates when the fb is changed, turning async updates into sync updates, slowing down cursor updates and introducing regressions in igt tests with errors of type: "CRITICAL: completed 97 cursor updated in a period of 30 flips, we expect to complete approximately 15360 updates, with the threshold set at 7680" Fb changes in async updates were prevented to avoid the following scenario: - Async update, oldfb = NULL, newfb = fb1, prepare fb1, cleanup fb1 - Async update, oldfb = fb1, newfb = fb2, prepare fb2, cleanup fb2 - Non-async commit, oldfb = fb2, newfb = fb1, prepare fb1, cleanup fb2 (wrong) Where we have a single call to prepare fb2 but double cleanup call to fb2. To solve the above problems, instead of blocking async fb changes, we place the old framebuffer in the new_state object, so when the code performs cleanups in the new_state it will cleanup the old_fb and we will have the following scenario instead: - Async update, oldfb = NULL, newfb = fb1, prepare fb1, no cleanup - Async update, oldfb = fb1, newfb = fb2, prepare fb2, cleanup fb1 - Non-async commit, oldfb = fb2, newfb = fb1, prepare fb1, cleanup fb2 Where calls to prepare/cleanup are balanced. Cc: <stable(a)vger.kernel.org> # v4.14+ Fixes: 25dc194b34dd ("drm: Block fb changes for async plane updates") Suggested-by: Boris Brezillon <boris.brezillon(a)collabora.com> Signed-off-by: Helen Koike <helen.koike(a)collabora.com> Reviewed-by: Boris Brezillon <boris.brezillon(a)collabora.com> Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas(a)amd.com> --- Hello, I added a TODO in drm_atomic_helper_async_commit() regarding doing a full state swap(), Boris and Nicholas, let me know if this is ok and if I can keep your Reviewed-by tags) As mentioned in the cover letter, I tested in almost all platforms with igt plane_cursor_legacy and kms_cursor_legacy and I didn't see any regressions. But I couldn't test on MSM and AMD because I don't have the hardware I would appreciate if anyone could help me testing those. Thanks! Helen Changes in v3: - Add Reviewed-by tags - Add TODO in drm_atomic_helper_async_commit() Changes in v2: - Change the order of the patch in the series, add this as the last one. - Add documentation - s/ballanced/balanced drivers/gpu/drm/drm_atomic_helper.c | 22 ++++++++++++---------- include/drm/drm_modeset_helper_vtables.h | 5 +++++ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 2453678d1186..de5812c362b5 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1608,15 +1608,6 @@ int drm_atomic_helper_async_check(struct drm_device *dev, old_plane_state->crtc != new_plane_state->crtc) return -EINVAL; - /* - * FIXME: Since prepare_fb and cleanup_fb are always called on - * the new_plane_state for async updates we need to block framebuffer - * changes. This prevents use of a fb that's been cleaned up and - * double cleanups from occuring. - */ - if (old_plane_state->fb != new_plane_state->fb) - return -EINVAL; - funcs = plane->helper_private; if (!funcs->atomic_async_update) return -EINVAL; @@ -1647,6 +1638,8 @@ EXPORT_SYMBOL(drm_atomic_helper_async_check); * drm_atomic_async_check() succeeds. Async commits are not supposed to swap * the states like normal sync commits, but just do in-place changes on the * current state. + * + * TODO: Implement full swap instead of doing in-place changes. */ void drm_atomic_helper_async_commit(struct drm_device *dev, struct drm_atomic_state *state) @@ -1657,6 +1650,9 @@ void drm_atomic_helper_async_commit(struct drm_device *dev, int i; for_each_new_plane_in_state(state, plane, plane_state, i) { + struct drm_framebuffer *new_fb = plane_state->fb; + struct drm_framebuffer *old_fb = plane->state->fb; + funcs = plane->helper_private; funcs->atomic_async_update(plane, plane_state); @@ -1665,11 +1661,17 @@ void drm_atomic_helper_async_commit(struct drm_device *dev, * plane->state in-place, make sure at least common * properties have been properly updated. */ - WARN_ON_ONCE(plane->state->fb != plane_state->fb); + WARN_ON_ONCE(plane->state->fb != new_fb); WARN_ON_ONCE(plane->state->crtc_x != plane_state->crtc_x); WARN_ON_ONCE(plane->state->crtc_y != plane_state->crtc_y); WARN_ON_ONCE(plane->state->src_x != plane_state->src_x); WARN_ON_ONCE(plane->state->src_y != plane_state->src_y); + + /* + * Make sure the FBs have been swapped so that cleanups in the + * new_state performs a cleanup in the old FB. + */ + WARN_ON_ONCE(plane_state->fb != old_fb); } } EXPORT_SYMBOL(drm_atomic_helper_async_commit); diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h index cfb7be40bed7..ce582e8e8f2f 100644 --- a/include/drm/drm_modeset_helper_vtables.h +++ b/include/drm/drm_modeset_helper_vtables.h @@ -1174,6 +1174,11 @@ struct drm_plane_helper_funcs { * current one with the new plane configurations in the new * plane_state. * + * Drivers should also swap the framebuffers between plane state + * and new_state. This is required because prepare and cleanup calls + * are performed on the new_state object, then to cleanup the old + * framebuffer, it needs to be placed inside the new_state object. + * * FIXME: * - It only works for single plane updates * - Async Pageflips are not supported yet -- 2.20.1

4 years, 11 months

2
2
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror June 2019