From nobody Thu Apr 2 18:46:11 2026 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 541B434252C for ; Fri, 27 Mar 2026 03:01:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774580476; cv=none; b=cTTDIgi6kz5HOwn/AzJONEjcgsAW6FBMGD87v3DQ6x3v5wSMc7yAM0WuEqcHSk1ZfIvf9s99gtW1WEndlukE8eQBNycWmNYsLs7w6w26ZDe31mzD38sPC7qsNlhji7Qgs6DeqL6VASuIHqTR6XW7sStl48TNGDqynbwRnr/tWHk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774580476; c=relaxed/simple; bh=7DMNlTY2jlvefaXB7B3i5KgnD7WNmdQteQy2H9okiIg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=NepFuy4wiioMDQwaQDO4lEa9CevTLbPIyJg2kOMSoDFWZ1Kykz2ecOMdfpNsFXRu6rmvcjQVlDZ98t2IdKa+V7TvQhj4/MHKeqj7NkBDK21XphorDu/gRheiyG+BpjuEDQe9nssofAQk4Ggs6lemaoouYWJmM7+vF2hQhZnpnhQ= 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=imD886q+; arc=none smtp.client-ip=209.85.214.178 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="imD886q+" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2b04d051664so13782505ad.0 for ; Thu, 26 Mar 2026 20:01:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774580475; x=1775185275; 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=S7z3iVejW0eNJULH3BGqY9g0Ns0Iw/ol1WcBG/Retfc=; b=imD886q+1s5JTCjrcJpGHKEZSiWtilgh9E+NGwJr1y0JnreRRuZhQIoCawOyv5W0dX EPVWrxPoJTruA7voAJms3txBxBZRCI/kdakYtzwc3W0bjFbWZkvO/ODxIQQtS1OzwOVe wcOAYI9siQj661vs62i6++owhGkMLdGYy4EYUZ0sCyg/SRCcIvtmLrG8KdBK06Tcyfqm DZ8PZ74fpIuD9akYi4zvWFf4Cc/tsfygZurC/f9rcEdGgWSgOrfSwi0D4gXotM5HytPd GE/NI0wLBCDX2FGPBBI/NWPMBTl4354KLG2NpTew6ngdPJstwSEgZ13IOgZrY4eGqEJ+ lxTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774580475; x=1775185275; 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=S7z3iVejW0eNJULH3BGqY9g0Ns0Iw/ol1WcBG/Retfc=; b=J0QkdnxUyrdsEZbT9TnDZt87f/jquX8FAfaEvWdUlK5KMTyBrwt8xJWrLY54BN9AWH xhpisnrHJo5hZnIWYcMUKQwwt6eJDAvyIX9zwQQa1ot1BGdT8kKYv9lH7Nxw0NLrOfTy WiJ4tXwE5HKCcvtoBnk4MtCHsc3iyV6zx7aU9UNmCRLEpjUBqbaDgJJcBcAuwVmrNU8N sYZP45H6Xo97/9rz9tVnWV9AyUe6b+WwIMivpwzUfr5RmstnKfrm7HwYagfFZ3Z0tdRG swIUsPPa7eQNZHsjamoYYjdQeDJDMrPh2gfIVL4i9KEr3LbTZWWUDjyIHmo3T7tZXK7B /8+w== X-Forwarded-Encrypted: i=1; AJvYcCXyzAqFwUhyWpQ+YKuqfWt71eHHsAHILsE0a8BErANZyzpHjveo1J2Cnf6uhwYTd1vk5yjGnFrNWFUoaD0=@vger.kernel.org X-Gm-Message-State: AOJu0YwGYOHrCusK17orvjBxeAqkJrqBFVeqAJvQoCMyuOs9zjyMV5MZ M4UBkajE67JhjtBKPm58+Hz8cu/m5bUb7RC+RzxCkNtjqumeBY4NP+Wt X-Gm-Gg: ATEYQzwbylVmepvI8fhvt4D8wcMdveRnsiUOi5S91IVy2azFoZMUInc1ICjEFdNIxkY lt0XnkgDFPrjSmBUa+YcH3W3oL2nLIzjNUPmqyhifGnjklu9X1gpVP9xDw1x9fkR9sg/4/M9JeC huOSrjqeEo31jXBzPbnk+t1UyejOWjsRmZekxXlAjJD6eqFQr+0h+QSFExrV72cOaTWiX/iI6HE x+cokLXSFYOk48a85LQZyzFrNYjasGIkreh05x/j1tMeFaIjvbQZlwWNKt/BvG6lNQ0baNjZbKn jXVA7LJW6DmyC0V2H3TrjFoaABLmWHjKxLPvXabfUZETgPMJPhXaiNfkpy5CMit+UYngfieRI3E MibuoQUlziHki0Qr8HOXmWesmbbX4OEktz3JjThR5MfEtv3raokTqbE7BtN0QbIGE0VX+9QOwtQ DOcBuVretnLGPlOFKi475pPGzXb57JJcc4RqwhrPmjBVUIL84fQxypp0o= X-Received: by 2002:a17:902:d4c5:b0:2b0:c451:ae8a with SMTP id d9443c01a7336-2b0cdc239ecmr9754325ad.13.1774580474707; Thu, 26 Mar 2026 20:01:14 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d::8bd]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b0cbfd17d9sm9331985ad.25.2026.03.26.20.01.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 20:01:14 -0700 (PDT) From: Rosen Penev To: linux-rdma@vger.kernel.org Cc: Bernard Metzler , Jason Gunthorpe , Leon Romanovsky , 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] RDMA/siw: use kzalloc_flex Date: Thu, 26 Mar 2026 20:00:56 -0700 Message-ID: <20260327030056.8321-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. Add __counted_by to get extra runtime analysis. Signed-off-by: Rosen Penev --- drivers/infiniband/sw/siw/siw.h | 2 +- drivers/infiniband/sw/siw/siw_mem.c | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/infiniband/sw/siw/siw.h b/drivers/infiniband/sw/siw/si= w.h index f5fd71717b80..2b327a899a1c 100644 --- a/drivers/infiniband/sw/siw/siw.h +++ b/drivers/infiniband/sw/siw/siw.h @@ -119,9 +119,9 @@ struct siw_page_chunk { =20 struct siw_umem { struct ib_umem *base_mem; - struct siw_page_chunk *page_chunk; int num_pages; u64 fp_addr; /* First page base address */ + struct siw_page_chunk page_chunk[] __counted_by(num_pages); }; =20 struct siw_pble { diff --git a/drivers/infiniband/sw/siw/siw_mem.c b/drivers/infiniband/sw/si= w/siw_mem.c index 98c802b3ed72..08047fcf0df1 100644 --- a/drivers/infiniband/sw/siw/siw_mem.c +++ b/drivers/infiniband/sw/siw/siw_mem.c @@ -50,7 +50,6 @@ void siw_umem_release(struct siw_umem *umem) kfree(umem->page_chunk[i].plist); num_pages -=3D PAGES_PER_CHUNK; } - kfree(umem->page_chunk); kfree(umem); } =20 @@ -347,16 +346,12 @@ struct siw_umem *siw_umem_get(struct ib_device *base_= dev, u64 start, num_pages =3D PAGE_ALIGN(start + len - first_page_va) >> PAGE_SHIFT; num_chunks =3D (num_pages >> CHUNK_SHIFT) + 1; =20 - umem =3D kzalloc_obj(*umem); + umem =3D kzalloc_flex(*umem, page_chunk, num_chunks); if (!umem) return ERR_PTR(-ENOMEM); =20 - umem->page_chunk =3D - kzalloc_objs(struct siw_page_chunk, num_chunks); - if (!umem->page_chunk) { - rv =3D -ENOMEM; - goto err_out; - } + umem->num_pages =3D num_pages; + base_mem =3D ib_umem_get(base_dev, start, len, rights); if (IS_ERR(base_mem)) { rv =3D PTR_ERR(base_mem); @@ -385,7 +380,6 @@ struct siw_umem *siw_umem_get(struct ib_device *base_de= v, u64 start, umem->page_chunk[i].plist =3D plist; while (nents--) { *plist =3D sg_page_iter_page(&sg_iter); - umem->num_pages++; num_pages--; plist++; if (!__sg_page_iter_next(&sg_iter)) --=20 2.53.0