Received: by 2002:ab2:6203:0:b0:1f5:f2ab:c469 with SMTP id o3csp2631302lqt; Mon, 22 Apr 2024 17:30:29 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWX6KYal8T4lm3LDcV02Oe1YQ35/z52MOln5AbACLb6y2GfyroAFXdZwYbfG4KMjbadyZHWdPOk0qcVwQlVB8o2Mm1iA55C268DotGsfA== X-Google-Smtp-Source: AGHT+IFgdbKELyD71BY9ytCxhXpkz+d1gAlvTJQJfowS3OOoJbgGEwbmfeFq0DwuLb+OVBp0iLrq X-Received: by 2002:a05:6870:9406:b0:22e:b2da:af39 with SMTP id d6-20020a056870940600b0022eb2daaf39mr14518252oal.47.1713832229300; Mon, 22 Apr 2024 17:30:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713832229; cv=pass; d=google.com; s=arc-20160816; b=qX3LwYn18W4uByEmRU1GhnDw/F6HCnUTVJINRw/5w1U81cCbbnQCwuEHEV90NQaSay IHB3WKonmpCDFOcziBt4Bq/BXi+bcZGOO1j3PFILOoVo6DeiJmrDzR/uzVFlIvGILer5 3Qu7M90+c8OKXM05VLUsQeLmMH2LK0sFOsP8K9SD4sSgXqdPK4Z9oR/j/GUcPeCEzD5k a6ELkuLxu3tQ+OZUFrQLBmyNWBzlDAQog6m5ZEyxXegYQ87onnPZ5/6yCRVUEYVQjA4h iB1n2FIPUwaJPxhbkzRB/jdm2HBD38XnPbMCOxH+zHi6kCgw2xaqTrfoZQUAqQPJAEVa ZEvw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=egie+aPXctZ+SLBluIedvVaMyvzOok9Ijv/1AJeT4fw=; fh=5KUuZUvN6AFfdLPHEpI8qE8EgywuSp0y6EexTMT/BPw=; b=xoecnaY6eeCQPRbpKvTZ7s6BwdECMPbJss92z1H4uWLbXg8wLRHlHVGCOu9dU1Dca2 9aBatoeNkMwCkp/qqmHacj6tVibUDrbKzfEhZCUHZAvshJzeEUu7Od5qg0dGKm7wHd1y 6hCEk4tf6xqBmgqFDLzk9AvMEExPdvb8rix2oa0J1DObPbSmDC+bN251mQt0KZ2BLjdV gUAX/qUbySPSbw6x0khAelWnuD+RvvL9J9H8AOFC9RtQQ3Xe7ZZ9I0qBfth2UtMrPm03 slztqckzrkbm8WBd2HWzNsvxS2emJK2lBN0KlIxXa+6IkDzsj7Leg/l9ZNrZ9cpcJVtM ODtA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=M+9Ha9ea; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-154292-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-154292-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id j2-20020a635502000000b005ce06ca3538si5867911pgb.873.2024.04.22.17.30.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 17:30:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-154292-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=M+9Ha9ea; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-154292-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-154292-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 5AB8AB23B62 for ; Tue, 23 Apr 2024 00:11:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 779DB176FC9; Mon, 22 Apr 2024 23:57:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="M+9Ha9ea" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9896E157E9B; Mon, 22 Apr 2024 23:57:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713830249; cv=none; b=ss0cFiR5g0fVxgPynioj84OAEH6mrd3OJoq8L2sJBYCUIk8qiEit5VmaYoj/cWEQEDLO4sRRNWFS33eHfNx9fkIDmX4QM8PdnG8V8S0DUDXbt1QA/qg4OrUQXhE0Ww9AC25NM/kWWMNjXRDQFW/WRMLJf7P30cPcLbDCvcGbP9w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713830249; c=relaxed/simple; bh=5GS/Z3Tgsa0cjyrLYwN0H/LZhhfFDN3jxDUuto4jli0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OI3rMai6U8U/tv6/UaGbNMQvnCKgreaU9mdYc1tOef0Z2bNXDfftEETuvDatZ/8YT9OV+66VbEVk0LuSM0keZhmALtZUCefkXwHXSdaoBls3YC6fy7jd4uXTdcTaxy1N4esNei3UwoCK6bEzmvgnes+oIclT4hLxTK1caRhaxks= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=M+9Ha9ea; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98033C113CC; Mon, 22 Apr 2024 23:57:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713830249; bh=5GS/Z3Tgsa0cjyrLYwN0H/LZhhfFDN3jxDUuto4jli0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M+9Ha9eaX4/gfhELtxOOT0Erwz86w13pj6Hi6DBP23sDNzRZCOErcxcLqexnMaiO7 0SAyqMNc/tD13zQiZPR1MBmtDiEDsH1GADfTsJKAxPxp39rldDUBrvuy2j62MuX8vD kDVpZt4i9uAJH+jCW08rxmRh/fijiPFUUJ1mvmOH+aL9NA9cSS4zo0ZdpGL/L2buxY Rl2yijJVhbpAsn/WxnUgRdAqi1UmNN9OM2kEeRNhZmEFD4VZV0QtH5dZc1xvWi4JWY j1GULAkPxiINy9kKIEUuK2CdMH/CnrobTPGJYg0DqoIK8xLlhaw2KjiMqWvyfDDZtM sArMMv+tgKf7A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wyes Karny , Doug Smythies , Len Brown , Sasha Levin , 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 Message-ID: <20240422231845.1607921-2-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240422231845.1607921-1-sashal@kernel.org> References: <20240422231845.1607921-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.87 Content-Transfer-Encoding: 8bit From: Wyes Karny [ 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 Tested-by: Doug Smythies Signed-off-by: Wyes Karny Signed-off-by: Len Brown Signed-off-by: Sasha Levin --- 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