From nobody Tue Apr 7 01:02:03 2026 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (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 41246282F19 for ; Tue, 17 Mar 2026 03:17:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773717430; cv=none; b=kCZJZbG/eWn64bBXaASSUZsnDQy+wnlqRY157/TOJGXq1UtdidYf6owNrFzjJnKjPg56sSeuTJHL9CR25GaZUdLDbjNMa/4npblhGTj0v/TDBDJlwH0osTCVoPn4lNTfvuAiYuQOcDuVFba2QJMxemyUHDUCQQcVw5KPR+vyS2o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773717430; c=relaxed/simple; bh=k6Ew+lvXzfY+FBqQY/XE6H20WHXueQjInyqHxkeuCow=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=uv7VOAZeDCe3sr61OZFuLckSHkJcxEX700LKD8K/AJOOzM2ow/tvhhZNg1oy+K09X8kynbZW0MHQ2X/tDnT+5ThYLZbA6i+cjnCQ+GX1DfoFa/E9JmQldO0NZG44uDSCLnOEfaOr4meUZ0NGD2Oy7ie+0K135ibYyTveQ3Y31TI= 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=depkSuI8; arc=none smtp.client-ip=209.85.215.177 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="depkSuI8" Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-c70bfef17a4so3451231a12.2 for ; Mon, 16 Mar 2026 20:17:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773717428; x=1774322228; 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=cS+uHVcQ6W17khP+tSxWlPevxoYz4a9bCO/ehxDx5zg=; b=depkSuI8pjTzuawErKNfbHULZkrrr6oEezBq0fsyv20AEtfeQo1QWsmlSXF2mM4CnL ufCgeJDO7vQUPwuXxNih0BshyzmNFX5SQRqz6dflhsre3a12/8YfBuTihT3SBEKq2gPf cYGjwdR+EbagoStLmh7FxmFbmGBVlZlJ8icmJevhHGXLjf2Bia3LqoM2H4WZwpOVnuVJ 6D1EHr52bIvcX47PuIytp82HNIojaj20oTRrcL81EczbjdVzt4Q91O1YtrwEBPnwD1ax ukQuk7RO3caTr/6xM4su+cB67NhArp2eeR3tndVcIRCjNIZMlRUQOsxqPMzjkoyI7ccX bCOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773717428; x=1774322228; 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=cS+uHVcQ6W17khP+tSxWlPevxoYz4a9bCO/ehxDx5zg=; b=m+hJkI1+8zsE9N6TP0VcX3TqAGWx+bi3diBR145K+XQEwVZukTRT+r07ETT1b4pn8s XLdQ9KE0JCrNacJjlnF84j+oirwQV5wYsYvWuxiqnXKTXFjyF21D5uorVVl+X7qzFO7U gzZZLw6wPqsk20KWWnbYyyknScE7nVqASkjgaXHEAlnu/qxaTGaODKOWFfZgJ1iNUV4g A9THIDpdsuo5riQhxZb3oNu7gw4TJ002/syoYUB5ow3rXhrPmNEq2wZXB+iWszniA6R9 4cwb0c8TlUPNgMeTxrSf4+zfBhG7t7F8biwFwzSG/ZQi+EZaO8cegjeAdug3GGbql7DR Cg9w== X-Forwarded-Encrypted: i=1; AJvYcCVOJ+ycj2aaD9AcsrWVzB6XIyfHq53XL1CY+xbea2a9XcuDlSdIKIaQzsp4bSYhnN6nd0EFdxXYvSc8T2g=@vger.kernel.org X-Gm-Message-State: AOJu0YzYNgRLoJT0Dwar5kPWTZY9IJb/k4m+59w9IZsbFp9pKYnK1A+n FYhU8lPlg0NZOZYIMm1224IC582Dx0t6WtkN0paT+Nvb0u7/KLp1jTbh X-Gm-Gg: ATEYQzxMWGIGbs/1oY+N6qMLZcnDfiDq5pqTC8w9HFF12GYQzsPtywc4Nkyd13g5YfL frCki/HqzjUGCly2cryEMeYVQkH8xqS3vIMMv6gxHCQWK57IdKb+UnnVar+5MXYNgpnNb4QsYR1 wSX3rGO7TF11Qg9Tmng1LGapL3DwJWQf9a0UXDmrj8dQSG7MH2j1UzYfZYZJQ6BlsK72AKxByiw u/yv9KDAXO0X3+WH6OLTyiZTxC11wRbLzk3HWU2Z9xejmeZOB7IgA6SOHUQhtBPCEPLT67i3FkA o7Mz00ZuxaQe7hsDfY/Z/my+2grYa3iULJSfSVvk1VBgMVx6hfBn93kpwlJWinZXPjEwBMMt3xT eDxmiZXFHF7xcPnFOb/r+mxr7HOnyoEx3KytNMBVZRlTFBj06qpQ3sEtplt+pwFijWiR/7GSQ8m 9pal4/mjVojQ9mhVuKWsgemOBF30RsXazKdjoh561LiVpYxEjc6CagFaY= X-Received: by 2002:a17:903:2b06:b0:2b0:68d1:2557 with SMTP id d9443c01a7336-2b068d12649mr23135ad.45.1773717428472; Mon, 16 Mar 2026 20:17:08 -0700 (PDT) Received: from ryzen ([2601:644:8000:56f5::8bd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aece56c2b9sm149564365ad.18.2026.03.16.20.17.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 20:17:07 -0700 (PDT) From: Rosen Penev To: linux-edac@vger.kernel.org Cc: Yazen Ghannam , Tony Luck , Borislav Petkov , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] RAS/AMD/FMPM: use struct_size_t Date: Mon, 16 Mar 2026 20:16:50 -0700 Message-ID: <20260317031650.93712-1-rosenp@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Avoids manual size calculation with the proper helper. Also use kzalloc_flex for the same reason. Signed-off-by: Rosen Penev Reviewed-by: Yazen Ghannam --- drivers/ras/amd/fmpm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/ras/amd/fmpm.c b/drivers/ras/amd/fmpm.c index 34ef75af31cb..af862fbb04a8 100644 --- a/drivers/ras/amd/fmpm.c +++ b/drivers/ras/amd/fmpm.c @@ -150,7 +150,7 @@ static unsigned int max_nr_fru; /* Total length of record including headers and list of descriptor entries= . */ static size_t max_rec_len; =20 -#define FMPM_MAX_REC_LEN (sizeof(struct fru_rec) + (sizeof(struct cper_fru= _poison_desc) * 255)) +#define FMPM_MAX_REC_LEN struct_size_t(struct fru_rec, entries, 255) =20 /* Total number of SPA entries across all FRUs. */ static unsigned int spa_nr_entries; @@ -794,8 +794,7 @@ static int get_system_info(void) =20 spa_nr_entries =3D max_nr_fru * max_nr_entries; =20 - max_rec_len =3D sizeof(struct fru_rec); - max_rec_len +=3D sizeof(struct cper_fru_poison_desc) * max_nr_entries; + max_rec_len =3D struct_size_t(struct fru_rec, entries, max_nr_entries); =20 pr_info("max FRUs: %u, max entries: %u, max record length: %lu\n", max_nr_fru, max_nr_entries, max_rec_len); @@ -826,7 +825,7 @@ static int allocate_records(void) } =20 for (i =3D 0; i < max_nr_fru; i++) { - fru_records[i] =3D kzalloc(max_rec_len, GFP_KERNEL); + fru_records[i] =3D kzalloc_flex(*fru_records[i], entries, max_nr_entries= ); if (!fru_records[i]) { ret =3D -ENOMEM; goto out_free; --=20 2.53.0