From nobody Tue Apr 7 01:16:57 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 9F3F713959D for ; Tue, 17 Mar 2026 00:37:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773707870; cv=none; b=UzHAwf0CYNsbYfcLJiyRJ9BeUwhGi72vSyZyYD4bPWnTUOflZ8p3zbqBzcgoFaFSENlVOWWd5tGYsozAXcArprUjeYzqf5Q5PLn18aWFPtuiv0kkwA3KemAl0QHeoH7ovslxQinvzgrhWWdlilhcVzeH2vflCLoF0XQrqL6iTyg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773707870; c=relaxed/simple; bh=NBUx/E1eiB5B4UIv31tdu/QKTosgVuyh/723Ruw5qWs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ezjfqypO1riNhOpzH+03laa+CjvwMTiHzOparbn0JJWHuFpb92TWyNEndUAxXf1cokG1CKD3fmdAhS6HTcr7GKPo0HWdik3q6rIcjvyZ/Y6ZWKpq0jThA1podtyBwRUsL4mONzHbEC1gPmWIV3Xy0tObxFncUANOC+E3YhRLL7s= 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=XDHtL+Rf; arc=none smtp.client-ip=209.85.214.182 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="XDHtL+Rf" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2ad9f316d68so24991415ad.2 for ; Mon, 16 Mar 2026 17:37:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773707869; x=1774312669; 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=8YvdzXjDD8G0Iw759gOEg4e+kzUc/b7ysSStVnoVNAU=; b=XDHtL+RfLbPFsCozxR/f1EJ1p73BE/XW2SNZQsVgoLXWjKQ1j2C9EOlzxKHVHBDrKT ExYcq+Hgf6ieLECazVgyK8UUw/temaUE3l5RUZrFEC8jlqusD7cmXomztX6KQfntXmjE 6idcRy2l9OsoZJrFtD6HuP5f0ldtlqQutQ8KVFsuPicVwu/iEUGLwSdAIHwxJ1q/rzef HcGMUBvxW57Z5b81PhXlHX5Dz5abtplXf3P4azPyp4zza1siwjj8sllJuJi6gj/wdPkr hhJKscZ/SXpC9XglsaIbYuZ6WyjBO/4p1kLesd05KvcosUyAbBVKib11w0U7ACtUODpz M69Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773707869; x=1774312669; 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=8YvdzXjDD8G0Iw759gOEg4e+kzUc/b7ysSStVnoVNAU=; b=O5xTgm9qysqedZVOaIjW1AFcYI+T10avv7hYUEsqGpaJe3OzHSU9gAwSyHm6bdC+Kt JlTiEMWTUf2ei6Ao5Pnmnm62oqWAAC8imMUeYBRRSLeGJchBXbLJkZhJnir7sXFFjtZu 9nN05FOq3y09hYr7w8jTVVl2WihxmL2XGG2WRCxp8jwar8ilJ7VB0TeOWCLnz/2oNqyw QMnlj9HKoVcjRO03ea3ySaegHYdotRgTpB/snEYjoCK4EXMjMjkHP8+q40UFg49EfW/g VKCHmy3rgnBBZ3lHUxXpcp1h08FRVuvKrqs2HIMhmEyK+ILKD3rRnAIpkHdHr5JgnQPM I0aA== X-Forwarded-Encrypted: i=1; AJvYcCW0/NBh5vBtFaJ7GqCC6D/4UTDW7s/5knek8K17Pad0hw6OAzOfDuMnyv851w73HTTd3H/bJQL2QKw0Sk8=@vger.kernel.org X-Gm-Message-State: AOJu0YxqQmGlMlEWuhvU5upl8D22zMfQ0M+6oCmMJvTd5RzcCzWBbZ5v 9+9kLJahwWWxqT0yFz+VDq2lzceiAl6UccmC3mvckjpFxXyxRXFxISTh X-Gm-Gg: ATEYQzwHDGKf0tm8cvVQVqSvbBOlA3xzPJvVV2lnO27GNTpqJDVOyD43emy4lE2EAQj 3YMv5gAx3KoKBQgHHKf1Xypzb0fBMVmdnERUCvn5bL9VqWOyt/9gg15D/UP+GV7KPaGnTi78TSe P2+hd8UYts64Xqms6GSUMInKDji7mzZdC9rFX3bm/nC93UyxTow6i1pEElveCSwoilevMPQh5Ei uCJuLa5XcK9kpdGAmem1sjizfWxli9gM0gX0H5d5RjrXXhtSC0ACDpL4GhTUB9hb1toYAQIVjsa esFG7pvEUHnlEWhzJM8zIlE1WA5z1fnqXYK09tLt7YR1YNSGmagRGucaQqev7I5HX1HBIR5CRG6 pnriM18euEu2iF7GFZrR6dqqgmuT4MeoKG8Ax+/6NopPjZsDY4FyYVcjslLvM1L4TWlUd3Koq3u 4XCy/H7eJBZLIexjW2qyD1A3jNrbt8nUsuPr7dn+f4HGaY7deUxxy9X6c= X-Received: by 2002:a17:902:e841:b0:2ae:a45b:42f7 with SMTP id d9443c01a7336-2aecaaf604amr162102125ad.36.1773707869018; Mon, 16 Mar 2026 17:37:49 -0700 (PDT) Received: from ryzen ([2601:644:8000:56f5::8bd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2aece7ede79sm155391855ad.53.2026.03.16.17.37.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 17:37:47 -0700 (PDT) From: Rosen Penev To: dmaengine@vger.kernel.org Cc: Vinod Koul , Frank Li , 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: [PATCH] dmaengine: idma64: use kzalloc_flex Date: Mon, 16 Mar 2026 17:37:30 -0700 Message-ID: <20260317003730.72379-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" Simplifies allocations by using a flexible array member in this struct. Remove idma64_alloc_desc. It now offers no readability advantages in this single usage. Add __counted_by to get extra runtime analysis. Apply the exact same treatment to struct idma64_dma and devm_kzalloc. Signed-off-by: Rosen Penev --- drivers/dma/idma64.c | 30 ++++-------------------------- drivers/dma/idma64.h | 4 ++-- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/drivers/dma/idma64.c b/drivers/dma/idma64.c index 5fcd1befc92d..cf0399251ea9 100644 --- a/drivers/dma/idma64.c +++ b/drivers/dma/idma64.c @@ -192,23 +192,6 @@ static irqreturn_t idma64_irq(int irq, void *dev) =20 /* ---------------------------------------------------------------------- = */ =20 -static struct idma64_desc *idma64_alloc_desc(unsigned int ndesc) -{ - struct idma64_desc *desc; - - desc =3D kzalloc_obj(*desc, GFP_NOWAIT); - if (!desc) - return NULL; - - desc->hw =3D kzalloc_objs(*desc->hw, ndesc, GFP_NOWAIT); - if (!desc->hw) { - kfree(desc); - return NULL; - } - - return desc; -} - static void idma64_desc_free(struct idma64_chan *idma64c, struct idma64_desc *desc) { @@ -223,7 +206,6 @@ static void idma64_desc_free(struct idma64_chan *idma64= c, } while (i); } =20 - kfree(desc->hw); kfree(desc); } =20 @@ -307,10 +289,12 @@ static struct dma_async_tx_descriptor *idma64_prep_sl= ave_sg( struct scatterlist *sg; unsigned int i; =20 - desc =3D idma64_alloc_desc(sg_len); + desc =3D kzalloc_flex(*desc, hw, sg_len); if (!desc) return NULL; =20 + desc->ndesc =3D sg_len; + for_each_sg(sgl, sg, sg_len, i) { struct idma64_hw_desc *hw =3D &desc->hw[i]; =20 @@ -326,7 +310,6 @@ static struct dma_async_tx_descriptor *idma64_prep_slav= e_sg( hw->len =3D sg_dma_len(sg); } =20 - desc->ndesc =3D sg_len; desc->direction =3D direction; desc->status =3D DMA_IN_PROGRESS; =20 @@ -541,18 +524,13 @@ static int idma64_probe(struct idma64_chip *chip) unsigned short i; int ret; =20 - idma64 =3D devm_kzalloc(chip->dev, sizeof(*idma64), GFP_KERNEL); + idma64 =3D devm_kzalloc(chip->dev, struct_size(idma64, chan, nr_chan), GF= P_KERNEL); if (!idma64) return -ENOMEM; =20 idma64->regs =3D chip->regs; chip->idma64 =3D idma64; =20 - idma64->chan =3D devm_kcalloc(chip->dev, nr_chan, sizeof(*idma64->chan), - GFP_KERNEL); - if (!idma64->chan) - return -ENOMEM; - idma64->all_chan_mask =3D (1 << nr_chan) - 1; =20 /* Turn off iDMA controller */ diff --git a/drivers/dma/idma64.h b/drivers/dma/idma64.h index d013b54356aa..1a67dbb24db5 100644 --- a/drivers/dma/idma64.h +++ b/drivers/dma/idma64.h @@ -113,10 +113,10 @@ struct idma64_hw_desc { struct idma64_desc { struct virt_dma_desc vdesc; enum dma_transfer_direction direction; - struct idma64_hw_desc *hw; unsigned int ndesc; size_t length; enum dma_status status; + struct idma64_hw_desc hw[] __counted_by(ndesc); }; =20 static inline struct idma64_desc *to_idma64_desc(struct virt_dma_desc *vde= sc) @@ -187,7 +187,7 @@ struct idma64 { =20 /* channels */ unsigned short all_chan_mask; - struct idma64_chan *chan; + struct idma64_chan chan[]; }; =20 static inline struct idma64 *to_idma64(struct dma_device *ddev) --=20 2.53.0