From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f198.google.com (mail-dy1-f198.google.com [74.125.82.198]) (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 710AC568532 for ; Tue, 13 Oct 2026 22:40:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.198 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791931242; cv=none; b=ZEvugvw6hw6sUrq09Z/7UIsYnPcE++fDuWcUfsmdY3ulorzmqf3Fa2g1hDwfBQVFHln1fr0NUx8Ra8rhJs26nYzr15b/0HfMdH8ovKCGcIzUSSlht44TV0c5e5wtcZCzEWVxbFvJHFz8JEZNbEvsYlnwV6sOgl/GRMxvoNL6qKU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791931242; c=relaxed/simple; bh=8Gue2D8FQmaltlyoDbMsbnZp55Xg5g8xWwVlxRKB8Ck=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jrwfKBpqLgV5bzQGin90exj4KhKL9HDXJiLWHwqVnn4EboCojSG6MyKra5cnpuZNhu8hDfvX6yXp/pTifqaqh7nAsagTBO44i+vd5Q3PKwPYZ+9K++njFjx6U7i3tiEcvNVKbAYw1YVZyCkpVm+3Al3P40ap+zLuSihTFux8Uhw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=rj+C+eNX; arc=none smtp.client-ip=74.125.82.198 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="rj+C+eNX" Received: by mail-dy1-f198.google.com with SMTP id 5a478bee46e88-33c35f5ca6cso7840781eec.1 for ; Tue, 13 Oct 2026 15:40:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1791931231; x=1792536031; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=E3db36lwsPWQArDIHzP6eqDHTacNJpd6D0FMiQjZlVc=; b=rj+C+eNXOent5Mi1/wd3KOhalv/vtqTtEJbJ+egQ+qFOsL8TSAkizXzKvYeKIT3Gif SEp9UTOzzHsTl9/PINSfb0zeoSXP7Ugi4c8RXsJR7fry/8ZXVbHsisByBm71gOmnoxqF R+l5sXVZM5Yo9d7/IQAnzbeB6Nv82MbfCmeVD+hIM+NLxMKgNcZ1c+4poqTE7+3fl0Zr P7ocO0j54KigRbcDngIP1jseesCb4XMfaPenzWX6gplpAPydvmHernQcWmdcVaeT6uLC WY/4Pj4+yuS+Tb+9GhfZK8ENw+dYMKr3aHB3Wb3qQT0+WPyeAVSMuFBaDm8p8/CZnK/6 +Lpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791931231; x=1792536031; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=E3db36lwsPWQArDIHzP6eqDHTacNJpd6D0FMiQjZlVc=; b=QUTjA0Pcpb8dOavsBsfynZJqNWwH9Bkcp2agEdRnM+S7U0Y6RwvwvZzKtA6SLbXLOA oRJld3U/v/sW8P0qwlbbtxgMvPzvrlLVaTjoB7GPTjXUOQM/mlizRMA84WQtZOUqotiv tYXUg4m8lE7uU/KvykE0f3uQ0npc3tLnyGPnvjJ1kcCJ6INF7/Ib3QOWt6wIJo/cHoSc F6lDLiH6fJhXUyl6Ton/4zcMQI0bYR+uTGtaTK1ALCoDVnXW4GN88BdnGl6pIr8LfhFK QEz0VT0QUOB/B2OrQNAt5izbe3dD2IuPgLj5VxMaIyHuj4r4RKdLRm2/h6LbZczIFikm Kk2g== X-Forwarded-Encrypted: i=1; AKwUvBy1CJr09vCDFKPIi1skmFjqdMw+tEMwbuqWx9eeaDP9D43h6fX54GUxBeyhalyFZ7gfzMJL7A49GLFx1/E=@vger.kernel.org X-Gm-Message-State: AFq9FYKsGWeJlMzeIT+u5zSTvjgSAEb0i0loVhHCAAw6gEBy3OWMxXC8 hH/5kahO8D5siVi5KnSjQfbhFDW2qkCdnfipkqUdvv9Mw8/Ndt2+vhVcHX4Pph1mGF1XKGcxvuD 6oqSJdAgjlA== X-Received: from dybmd37.prod.google.com ([2002:a05:7301:1825:b0:351:1da6:c2e7]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:78cb:b0:351:515b:4e85 with SMTP id 5a478bee46e88-3537e088bd7mr19706222eec.16.1791931230851; Tue, 13 Oct 2026 15:40:30 -0700 (PDT) Date: Tue, 13 Oct 2026 15:39:43 -0700 In-Reply-To: <20261013223946.1836757-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20261013223946.1836757-1-irogers@google.com> X-Mailer: git-send-email 2.56.0.385.gd3acb90ef8-goog Message-ID: <20261013223946.1836757-9-irogers@google.com> Subject: [PATCH 08/11] s390/sclp_mem: Allocate struct sclp_mem dynamically and add kobject release From: Ian Rogers To: Greg Kroah-Hartman , "Rafael J . Wysocki" , Danilo Krummrich , Miguel Ojeda , Kees Cook , Nathan Chancellor Cc: Nick Desaulniers , Bill Wendling , Justin Stitt , Jonathan Corbet , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Nayna Jain , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , Viresh Kumar , David Teigland , Alexander Aring , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Richard Weinberger , Zhihao Cheng , Felix Kuehling , Alex Deucher , "=?UTF-8?q?Christian=20K=C3=B6nig?=" , driver-core@lists.linux.dev, llvm@lists.linux.dev, linux-hardening@vger.kernel.org, linux-doc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org, gfs2@lists.linux.dev, xen-devel@lists.xenproject.org, linux-s390@vger.kernel.org, linux-mtd@lists.infradead.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Ian Rogers Content-Type: text/plain; charset="UTF-8" sclp_init_mem() allocated a single array of struct sclp_mem with kzalloc_objs() and registered each embedded kobject using a kobj_type without a .release callback. Allocate each struct sclp_mem individually with kzalloc_obj() instead and add sclp_mem_release() to free it. Fixes: ff18dcb19aab ("s390/sclp: Add support for dynamic (de)configuration of memory") Assisted-by: Antigravity:gemini-3.1-pro Signed-off-by: Ian Rogers --- drivers/s390/char/sclp_mem.c | 73 +++++++++++++++++------------------- 1 file changed, 34 insertions(+), 39 deletions(-) diff --git a/drivers/s390/char/sclp_mem.c b/drivers/s390/char/sclp_mem.c index 6df1926d4c62..f7c161e0d836 100644 --- a/drivers/s390/char/sclp_mem.c +++ b/drivers/s390/char/sclp_mem.c @@ -49,11 +49,6 @@ struct sclp_mem { #endif }; -struct sclp_mem_arg { - struct sclp_mem *sclp_mems; - struct kset *kset; -}; - struct assign_storage_sccb { struct sccb_header header; u16 rn; @@ -304,7 +299,15 @@ static ssize_t sclp_memmap_on_memory_store(struct kobject *kobj, struct kobj_att return rc ? rc : count; } +static void sclp_mem_release(struct kobject *kobj) +{ + struct sclp_mem *sclp_mem = container_of(kobj, struct sclp_mem, kobj); + + kfree(sclp_mem); +} + static const struct kobj_type ktype = { + .release = sclp_mem_release, .sysfs_ops = &kobj_sysfs_ops, }; @@ -321,36 +324,40 @@ static struct attribute_group sclp_mem_attr_group = { .attrs = sclp_mem_attrs, }; -static int sclp_create_mem(struct sclp_mem *sclp_mem, struct kset *kset, - unsigned int id, bool config, bool memmap_on_memory) +static int sclp_create_mem(struct kset *kset, unsigned int id, bool config, + bool memmap_on_memory) { + struct sclp_mem *sclp_mem; int rc; + sclp_mem = kzalloc_obj(*sclp_mem); + if (!sclp_mem) + return -ENOMEM; sclp_mem->memmap_on_memory = memmap_on_memory; sclp_mem->config = config; #ifdef CONFIG_KASAN sclp_mem->early_shadow_mapped = config; #endif sclp_mem->id = id; - kobject_init(&sclp_mem->kobj, &ktype); - rc = kobject_add(&sclp_mem->kobj, &kset->kobj, "memory%d", id); - if (rc) + rc = kobject_init_and_add(&sclp_mem->kobj, &ktype, &kset->kobj, + "memory%d", id); + if (rc) { + kobject_put(&sclp_mem->kobj); return rc; - return sysfs_create_group(&sclp_mem->kobj, &sclp_mem_attr_group); + } + rc = sysfs_create_group(&sclp_mem->kobj, &sclp_mem_attr_group); + if (rc) { + kobject_put(&sclp_mem->kobj); + return rc; + } + return 0; } static int sclp_create_configured_mem(struct memory_block *mem, void *argument) { - struct sclp_mem *sclp_mems; - struct sclp_mem_arg *arg; - struct kset *kset; - unsigned int id; + struct kset *kset = argument; - id = mem->dev.id; - arg = (struct sclp_mem_arg *)argument; - sclp_mems = arg->sclp_mems; - kset = arg->kset; - return sclp_create_mem(&sclp_mems[id], kset, id, true, false); + return sclp_create_mem(kset, mem->dev.id, true, false); } static void __init align_to_block_size(unsigned long *start, @@ -368,8 +375,7 @@ static void __init align_to_block_size(unsigned long *start, *size = size_align; } -static int __init sclp_create_standby_mems_merged(struct sclp_mem *sclp_mems, - struct kset *kset, u16 rn) +static int __init sclp_create_standby_mems_merged(struct kset *kset, u16 rn) { unsigned long start, size, addr, block_size; static u16 first_rn, num; @@ -394,7 +400,7 @@ static int __init sclp_create_standby_mems_merged(struct sclp_mem *sclp_mems, goto skip_add; for (addr = start; addr < start + size; addr += block_size) { id = addr / block_size; - rc = sclp_create_mem(&sclp_mems[id], kset, id, false, + rc = sclp_create_mem(kset, id, false, mhp_supports_memmap_on_memory()); if (rc) break; @@ -405,45 +411,34 @@ static int __init sclp_create_standby_mems_merged(struct sclp_mem *sclp_mems, return rc; } -static int __init sclp_create_standby_mems(struct sclp_mem *sclp_mems, struct kset *kset) +static int __init sclp_create_standby_mems(struct kset *kset) { struct memory_increment *incr; int rc = 0; list_for_each_entry(incr, &sclp_mem_list, list) { if (incr->standby) - rc = sclp_create_standby_mems_merged(sclp_mems, kset, incr->rn); + rc = sclp_create_standby_mems_merged(kset, incr->rn); if (rc) return rc; } - return sclp_create_standby_mems_merged(sclp_mems, kset, 0); + return sclp_create_standby_mems_merged(kset, 0); } static int __init sclp_init_mem(void) { - const unsigned long block_size = memory_block_size_bytes(); - unsigned int max_sclp_mems; - struct sclp_mem *sclp_mems; - struct sclp_mem_arg arg; struct kset *kset; int rc; - max_sclp_mems = roundup(sclp.rnmax * sclp.rzm, block_size) / block_size; - /* Allocate memory for all blocks ahead of time. */ - sclp_mems = kzalloc_objs(struct sclp_mem, max_sclp_mems); - if (!sclp_mems) - return -ENOMEM; kset = kset_create_and_add("memory", NULL, firmware_kobj); if (!kset) return -ENOMEM; /* Initial memory is in the "configured" state already. */ - arg.sclp_mems = sclp_mems; - arg.kset = kset; - rc = for_each_memory_block(&arg, sclp_create_configured_mem); + rc = for_each_memory_block(kset, sclp_create_configured_mem); if (rc) return rc; /* Standby memory is "deconfigured". */ - return sclp_create_standby_mems(sclp_mems, kset); + return sclp_create_standby_mems(kset); } static void __init insert_increment(u16 rn, int standby, int assigned) -- 2.56.0.385.gd3acb90ef8-goog