From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 787E8277818 for ; Thu, 19 Mar 2026 20:15:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773951345; cv=none; b=OGAiF9C8xfW5O/DfcAOpdszTSgp4eNbuVQsXtd2v+0pbONUJYNlugSk1elEtMp6VOTBriH2h9bgpSWvkx18MNKFfyjYTOEwRK1h7DCjFOwxCV1cA/Nnny08iMLqERHNk/9DYhM6q4wN5ypdPtjW5Jjqo1aQ8VDn8XMzmx+6nuRw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773951345; c=relaxed/simple; bh=0E1xN3HmdJGSZ6UQ0dNBxRKtgCC4EAAOtjwcoINiom4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=qbOhFTDLe/06da90L0sxUXqx09o5lvNXTx0YGsKPAFMY4TkAtrtpx9SJrjfRtA5PSW4F61b3o00nZXrnMVxoT2KUDm/MlcQPzLKEhpdQ6UahvfOSPH2xDjBJ7LGzZH2cREuogXrDIZE+hYfPVO+vnHI/DNe7uWTH86ZSk6PmdWU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mY0brNeA; arc=none smtp.client-ip=209.85.215.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mY0brNeA" Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-c70f91776fcso593190a12.0 for ; Thu, 19 Mar 2026 13:15:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773951343; x=1774556143; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/jDnJgSgoxI+fR2Q+0oguo+U/G7a0RmU8BoRg3HRZvw=; b=mY0brNeAkVYRkkD8Q0qFwBVWEnyGzzTO9s5EZ3goxg1iosgJAtwkq4Qwro0p/FgFUk AX3p9OOSkVSxbcyT+pTO5qvi3ii9FVCplHm9pedXLPXDsdGxZwHBAlKlkTcmvAyBL/0H 5dmNn23YWfH7zU1LP4fB2uU9X3HxqjKhxbfcBQQvZgVTHX9h7+Ke8K/w8LTGy1ja/10w JorGXMPJNYF2I0RWuRXjLz2GUaThQAy15T7LFmnRcHn41ZC1EVYh5xks7caxb9E7n8rf QC3uvgAWCiGvaVHkjk1wKwn9iYQqnUHcym8DlIXMYP9QrNesoJll9+T4GEr3VHa0guN8 k+Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773951343; x=1774556143; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/jDnJgSgoxI+fR2Q+0oguo+U/G7a0RmU8BoRg3HRZvw=; b=QZvDz7NgSSG0nguR7twq8bn4Ero4n3NpZ2/EVxKCAIGLs+i0uiVr9k6Ymdg7DzcfrZ /bpbQYn1z+cjS+I8oHJAwHx9x/st8f7d44/3mc6f5Edib6Wb1saEuLqUmzs3hY7zj2/O CqgR2V34wIKtQih618IOE6hPBdcsWdYGFzXMzCyU2PIVMQY/RbumoHnOtX46Hk/0EPs5 XiufTagsP2JGv09hI7JimUXh10BxTinCIBiERvsypOYptQux1ejmDR3lPa5JUVmuQ7Nd J6bgJ1aFP2ME0edjFybYLKBMZQX6D2q0uRTrAaZlOf95MK1+L1K91DzftJ5hDdnVKFwU 45cg== X-Gm-Message-State: AOJu0YyAblW1eEoyu5ORfIxrVJFpRwZOhucmo8P96yGeg1hS5g4qNOiS YhXgh3NAkYTYqXkplOLiU3FPezHLo+fa4GKrlMKWz5dVQ/APaVnzxDRq3kJHOQ== X-Gm-Gg: ATEYQzwUFkQD75aso0MYXHQDo18umllCQ3XlgeSwaebb1kl5/wAuFyXIs0JjiIQ5506 5SIU8hVRjsCJp/kYrn/Y8+fegY+AAm+OgEDfCfQZP+y1QaVhDQIJN4XzECtiP7fr6t+M+Ezt29v WzGMqW+7sm5lGNME9ZOaD3DnLc/lhDjjX7hXpmWiy0Uec04HM5aTVtvcn5823EqilSCHtY49lSI p4S9WJAWZdoDD/PYsT1CeaxZYxm+rc1mWnH8D855eQk8lUZGJ7DqIeaXg78uc6bgJBBR5bCHCIV l66jrSms81M2Ptbs79gIH+ebT1dQJierfSJyA4z/g7/gXJpW+27UEYB4YMCyf1BY+FI7ctC9Jri 045FH2yngSSXcWzP6WzqsrVSchEXBRA7i7MrPJyoUpBh0U+9wpK+pi4tJ1gRYV0kgmTOpYFSuRg F/xIHWxzDXr1sk3gXmPZLwWfcPwS5n767AbBPKRQeWuAxesPX3ieFfyBY= X-Received: by 2002:a17:903:8c8:b0:2ae:46b9:c653 with SMTP id d9443c01a7336-2b08278b310mr4139655ad.33.1773951343394; Thu, 19 Mar 2026 13:15:43 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d::8bd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b08368ea1bsm469005ad.68.2026.03.19.13.15.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 13:15:42 -0700 (PDT) From: Rosen Penev To: linux-edac@vger.kernel.org Cc: Borislav Petkov , Tony Luck , Kees Cook , "Gustavo A. R. Silva" , linux-kernel@vger.kernel.org (open list), linux-hardening@vger.kernel.org (open list:KERNEL HARDENING (not covered by other areas):Keyword:\b__counted_by(_le|_be)?\b) Subject: [PATCHv2] EDAC/mc: Use kzalloc_flex() Date: Thu, 19 Mar 2026 13:15:25 -0700 Message-ID: <20260319201525.174493-1-rosenp@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-edac@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Convert struct mem_ctl_info to use flex array and use the new flex array helpers to simplify initialization. Add __counted_by for extra runtime analysis when requested. Move counting assignment immediately after allocation as required by __counted_by. Signed-off-by: Rosen Penev Reviewed-by: Yazen Ghannam --- v2: reword message slightly. drivers/edac/edac_mc.c | 9 ++------- include/linux/edac.h | 23 ++++++++++++----------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 29e9828422bb..1ffab0269aec 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -203,7 +203,6 @@ static void mci_release(struct device *dev) kfree(mci->csrows); } kfree(mci->pvt_info); - kfree(mci->layers); kfree(mci); } @@ -361,25 +360,21 @@ struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num, per_rank = true; } - mci = kzalloc_obj(struct mem_ctl_info); + mci = kzalloc_flex(*mci, layers, n_layers); if (!mci) return NULL; - mci->layers = kzalloc_objs(struct edac_mc_layer, n_layers); - if (!mci->layers) - goto error; - mci->pvt_info = kzalloc(sz_pvt, GFP_KERNEL); if (!mci->pvt_info) goto error; + mci->n_layers = n_layers; mci->dev.release = mci_release; device_initialize(&mci->dev); /* setup index and various internal pointers */ mci->mc_idx = mc_num; mci->tot_dimms = tot_dimms; - mci->n_layers = n_layers; memcpy(mci->layers, layers, sizeof(*layer) * n_layers); mci->nr_csrows = tot_csrows; mci->num_cschannel = tot_channels; diff --git a/include/linux/edac.h b/include/linux/edac.h index fa32f2aca22f..deba46b3ee25 100644 --- a/include/linux/edac.h +++ b/include/linux/edac.h @@ -541,17 +541,6 @@ struct mem_ctl_info { struct csrow_info **csrows; unsigned int nr_csrows, num_cschannel; - /* - * Memory Controller hierarchy - * - * There are basically two types of memory controller: the ones that - * sees memory sticks ("dimms"), and the ones that sees memory ranks. - * All old memory controllers enumerate memories per rank, but most - * of the recent drivers enumerate memories per DIMM, instead. - * When the memory controller is per rank, csbased is true. - */ - unsigned int n_layers; - struct edac_mc_layer *layers; bool csbased; /* @@ -609,6 +598,18 @@ struct mem_ctl_info { u8 fake_inject_layer[EDAC_MAX_LAYERS]; bool fake_inject_ue; u16 fake_inject_count; + + /* + * Memory Controller hierarchy + * + * There are basically two types of memory controller: the ones that + * sees memory sticks ("dimms"), and the ones that sees memory ranks. + * All old memory controllers enumerate memories per rank, but most + * of the recent drivers enumerate memories per DIMM, instead. + * When the memory controller is per rank, csbased is true. + */ + unsigned int n_layers; + struct edac_mc_layer layers[] __counted_by(n_layers); }; #define mci_for_each_dimm(mci, dimm) \ -- 2.53.0