From nobody Sat Jun 13 20:56:13 2026 Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) (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 0EAEF30EF9B for ; Mon, 6 Apr 2026 19:44:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775504686; cv=none; b=mbzUthOA/xCSj1n6v+Bv4d5Q6D1tuFloDBPbTR0NnTNxK50Lt7hA/+ZNr/+blf51Km0d0Vz9viGXD7zNfPmKEjM9II/OFgcaqIN3f/tD8POwWLT4mfTfxGY3NemU2Ut386VNTdsHIzEPpuWeJ+/raM7qHbK5BhV3gD0UGE1xEyw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775504686; c=relaxed/simple; bh=GR2DfTz553Yog8V3bm8Wviid+hmeEqLWZb0hdHRbJqc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=JZC04lMeZHGwwnXo14A9DverVfS6ZFVllIlrExIFMfqAAjs/6PKuIpDH5C6pzeafRWdxHcSk7bXz04AHj+5Saxg5RekNVxYa7ghirpHG6I4ZSsxJhg1NlYvvNla5f9ELj9NYYHa/7fT3cNgkI9mt5HbCbpKB4fW6DU1s0jiPNLs= 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=AlcThNXc; arc=none smtp.client-ip=209.85.219.41 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="AlcThNXc" Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-89fc4147f2eso56759156d6.3 for ; Mon, 06 Apr 2026 12:44:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775504683; x=1776109483; 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=8TKUkyB7WvjQA6crvLqj/5jSGIGyrb8D9bz30WYCfA4=; b=AlcThNXcUsJCE30LnfdKvG6lIi7PWMEKIoNJhnHzSxnSS4FpaACodnbUh6m6C7/nEc dcvsXCL4VqINHvBuT3o/IIroQyhsCovZ5z/KhQ7ug/tR137nWPj6hyqB/IKzlNqlLBgA WwoQZmvA19bBXFagJG8NBvQumw5eftu2x/RzS5fs/5yR2oQxR2MBKa4FLEC/78jTVU7I mO3xa1ImnGCw4ZT9VonelXB2Ot2ZkZE8r2UnLJMh/UK72oSlk62LB8cNqxogrQmBRfa4 XPohfquQRbxvNwg15l07kFQ0jriekKFXil9xgHMiyHYAy8KK2mRmh5+ji33z0p16ymTk MZXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775504683; x=1776109483; 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=8TKUkyB7WvjQA6crvLqj/5jSGIGyrb8D9bz30WYCfA4=; b=YgFXtAt0WgdsuxjjTSDhZeAgh0EXpSwB0ljlbvLLQ7rYxkl05RSTwxMnB1TtYF/YHE m2jMD/znv6qt1rEXeiWKFwKV9RoZmFuOynG77pelvZaIgYVni2HvJJBmBmTwIY6kl0VU FydMSD+n+Fex4kEG+MNplbbndQ6stktOIwnnWvAVDSn/JHER+kBKaA4TO7AdFFgZZ6vD fbRQpwYhNK1fqEL0RjbxedX5vkquipaYXYk7OHn5mXpn5A7PTwPJ1+Gl+im2DdOG2eAJ kJ1DjtElRV6NdQg2COLjAZIx6poieIoWisnSPxdsmxFK5Sh56O6SzaAmI7HQ51CTzPDd nIRw== X-Forwarded-Encrypted: i=1; AJvYcCXiA1iGwv0Rg9NQJrQb48ue7u0fpWgKlvL6qHHa7GbG6snj+m6sbfGCvRFC/lA99is/lIfe5PsY2Tz+SYA=@vger.kernel.org X-Gm-Message-State: AOJu0YzcP9IOLLhDhfH1GA2S0alrxHQWxpD5tad+7ahUAt28CoHAInZ0 27PiMllxMsrvMMpRyi7x/7ETnXbI38XsamW1GiEz2GCY/qH5VMqTnUzm X-Gm-Gg: AeBDiesVpYBUScTSbxNNGB0Or15Ibio5C2Io/3jEHQiExPPsU/k4KVZetEYfoP94ivd x2htQbFQJ786QL4koJI6tt48f4ocdgw8hhpiG+47tGNSbg9kZVWQoHs/3NrOrl+FIk+7mFxgarG rBBMBn5vjHletjdlHq+PI0ndJgyPLGHM8qOyIoZGJ5ev86BkiAHUsCa9J6NjUqlCIFctGx3f4rR CIaKh6a3fIy2OVJoukKSRoMQMuB2ZiP7Anjr/cbyLsYKgbCbHZBCLO/bB4N8/BY++9u2yo4t3Yv h6Dlt+Ouq7a1pHVUT4hwEobc0EcymrmWHIL+rboTyefPwef5oImO1QTTpa6uXcVW4gsaSGemBcG 8vrO7t46bYTb029VTPQNfqR0MdpJBx54yJeTqbcfu9KHUc4pDXogoxTVlQbEwQMeDmOtN9d+Kea 8J0HKGbA7nRYvoR4MJQItrqbY0E4vKL0YoDh13chw9lQ9qqDoQVDlyn7I= X-Received: by 2002:a05:6214:f0c:b0:89c:c668:9d3a with SMTP id 6a1803df08f44-8a7022bb7c9mr241401586d6.12.1775504682954; Mon, 06 Apr 2026 12:44:42 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d::8bd]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8a5969156d3sm129833856d6.31.2026.04.06.12.44.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 12:44:42 -0700 (PDT) From: Rosen Penev To: dmaengine@vger.kernel.org Cc: Eugeniy Paltsev , 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: [PATCHv2] dmaengine: dw-axi-dmac: simplify allocation Date: Mon, 6 Apr 2026 12:44:24 -0700 Message-ID: <20260406194424.13365-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" Use a flexible array member with kzalloc_flex() to combine allocations. Add __counted_by for extra runtime analysis. Signed-off-by: Rosen Penev --- v2: use () for kzalloc_flex in description. drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 8 +------- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/d= w-axi-dmac/dw-axi-dmac-platform.c index 4d53f077e9d2..d3ca202dc478 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c @@ -294,15 +294,10 @@ static struct axi_dma_desc *axi_desc_alloc(u32 num) { struct axi_dma_desc *desc; =20 - desc =3D kzalloc_obj(*desc, GFP_NOWAIT); + desc =3D kzalloc_flex(*desc, hw_desc, num, GFP_NOWAIT); if (!desc) return NULL; =20 - desc->hw_desc =3D kzalloc_objs(*desc->hw_desc, num, GFP_NOWAIT); - if (!desc->hw_desc) { - kfree(desc); - return NULL; - } desc->nr_hw_descs =3D num; =20 return desc; @@ -339,7 +334,6 @@ static void axi_desc_put(struct axi_dma_desc *desc) dma_pool_free(chan->desc_pool, hw_desc->lli, hw_desc->llp); } =20 - kfree(desc->hw_desc); kfree(desc); atomic_sub(descs_put, &chan->descs_allocated); dev_vdbg(chan2dev(chan), "%s: %d descs put, %d still allocated\n", diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h b/drivers/dma/dw-axi-dma= c/dw-axi-dmac.h index 67cc199e24d1..a04a4e03eb3d 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h @@ -98,14 +98,14 @@ struct axi_dma_hw_desc { }; =20 struct axi_dma_desc { - struct axi_dma_hw_desc *hw_desc; - struct virt_dma_desc vd; struct axi_dma_chan *chan; u32 completed_blocks; u32 length; u32 period_len; u32 nr_hw_descs; + + struct axi_dma_hw_desc hw_desc[] __counted_by(nr_hw_descs); }; =20 struct axi_dma_chan_config { --=20 2.53.0