From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Wyes Karny <wyes.karny@amd.com>,
Doug Smythies <dsmythies@telus.net>,
Len Brown <len.brown@intel.com>, Sasha Levin <sashal@kernel.org>,
lenb@kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH AUTOSEL 6.1 02/19] tools/power turbostat: Increase the limit for fd opened
Date: Mon, 22 Apr 2024 19:18:16 -0400 [thread overview]
Message-ID: <20240422231845.1607921-2-sashal@kernel.org> (raw)
In-Reply-To: <20240422231845.1607921-1-sashal@kernel.org>
From: Wyes Karny <wyes.karny@amd.com>
[ Upstream commit 3ac1d14d0583a2de75d49a5234d767e2590384dd ]
When running turbostat, a system with 512 cpus reaches the limit for
maximum number of file descriptors that can be opened. To solve this
problem, the limit is raised to 2^15, which is a large enough number.
Below data is collected from AMD server systems while running turbostat:
|-----------+-------------------------------|
| # of cpus | # of opened fds for turbostat |
|-----------+-------------------------------|
| 128 | 260 |
|-----------+-------------------------------|
| 192 | 388 |
|-----------+-------------------------------|
| 512 | 1028 |
|-----------+-------------------------------|
So, the new max limit would be sufficient up to 2^14 cpus (but this
also depends on how many counters are enabled).
Reviewed-by: Doug Smythies <dsmythies@telus.net>
Tested-by: Doug Smythies <dsmythies@telus.net>
Signed-off-by: Wyes Karny <wyes.karny@amd.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
tools/power/x86/turbostat/turbostat.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 9018e47e0bc26..a674500e7e63d 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -53,6 +53,8 @@
#define NAME_BYTES 20
#define PATH_BYTES 128
+#define MAX_NOFILE 0x8000
+
enum counter_scope { SCOPE_CPU, SCOPE_CORE, SCOPE_PACKAGE };
enum counter_type { COUNTER_ITEMS, COUNTER_CYCLES, COUNTER_SECONDS, COUNTER_USEC };
enum counter_format { FORMAT_RAW, FORMAT_DELTA, FORMAT_PERCENT };
@@ -6719,6 +6721,22 @@ void cmdline(int argc, char **argv)
}
}
+void set_rlimit(void)
+{
+ struct rlimit limit;
+
+ if (getrlimit(RLIMIT_NOFILE, &limit) < 0)
+ err(1, "Failed to get rlimit");
+
+ if (limit.rlim_max < MAX_NOFILE)
+ limit.rlim_max = MAX_NOFILE;
+ if (limit.rlim_cur < MAX_NOFILE)
+ limit.rlim_cur = MAX_NOFILE;
+
+ if (setrlimit(RLIMIT_NOFILE, &limit) < 0)
+ err(1, "Failed to set rlimit");
+}
+
int main(int argc, char **argv)
{
outf = stderr;
@@ -6731,6 +6749,9 @@ int main(int argc, char **argv)
probe_sysfs();
+ if (!getuid())
+ set_rlimit();
+
turbostat_init();
msr_sum_record();
--
2.43.0
next prev parent reply other threads:[~2024-04-22 23:57 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-22 23:18 [PATCH AUTOSEL 6.1 01/19] tools/power turbostat: Fix added raw MSR output Sasha Levin
2024-04-22 23:18 ` Sasha Levin [this message]
2024-04-22 23:18 ` [PATCH AUTOSEL 6.1 03/19] tools/power turbostat: Fix Bzy_MHz documentation typo Sasha Levin
2024-04-22 23:18 ` [PATCH AUTOSEL 6.1 04/19] btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve Sasha Levin
2024-04-22 23:18 ` [PATCH AUTOSEL 6.1 05/19] btrfs: always clear PERTRANS metadata during commit Sasha Levin
2024-04-22 23:18 ` [PATCH AUTOSEL 6.1 06/19] memblock tests: fix undefined reference to `early_pfn_to_nid' Sasha Levin
2024-04-22 23:18 ` [PATCH AUTOSEL 6.1 07/19] memblock tests: fix undefined reference to `panic' Sasha Levin
2024-04-22 23:18 ` [PATCH AUTOSEL 6.1 08/19] memblock tests: fix undefined reference to `BIT' Sasha Levin
2024-04-22 23:18 ` [PATCH AUTOSEL 6.1 09/19] scsi: target: Fix SELinux error when systemd-modules loads the target module Sasha Levin
2024-04-22 23:18 ` [PATCH AUTOSEL 6.1 10/19] blk-iocost: avoid out of bounds shift Sasha Levin
2024-04-22 23:18 ` [PATCH AUTOSEL 6.1 11/19] gpu: host1x: Do not setup DMA for virtual devices Sasha Levin
2024-04-22 23:18 ` [PATCH AUTOSEL 6.1 12/19] MIPS: scall: Save thread_info.syscall unconditionally on entry Sasha Levin
2024-04-22 23:18 ` [PATCH AUTOSEL 6.1 13/19] tools/power/turbostat: Fix uncore frequency file string Sasha Levin
2024-04-22 23:18 ` [PATCH AUTOSEL 6.1 14/19] drm/amdgpu: Refine IB schedule error logging Sasha Levin
2024-04-22 23:18 ` [PATCH AUTOSEL 6.1 15/19] selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior Sasha Levin
2024-04-22 23:18 ` [PATCH AUTOSEL 6.1 16/19] Drivers: hv: vmbus: Track decrypted status in vmbus_gpadl Sasha Levin
2024-04-22 23:18 ` [PATCH AUTOSEL 6.1 17/19] uio_hv_generic: Don't free decrypted memory Sasha Levin
2024-04-22 23:18 ` [PATCH AUTOSEL 6.1 18/19] Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted Sasha Levin
2024-04-22 23:18 ` [PATCH AUTOSEL 6.1 19/19] iommu: mtk: fix module autoloading Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240422231845.1607921-2-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=dsmythies@telus.net \
--cc=len.brown@intel.com \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=wyes.karny@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).