From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 652B68472 for ; Wed, 29 Jul 2026 01:06:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785287177; cv=none; b=SRKLc36ZT1RGGj5X6nBdJPSk+roiAKSUDtk3nzxxQJIuWCZ+Zm+5CuFzyLII9TMBrS9uqxUcV+Tb81opeeTkhDawZ8/xTon+xV0Nd97Dg/V15RHNmp4He7jXMPpD/tjuOikUvxSTxDEwML5MoIRpS6hUFdzfoCpfFjWhpKNEYrU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785287177; c=relaxed/simple; bh=T5IjCjOJrodc7fhcJnxghWuloAoJ3cK0L9MhlqRcjW8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=IqqMRB2wRRxlTxXm7UPEHEpLe6V6XIprzk8h6WCU9CHHOVWInsrMbapbBWBaZ5/p/7BD0Q/zJ2mYs7L4P+o7yQYxWY+NGaZby68WQr8yw6PBcwy4I9m0zo6HI9lLt1UzdfL4BxWH6tFAuSq1a18mwqSKzmIUxPDEdM+NC6rTgJM= 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=GPZ8Cgnn; arc=none smtp.client-ip=209.85.210.179 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="GPZ8Cgnn" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-84e84a6c4bfso395854b3a.1 for ; Tue, 28 Jul 2026 18:06:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785287176; x=1785891976; 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:content-type; bh=28woVQ5e39EeLg3xlYHy6X58JzWK3j8h7TCqWlJWO6A=; b=GPZ8Cgnnjgeu6W4QDzb0vgpwFqaRKWE8YNcoL0pqWADNnVVfC4EHy0yxc+nmztMy3t pl3BJkYqNpPrefCjt3oMblEmy8EhVEGiWe7O3JE6CfPk30S+HihNkdur9pG12peq74XU Q2IZLErBfsVnvl1KJvZaDBJL0WgAiesruUQJEY6x52Pr9sYPXsvNK98VScXeRTDjMDqE DaXaFTeXVz3HTOiwiyfO4K+BSsNFu1LiBLVLxcVeE3LtXN7w8KKeryKa1T3dgxrAK2Nt dnR7tZhsDrrT2Ipi0L76QBXLoMZqcXztKJ4eCN6dNj68Gf9TDrtSStcSX+GCkFh9gxlk IPBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785287176; x=1785891976; 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:content-type; bh=28woVQ5e39EeLg3xlYHy6X58JzWK3j8h7TCqWlJWO6A=; b=pqoLpKGHO7fob04m+2Qc/GDlN9mdFkctRQdXG8GQgjdRL8iZzb60R6XQ3DJZM4s927 0T8afnvl9wEZk8K9Hz7D+/9dl8Ukpeo/ywU6zWz8YcGL90U83iqaXRbaZLce3izPKS2p ZOfQXqVpRyKcldC5Pw0GKlifU5ZlXcB43SLKU62+P00LH7nVHyv1eXFPsBJgRJrrtPqc CO0k5snHy+X/8uRVfWVcSnQMXQXhMdocEa9ZKn+Y0TLT6sZZCDswmaxMab4bBysDGvun 0sLwCNIgV0Z9ujBQY0dsVe3tDyBUFL6593QXatdpvI48OIF/A2aFh1X6aMPxWhexm42f NCGg== X-Forwarded-Encrypted: i=1; AHgh+RriYFneja82Usa7r+TgnD3v3+ZdWJgJw3B1cLV+QX1m8E23a+RI0ryh6BuwFFiwdz2HHavaCyQgH1ppZqg=@vger.kernel.org X-Gm-Message-State: AOJu0YxtRCvzYAY/7V7TY1OBvgY5WGPlp2UMpK7lqoDq3rOgZtkJn9+R VpBArIfkV9DAG5LOEoeuKEIcTqnNvTS1FikWrFDg6EYH1l7hNAqV5mDsn1qm42JM X-Gm-Gg: AR+sD11E/mMEl66kdIvUn5tIODnafUx4wOt+izyF1EXl7Lpa8f+i8j11Zq4l90x5hQR ml/TnaSVKt+bFikWnTqC7Dc7ULgf4wZ6uSyAHahfN26p6uFnlN7P4ZJi/EJhhOS8gwpFWW5qrW9 w9VwRg24oyYphTyi7tEMTTBZgLXo9qYb/W4/PRwDoLhSDkGvi3+inQh4w9zAFB7n5MlUQYnHLNp o9LbyVu9fKTrsbbWBUXozDIxoRTokJig+2d4W8RwvjhDnyCkIASRm5WkXiV+o7F92TOGl6uB4Oo YuT6WP9enVArisZt3ptByQmkK926xLq8nFhfDzr576ry7BlrJdhUYbdBVdzTlH7puRoAAHfzNxI IjRzJfxZq5d/fCrXgyVZCjmFw+DEtTtp20qT5ghGwGhEf6Z6j8iwjYMEPGTXD76bZgJisuqsUE8 YO04lGCGgDJ90n2I9GSO5aPQQISS4W0RlNWXT9amCqvWrXl9zR0mT4vzWpsPsiwEMos31ZTxc6W dZpj9Mu73i2NuLYRyNPXngKfAZSITEaSBZs3u1jdAnvXtpHIQkp6zu4jJ8cMb24+jHaNbpqoQmh 7DvcHXb8op+ugKZEXeYWDd4Ey6iflX/1StdxikCwc8lNKpXV X-Received: by 2002:a05:6a00:32cd:b0:84c:2d22:7307 with SMTP id d2e1a72fcca58-84ea798e94fmr270666b3a.13.1785287175535; Tue, 28 Jul 2026 18:06:15 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e35]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84ea0373ad9sm562711b3a.40.2026.07.28.18.06.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2026 18:06:14 -0700 (PDT) From: Rosen Penev To: linux-edac@vger.kernel.org Cc: Borislav Petkov , Tony Luck , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] EDAC/device: Use flexible array for scrub data Date: Tue, 28 Jul 2026 18:06:13 -0700 Message-ID: <20260729010613.607577-1-rosenp@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Store EDAC scrub feature data in the device feature context allocation instead of allocating it separately. This ties the scrub data lifetime directly to the feature context, removes a separate allocation failure path. Assisted-by: Codex:GPT-5.5 Signed-off-by: Rosen Penev --- drivers/edac/edac_device.c | 12 ++---------- include/linux/edac.h | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index cf0d3c2dfc04..fd3e4631ce17 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c @@ -577,7 +577,6 @@ static void edac_dev_release(struct device *dev) struct edac_dev_feat_ctx *ctx = container_of(dev, struct edac_dev_feat_ctx, dev); kfree(ctx->mem_repair); - kfree(ctx->scrub); kfree(ctx->dev.groups); kfree(ctx); } @@ -643,7 +642,7 @@ int edac_dev_register(struct device *parent, char *name, } } - ctx = kzalloc_obj(*ctx); + ctx = kzalloc_flex(*ctx, scrub, scrub_cnt); if (!ctx) return -ENOMEM; @@ -651,16 +650,10 @@ int edac_dev_register(struct device *parent, char *name, if (!ras_attr_groups) goto ctx_free; - if (scrub_cnt) { - ctx->scrub = kzalloc_objs(*ctx->scrub, scrub_cnt); - if (!ctx->scrub) - goto groups_free; - } - if (mem_repair_cnt) { ctx->mem_repair = kzalloc_objs(*ctx->mem_repair, mem_repair_cnt); if (!ctx->mem_repair) - goto data_mem_free; + goto groups_free; } attr_gcnt = 0; @@ -748,7 +741,6 @@ int edac_dev_register(struct device *parent, char *name, data_mem_free: kfree(ctx->mem_repair); - kfree(ctx->scrub); groups_free: kfree(ras_attr_groups); ctx_free: diff --git a/include/linux/edac.h b/include/linux/edac.h index a6b47d27052a..3d8ee12c11be 100644 --- a/include/linux/edac.h +++ b/include/linux/edac.h @@ -864,9 +864,9 @@ struct edac_dev_data { struct edac_dev_feat_ctx { struct device dev; void *private; - struct edac_dev_data *scrub; struct edac_dev_data ecs; struct edac_dev_data *mem_repair; + struct edac_dev_data scrub[]; }; struct edac_dev_feature { -- 2.55.0