Received-SPF: pass (google.com: domain of linux-kernel+bounces-197959-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Erick Archer <erick.archer@outlook.com>
To: Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	Namhyung Kim <namhyung@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Jiri Olsa <jolsa@kernel.org>,
	Ian Rogers <irogers@google.com>,
	Adrian Hunter <adrian.hunter@intel.com>,
	"Liang, Kan" <kan.liang@linux.intel.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Borislav Petkov <bp@alien8.de>,
	Dave Hansen <dave.hansen@linux.intel.com>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Kees Cook <keescook@chromium.org>,
	"Gustavo A. R. Silva" <gustavoars@kernel.org>,
	Nathan Chancellor <nathan@kernel.org>,
	Nick Desaulniers <ndesaulniers@google.com>,
	Bill Wendling <morbo@google.com>,
	Justin Stitt <justinstitt@google.com>,
	Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
	Matthew Wilcox <mawilcox@microsoft.com>
Cc: Erick Archer <erick.archer@outlook.com>,
	x86@kernel.org,
	linux-perf-users@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-hardening@vger.kernel.org,
	llvm@lists.linux.dev
Subject: [PATCH v4 1/3] perf/x86/amd/uncore: Add flex array to struct amd_uncore_ctx
Date: Sat,  1 Jun 2024 18:56:16 +0200
Message-ID:
 <AS8PR02MB723778DEAB8E5C9F976953B18BFD2@AS8PR02MB7237.eurprd02.prod.outlook.com>
In-Reply-To: <20240601165618.10020-1-erick.archer@outlook.com>
References: <20240601165618.10020-1-erick.archer@outlook.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: AS8PR02MB7237:EE_|GV2PR02MB9373:EE_
X-MS-Office365-Filtering-Correlation-Id: b0eabea1-9349-4c30-4724-08dc825bd371
X-Microsoft-Antispam:
	BCL:0;ARA:14566002|461199019|3412199016|440099019|1602099003|1710799017;
X-Microsoft-Antispam-Message-Info:
	G3rmGR/fozQ+WJVS+RM+1dfhwgnuPDhZxK5Bhizaca91ZCGv/gbajd6P0lAKFVcEf0jCLaudbhEyYXNxzZZwtBY7X/Cr0Sy8LWp7ntDZ0GBEfPmLGvjqRDUVNC9vv5ED7tVtHGLeZEwZFUeL4VqWWDJBTplCZlB45WO4veF6du9jSehAj5SI/RY9OQax+SG1VLhFkq/biIXTz9+fgbEd44BDgVuG/JtE+NGUGe2Zwia2/RtX18tiKGEcbp7vDRb4F8PIJgRrBZc0xGu/HzkhgqA/aaMzGLx8jgPrtJAn5e+tsZklrxKKinhPItFBoL3vui0VOpQZdNU1m8pS8ciw0CBftQ5n2yDX7PvHj8RO9Ic0FYMxKvtE3+gOnZzKF/1EFmzoft5idZYdggYw4bKZFHvjkP0ryq3XMvhk0BcBTO5n9cnTFswRsPD8Bp+8aJCr7Q++fee/idvzRlFiXDgtyzWUbbhkdoLKoLGydG9NDhj1P/naQaCSY1JOCw0Gdb58cWPBn1L4CN2HI7iSGVUC9e5QD9pYMeGOt2SsWRg4gOyAuXhq54bRHKD6Sl9pK1FeXmHbBbrAagmooWaN544tjI4Vs8MK83Z5KrmGQ/29jedC+VVad2wj/SZVSFfuY69QGusVteKG7dAfz2zZeXAw9f043y11W2rxhG9jNuaYRt3fWbyS7Z63X10DHoqyyFfDygdAVnQaTaGvAE44nMbvGQ==
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?f0icmLVKzTWn2hHw9W4mXJCbRsDWNf9K5jqfE5MqVVJcpGCY8fHPLR5A59sY?=
 =?us-ascii?Q?Od8nJ0XUF/rxf9kXr92XsX+pAl4ES3KLiNQgVJm3U7QroALqSAOWH50ZKgb+?=
 =?us-ascii?Q?wNWP2zZ7WiXHmU0EK0O9lGffwrrXbbOHumEJgIrJXp5LyshBfntLl4WWLKPO?=
 =?us-ascii?Q?6AqB6uopPxHhOxVobytbcFbIQPoYSozQX0KBYkccGUZUbwQ7+nbUysTf0w11?=
 =?us-ascii?Q?kPd1lBzTdFe7+rJqSTzVHtIwxJ4J1VkY93+SXXb/cY+jx9aLfHH+oAskzDSo?=
 =?us-ascii?Q?IO6rr4yE9S7GcWpfp9ezE+x7ifBn4HhcViUF8M8Za8qg20N//mT66n8Nc/5G?=
 =?us-ascii?Q?lkbfUdr2+rhptxl7oHihGsqbQrYPG2v7RkwlEOQXmX+IZYK4wN68cxdORaJk?=
 =?us-ascii?Q?1gMQdxH9zvdVYmsspXl3lPv6p0nMJ8P7XPxiEepl+opcIQZJ4NCKfIGhIZLz?=
 =?us-ascii?Q?+sd3zCkZNiO3Cxd/KTrXdxiuZEhPQcQq/sDHYpf+a9+wfNbHcTmnzeKWgHGe?=
 =?us-ascii?Q?JkI5FmAykzG1szqw71JlR70ssJ1FYZTQspLDnPO4W8yF6OvL/yfeKMoDCH/o?=
 =?us-ascii?Q?EVfUqZybGY8db4xPG9XGH581qFJkeIa5tBU2jet7j8NW6JkdH1Z9i2tCEBLW?=
 =?us-ascii?Q?bKyM81xUNQk2hHYNFlTbIk9bjAi3TnpPG6hXm+aO71jmW360bIw8URaOCJqF?=
 =?us-ascii?Q?Sy6fi1uU+BqMksj5DvvNMPoP2rYpxPXz5Q2ZiODHSbpszQ9W9ghE/pqgxe4A?=
 =?us-ascii?Q?W5+1XGanV+ZtD5chMk/b23bdBmqFwMGaTSpw2DTia3ka8P7kcDkZRx9wyyIm?=
 =?us-ascii?Q?ASPLhH6PKExkLxU+yu49PZtYMMhzH3KrPZDkuz7+RH/Cs19LjtCXBfylARoR?=
 =?us-ascii?Q?kqN1/VEn3uYisaJ0+FwqkhFNrViXzFz6i0Xgez8EoXUN6p1VFDidBKll1kLs?=
 =?us-ascii?Q?9v7ivRV23N2eogLuxRuYOG076aSUt2ChivB3eErbE+efOlxQ3lOSBDZ15oFH?=
 =?us-ascii?Q?E9pUF5yS+spNgRK5LtMwBOJKfLXZ74gukiEyNmtB6v9OI7sYMhzd6AwQYBAR?=
 =?us-ascii?Q?KnwRcvUuv4r/LEBJTY04Pi6aqYbRucVSWyQjqgEjUKFAvHb1gXuNLHwSaOiO?=
 =?us-ascii?Q?UPp/AuCqG0anMasoqQgQyjoG3zonSDwUd0D67TVlowVzgQZfekwBeST+bVYH?=
 =?us-ascii?Q?p1x7FxeEs9aBUoMxiGI9qeeqDOK2KIO7xbEP9PtaBFDRSupZEfXcYfVJuxMa?=
 =?us-ascii?Q?PVmzA5p1bCMC0SxC0sOW?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b0eabea1-9349-4c30-4724-08dc825bd371
X-MS-Exchange-CrossTenant-AuthSource: AS8PR02MB7237.eurprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2024 16:56:48.2130
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg:
	00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR02MB9373

This is an effort to get rid of all multiplications from allocation
functions in order to prevent integer overflows [1][2].

The "struct amd_uncore_ctx" can be refactored to use a flex array for
the "events" member. This way, the allocation/freeing of the memory can
be simplified.

Specifically, as the "curr" variable is a pointer to the amd_uncore_ctx
structure and it now ends up in a flexible array:

struct amd_uncore_ctx {
        [...]
        struct perf_event *events[];
};

the two-step allocation can be simplifief by using just one kzalloc_node
function and the struct_size() helper to do the arithmetic calculation
for the memory to be allocated.

This way, the code is more readable and safer.

Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#open-coded-arithmetic-in-allocator-arguments [1]
Link: https://github.com/KSPP/linux/issues/160 [2]
Suggested-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Erick Archer <erick.archer@outlook.com>
---
 arch/x86/events/amd/uncore.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c
index 0fafe233bba4..9d43048bfdab 100644
--- a/arch/x86/events/amd/uncore.c
+++ b/arch/x86/events/amd/uncore.c
@@ -37,8 +37,8 @@ static int pmu_version;
 struct amd_uncore_ctx {
 	int refcnt;
 	int cpu;
-	struct perf_event **events;
 	struct hlist_node node;
+	struct perf_event *events[];
 };
 
 struct amd_uncore_pmu {
@@ -430,10 +430,8 @@ static void amd_uncore_ctx_free(struct amd_uncore *uncore, unsigned int cpu)
 		if (cpu == ctx->cpu)
 			cpumask_clear_cpu(cpu, &pmu->active_mask);
 
-		if (!--ctx->refcnt) {
-			kfree(ctx->events);
+		if (!--ctx->refcnt)
 			kfree(ctx);
-		}
 
 		*per_cpu_ptr(pmu->ctx, cpu) = NULL;
 	}
@@ -478,19 +476,13 @@ static int amd_uncore_ctx_init(struct amd_uncore *uncore, unsigned int cpu)
 		/* Allocate context if sibling does not exist */
 		if (!curr) {
 			node = cpu_to_node(cpu);
-			curr = kzalloc_node(sizeof(*curr), GFP_KERNEL, node);
+			curr = kzalloc_node(struct_size(curr, events,
+							pmu->num_counters),
+					    GFP_KERNEL, node);
 			if (!curr)
 				goto fail;
 
 			curr->cpu = cpu;
-			curr->events = kzalloc_node(sizeof(*curr->events) *
-						    pmu->num_counters,
-						    GFP_KERNEL, node);
-			if (!curr->events) {
-				kfree(curr);
-				goto fail;
-			}
-
 			cpumask_set_cpu(cpu, &pmu->active_mask);
 		}
 
-- 
2.25.1