[openwrt/openwrt] kernel: fix a perf build error

LEDE Commits lede-commits at lists.infradead.org
Tue May 25 10:01:56 PDT 2021


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/5f1338e9839bebe497672c4ca6c0bca4adccf3fa

commit 5f1338e9839bebe497672c4ca6c0bca4adccf3fa
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Tue May 25 18:12:41 2021 +0200

    kernel: fix a perf build error
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 ...jevents-fix-getting-maximum-number-of-fds.patch | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/target/linux/generic/pending-5.10/110-perf-jevents-fix-getting-maximum-number-of-fds.patch b/target/linux/generic/pending-5.10/110-perf-jevents-fix-getting-maximum-number-of-fds.patch
new file mode 100644
index 0000000000..ab6b250953
--- /dev/null
+++ b/target/linux/generic/pending-5.10/110-perf-jevents-fix-getting-maximum-number-of-fds.patch
@@ -0,0 +1,24 @@
+From: Felix Fietkau <nbd at nbd.name>
+Date: Tue, 25 May 2021 18:00:34 +0200
+Subject: [PATCH] perf jevents: fix getting maximum number of fds
+
+On some hosts, rlim.rlim_max can be returned as RLIM_INFINITY.
+By casting it to int, it is interpreted as -1, which will cause get_maxfds
+to return 0, causing "Invalid argument" errors in nftw() calls.
+Fix this by casting the second argument of min() to rlim_t instead.
+
+Fixes: 80eeb67fe577 ("perf jevents: Program to convert JSON file")
+Signed-off-by: Felix Fietkau <nbd at nbd.name>
+---
+
+--- a/tools/perf/pmu-events/jevents.c
++++ b/tools/perf/pmu-events/jevents.c
+@@ -897,7 +897,7 @@ static int get_maxfds(void)
+ 	struct rlimit rlim;
+ 
+ 	if (getrlimit(RLIMIT_NOFILE, &rlim) == 0)
+-		return min((int)rlim.rlim_max / 2, 512);
++		return min(rlim.rlim_max / 2, (rlim_t)512);
+ 
+ 	return 512;
+ }



More information about the lede-commits mailing list