From: Greg Kroah-Hartman Date: Thu, 15 Apr 2021 14:03:34 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v5.11.15~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f8c6946147728f9278d2c555bdca68c7fa66f8b;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: perf-map-tighten-snprintf-string-precision-to-pass-gcc-check-on-some-32-bit-arches.patch xen-events-fix-setting-irq-affinity.patch --- diff --git a/queue-4.9/perf-map-tighten-snprintf-string-precision-to-pass-gcc-check-on-some-32-bit-arches.patch b/queue-4.9/perf-map-tighten-snprintf-string-precision-to-pass-gcc-check-on-some-32-bit-arches.patch new file mode 100644 index 00000000000..d96a4c682a2 --- /dev/null +++ b/queue-4.9/perf-map-tighten-snprintf-string-precision-to-pass-gcc-check-on-some-32-bit-arches.patch @@ -0,0 +1,64 @@ +From 77d02bd00cea9f1a87afe58113fa75b983d6c23a Mon Sep 17 00:00:00 2001 +From: Arnaldo Carvalho de Melo +Date: Fri, 5 Mar 2021 10:02:09 -0300 +Subject: perf map: Tighten snprintf() string precision to pass gcc check on some 32-bit arches + +From: Arnaldo Carvalho de Melo + +commit 77d02bd00cea9f1a87afe58113fa75b983d6c23a upstream. + +Noticed on a debian:experimental mips and mipsel cross build build +environment: + + perfbuilder@ec265a086e9b:~$ mips-linux-gnu-gcc --version | head -1 + mips-linux-gnu-gcc (Debian 10.2.1-3) 10.2.1 20201224 + perfbuilder@ec265a086e9b:~$ + + CC /tmp/build/perf/util/map.o + util/map.c: In function 'map__new': + util/map.c:109:5: error: '%s' directive output may be truncated writing between 1 and 2147483645 bytes into a region of size 4096 [-Werror=format-truncation=] + 109 | "%s/platforms/%s/arch-%s/usr/lib/%s", + | ^~ + In file included from /usr/mips-linux-gnu/include/stdio.h:867, + from util/symbol.h:11, + from util/map.c:2: + /usr/mips-linux-gnu/include/bits/stdio2.h:67:10: note: '__builtin___snprintf_chk' output 32 or more bytes (assuming 4294967321) into a destination of size 4096 + 67 | return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1, + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 68 | __bos (__s), __fmt, __va_arg_pack ()); + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + cc1: all warnings being treated as errors + +Since we have the lenghts for what lands in that place, use it to give +the compiler more info and make it happy. + +Signed-off-by: Arnaldo Carvalho de Melo +Cc: Anders Roxell +Signed-off-by: Greg Kroah-Hartman +--- + tools/perf/util/map.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +--- a/tools/perf/util/map.c ++++ b/tools/perf/util/map.c +@@ -91,8 +91,7 @@ static inline bool replace_android_lib(c + if (!strncmp(filename, "/system/lib/", 12)) { + char *ndk, *app; + const char *arch; +- size_t ndk_length; +- size_t app_length; ++ int ndk_length, app_length; + + ndk = getenv("NDK_ROOT"); + app = getenv("APP_PLATFORM"); +@@ -120,8 +119,8 @@ static inline bool replace_android_lib(c + if (new_length > PATH_MAX) + return false; + snprintf(newfilename, new_length, +- "%s/platforms/%s/arch-%s/usr/lib/%s", +- ndk, app, arch, libname); ++ "%.*s/platforms/%.*s/arch-%s/usr/lib/%s", ++ ndk_length, ndk, app_length, app, arch, libname); + + return true; + } diff --git a/queue-4.9/series b/queue-4.9/series index f9c86f039ec..d1d1a0ef206 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -43,3 +43,5 @@ revert-cifs-set-cifs_mount_use_prefix_path-flag-on-setting-cifs_sb-prepath.patch drm-imx-imx-ldb-fix-out-of-bounds-array-access-warni.patch gfs2-report-already-frozen-thawed-errors.patch netfilter-x_tables-fix-compat-match-target-pad-out-of-bound-write.patch +perf-map-tighten-snprintf-string-precision-to-pass-gcc-check-on-some-32-bit-arches.patch +xen-events-fix-setting-irq-affinity.patch diff --git a/queue-4.9/xen-events-fix-setting-irq-affinity.patch b/queue-4.9/xen-events-fix-setting-irq-affinity.patch new file mode 100644 index 00000000000..3e6eaa52f5c --- /dev/null +++ b/queue-4.9/xen-events-fix-setting-irq-affinity.patch @@ -0,0 +1,50 @@ +From jgross@suse.com Thu Apr 15 15:56:08 2021 +From: Juergen Gross +Date: Mon, 12 Apr 2021 08:28:45 +0200 +Subject: xen/events: fix setting irq affinity +To: stable@vger.kernel.org +Cc: Juergen Gross , Boris Ostrovsky , Stefano Stabellini , xen-devel@lists.xenproject.org +Message-ID: <20210412062845.13946-1-jgross@suse.com> + +From: Juergen Gross + +The backport of upstream patch 25da4618af240fbec61 ("xen/events: don't +unmask an event channel when an eoi is pending") introduced a +regression for stable kernels 5.10 and older: setting IRQ affinity for +IRQs related to interdomain events would no longer work, as moving the +IRQ to its new cpu was not included in the irq_ack callback for those +events. + +Fix that by adding the needed call. + +Note that kernels 5.11 and later don't need the explicit moving of the +IRQ to the target cpu in the irq_ack callback, due to a rework of the +affinity setting in kernel 5.11. + +Signed-off-by: Juergen Gross +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/xen/events/events_base.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/xen/events/events_base.c ++++ b/drivers/xen/events/events_base.c +@@ -1780,7 +1780,7 @@ static void lateeoi_ack_dynirq(struct ir + + if (VALID_EVTCHN(evtchn)) { + do_mask(info, EVT_MASK_REASON_EOI_PENDING); +- event_handler_exit(info); ++ ack_dynirq(data); + } + } + +@@ -1791,7 +1791,7 @@ static void lateeoi_mask_ack_dynirq(stru + + if (VALID_EVTCHN(evtchn)) { + do_mask(info, EVT_MASK_REASON_EXPLICIT); +- event_handler_exit(info); ++ ack_dynirq(data); + } + } +