From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (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 0AE0D1A08AF for ; Thu, 30 Apr 2026 22:07:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777586859; cv=none; b=fSABT4C0aCyFIXPNDciYuSjvKlhxFMR5Qanyxr1x0Rw9wg5okYqPm+OkKAEu890wNjvdkwaPGTedzMOGqEoWNPFxEQt0qazkDeMJxfWCsds1X5Gr/F3Z7xHzxxlIppFxWbmNwSSKyQ4ol3YwkRuypNK6o1pQ/m9xOFSSOfGpJrI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777586859; c=relaxed/simple; bh=sUSR6yYKVMugJ6H/WBev2fvd5REl28hEytX7WfecHuM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=B1lGviiOGU6dqQVtNez9RgKZUQ0ex/13y3GPukrhkDr4gtAN0R8urL9L/ydEEFrhPPgE5gIsxr2ajJmzbSuw56SMvVrd8xXpShxuQ4KaRHIsThIq98HeXZoYU+jRJA/wwt3q2W8c4QSWi6kJD1flkbxKocWFnCszNeYvCAihcms= 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=nhv3wQH7; arc=none smtp.client-ip=209.85.216.44 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="nhv3wQH7" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-35da1af3e10so1491186a91.3 for ; Thu, 30 Apr 2026 15:07:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777586857; x=1778191657; 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=io9P2rkHvmKPxGQBn5MKYkMRkO761qnxJqz17cwJFt0=; b=nhv3wQH7po271fTDZpQlRMABeyzh9cnzw5iLfqYxAAXy59Rwyc5Q9Vm7DEXLEpsu1k rBFSCigAjilo/HzNYNzz/GabjmRm6VmswC2AlNvP/y+9mU1xc5aep8VKtOj6YIXwxpBY 9t1Ujc4tAhfi+zCNPvqf49kDLlKLospSH1aBGk4PpaVgdvph5I+31RUwt+fLZeRs2y9h N1QbJSJHorv/2PeLpcWljiNHEvJKyz/8UEBTU2Lrk1QkKBcuAnlDvItKXcAAKDPW8/Wp hBy9vZzGJBJhL3bEQ3KNecVuBazGBWwNz+QLXwrOuH4Eot7pp4tC/K3ZnklguCdY37AH H67A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777586857; x=1778191657; 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=io9P2rkHvmKPxGQBn5MKYkMRkO761qnxJqz17cwJFt0=; b=RLK3rUy0H9uBqYxlY6MNYeUNZkaQ6k7EeO2/ajn032/PqSg+dL6Fx+G9UuM7TBPGH7 rBGKkyK/7CeqKh2CLnDE3i1GjXuv0VjefpjVCKoEnIkUax6hP9xL2Yns4K+9vvCP97dt Yng9XmPt+ew0Q5Zc6PqJmEkCcIUO/BuOBiAY8XceNZJUSIbCzHkDBf52AZ2EUA1tzTju n96e60k/r8oL3hJew1rayPquWolxoERVbDwvjaaejvbkp/az4tSN+gBuTuLM9VtHBYKN zCAnUg/Zm3RpWcHfX02zjUxKkdc5xB+qqYh3DWvAi5ypsUA8uuArddzLCAVOnwzL2mNv HlKA== X-Forwarded-Encrypted: i=1; AFNElJ8/FhSpl9tuflBuEWdjWC0LBXSK05vz8+Tf/mmo6wAEAL+MlQ7xyzf3oonQj7ID49zvc5juZ6DPurci1s4=@vger.kernel.org X-Gm-Message-State: AOJu0YyttqyIvL6CyL/bxlPj/BbW0S7CDDCawfgBod544tTzGwmR8p1G 0cz3oZ3+6s0+g56mYAxCU3xsFqRgX55nv4kzfgtmsJgKvSayRJFo5Naa03NipQ4B X-Gm-Gg: AeBDietlNEk1jhqODm8oS9krMYxoG5eBXQhddq9J+HUKZM0S64RwxHLZvUaJnLei5q9 1A9A0coiIokUsvYtcuxXDDO1JZNKIRTbjfkgT9rdgrs57SIB8hBPXD5px+icPz+PVE6kOg4DZlG ev5zxS+h0mxrT3Dr1eQ9hBnYSMdhdXLj7/GBWuGmAMHqsDci4k143M29YEN8ZxRX54yzr4ySajw Z697RjzCLlBt/rXUj10mM6IPl0ACO98KB+HhU7S0Z17kkhgA0jHEl9KYWrc/stq/2L7GADWCdHi Cfc8F5aTEqdLfU4wftU95ljW5vMbha1WJs31wIMLfw6jyiHinl0dCcAdD69+RSjgI1uxuZc5KMw UllM+N1uwNT5DOy3NEztnVQkdnTXC1SVidgf8gEC+XN1H6z4VteXYqzcpAuv3gUX8xifJb+Bt2K L7vUKOX3nlTGzBc3jj0Q5gt6v1qbH1Xz1XKbAXe8KYmvkGrnsbs3IzMjy4dmR3virvKT/QM4cbw TMVE70tsQt24vvOeOiawe6u6fP941wcfZKKt/2O9PeszhzrXC9dtFvh X-Received: by 2002:a17:90b:4a51:b0:35f:ba8e:150d with SMTP id 98e67ed59e1d1-364c312dcc8mr4771553a91.14.1777586857335; Thu, 30 Apr 2026 15:07:37 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-364ec00ad4dsm517183a91.11.2026.04.30.15.07.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2026 15:07:36 -0700 (PDT) From: Rosen Penev To: linux-mtd@lists.infradead.org Cc: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] mtd: sm_ftl: allocate cis_buffer with main struct Date: Thu, 30 Apr 2026 15:07:19 -0700 Message-ID: <20260430220719.77223-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.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 Use a flexible array member and kzalloc_flex() to do so. Simplifies memory allocation slightly. Signed-off-by: Rosen Penev --- drivers/mtd/sm_ftl.c | 30 +++++++++++------------------- drivers/mtd/sm_ftl.h | 2 +- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c index c8032755f9a4..fb0f97fb94f0 100644 --- a/drivers/mtd/sm_ftl.c +++ b/drivers/mtd/sm_ftl.c @@ -1133,7 +1133,7 @@ static void sm_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd) struct sm_ftl *ftl; /* Allocate & initialize our private structure */ - ftl = kzalloc_obj(struct sm_ftl); + ftl = kzalloc_flex(*ftl, cis_buffer, SM_SECTOR_SIZE); if (!ftl) goto error1; @@ -1145,25 +1145,20 @@ static void sm_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd) /* Read media information */ if (sm_get_media_info(ftl, mtd)) { dbg("found unsupported mtd device, aborting"); - goto error2; + goto error1; } - /* Allocate temporary CIS buffer for read retry support */ - ftl->cis_buffer = kzalloc(SM_SECTOR_SIZE, GFP_KERNEL); - if (!ftl->cis_buffer) - goto error2; - /* Allocate zone array, it will be initialized on demand */ ftl->zones = kzalloc_objs(struct ftl_zone, ftl->zone_count); if (!ftl->zones) - goto error3; + goto error2; /* Allocate the cache*/ ftl->cache_data = kzalloc(ftl->block_size, GFP_KERNEL); if (!ftl->cache_data) - goto error4; + goto error3; sm_cache_init(ftl); @@ -1171,7 +1166,7 @@ static void sm_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd) /* Allocate upper layer structure and initialize it */ trans = kzalloc_obj(struct mtd_blktrans_dev); if (!trans) - goto error5; + goto error4; ftl->trans = trans; trans->priv = ftl; @@ -1184,12 +1179,12 @@ static void sm_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd) if (sm_find_cis(ftl)) { dbg("CIS not found on mtd device, aborting"); - goto error6; + goto error5; } ftl->disk_attributes = sm_create_sysfs_attributes(ftl); if (!ftl->disk_attributes) - goto error6; + goto error5; trans->disk_attributes = ftl->disk_attributes; sm_printk("Found %d MiB xD/SmartMedia FTL on mtd%d", @@ -1206,17 +1201,15 @@ static void sm_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd) /* Register device*/ if (add_mtd_blktrans_dev(trans)) { dbg("error in mtdblktrans layer"); - goto error6; + goto error5; } return; -error6: - kfree(trans); error5: - kfree(ftl->cache_data); + kfree(trans); error4: - kfree(ftl->zones); + kfree(ftl->cache_data); error3: - kfree(ftl->cis_buffer); + kfree(ftl->zones); error2: kfree(ftl); error1: @@ -1242,7 +1235,6 @@ static void sm_remove_dev(struct mtd_blktrans_dev *dev) } sm_delete_sysfs_attributes(ftl); - kfree(ftl->cis_buffer); kfree(ftl->zones); kfree(ftl->cache_data); kfree(ftl); diff --git a/drivers/mtd/sm_ftl.h b/drivers/mtd/sm_ftl.h index 6aed8b60de16..1a1a54ce836a 100644 --- a/drivers/mtd/sm_ftl.h +++ b/drivers/mtd/sm_ftl.h @@ -39,7 +39,6 @@ struct sm_ftl { int cis_block; /* CIS block location */ int cis_boffset; /* CIS offset in the block */ int cis_page_offset; /* CIS offset in the page */ - void *cis_buffer; /* tmp buffer for cis reads */ /* Cache */ int cache_block; /* block number of cached block */ @@ -56,6 +55,7 @@ struct sm_ftl { int cylinders; struct attribute_group *disk_attributes; + u8 cis_buffer[]; /* tmp buffer for cis reads */ }; struct chs_entry { -- 2.54.0