From nobody Thu Apr 9 14:09:21 2026 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (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 780C226290 for ; Sun, 8 Mar 2026 03:20:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772940018; cv=none; b=IyU0tAmGPieJW188fbtM6sTd1Pa0wZTg62rmaByeVSvkWM5JHs6MowQ/Rksp4h+eX9M81LW+PGt/rfkmlEK30XZOEUQQ505Rwjf9Oy29LpklllOEXPJio0y4jFEPWxVrunNcoJb8T/r8Ql94RotntMhZ6qrVcpqax7tO7jD5Zks= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772940018; c=relaxed/simple; bh=KgJsvx1IcN9NsDZGqhbA1t3ZxHApBqizQDZHsQZW1d0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=g9/xSuxuSn0NIX9dwKBDCPikIRIbSQL8+MNYcrfWPngZNFGz4Nezxve4lLzaRqOqni/Q6hpZoxITf6ICFsRsey8GrcQ0WhxhYZUZ4BmuzWYsvQPhYFHTmoPMAASBAgxTc+3bJlWpgOYsbx+rrdFa6EY+RuxVoOyDZSfcsqWW99I= 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=OEwKwETe; arc=none smtp.client-ip=209.85.210.173 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="OEwKwETe" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-829abaaa92bso726334b3a.1 for ; Sat, 07 Mar 2026 19:20:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772940015; x=1773544815; 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=C5S2gvLeO3HtB5KquXoTw6XAQVdla0vPImwUUawa4hM=; b=OEwKwETeL7874jmFVnJ+R3tskTk8MuhtMW2sPCD+l8lGOyFbUNdsPc7K4F3DsgqMes Bwj/JcYf1UKwThue8Md0eihoRj/wpJn9DqEbbRkFFNHW5h5sot65drmBf+EeZK7mGR0z bwMSCkRexd/7vnFukgf+v2C9nQ5H8BSMcyBk1xmKJPbdHwt0+Ig988b5KUf6UfBXoAtY QRCqHKlztBEQPseQHI0sW6XXkUkKMflji5hu7JqqR+aMwMzQub5UgnaC6DPIE6uK0MLE fJIYmhlbTnMcCGyTdyEaY85dlWhm0+RFtf4766eg4gYWUGcB4YlcFG/QvH/yzXnj8HE+ 7M9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772940015; x=1773544815; 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=C5S2gvLeO3HtB5KquXoTw6XAQVdla0vPImwUUawa4hM=; b=N3Yk8KTXJtYn1i8G2Jk6IvqXpgabAj8mX0+MiYr2cfSEcDLda0UOKDV9NzUQagoXqd GjXkLTOXs02x2I4O+rCWpow8ntliGss6hmNyJsEVLlfpomowJIuRiceA5O0EBZ8pilc/ FwtkyG+Tf5sIeYYfw6grd2gkJtvFvfpURduXa9yGe10gsQIpZTCqF6zf80tmFN9Hk2jE HM438gfG6TyPoSq54LloU4SloR+FDT6LGJNp+T1TmgDt5OCnNCyzCiOHGdjH+OLgq4lW aerOduzsVpL+zD0Y2hn2wl51WqsoDSXEfu7HOzqD9Xo7igeJo9/PxF/+7sPG6EVQMWSt KNgw== X-Forwarded-Encrypted: i=1; AJvYcCUOR1IaMH82NP+dwTgd5aM3tB+JfLDo2w22WGTBkUT3he3tSaDtoYTeS5rRe7A2V1fVQT/8HMoj8b2nUZA=@vger.kernel.org X-Gm-Message-State: AOJu0YwOSlw5qygJFE3fTRJuyKHEcNKVBjfaoHzcK7G7x3QDavCVOUAA FfHdIwMXPFWO176FmQn3W5vSlvfAC/ADtrobpRrXHZ6L08SXG/TfAM73 X-Gm-Gg: ATEYQzyjPntDRgIYiV1kbwkFUPNbk0+bDFftjV7ce+UgOhSI5DzVLXMkki02iE1QWiw 7KAvxlx4kooCU5eIgXLoXbHsJcpKc1PHUE7wDDyQyGI30PNifJm9e6kd/LURm/lE6f6jaqkIR+0 sLPdPNdpx+9PfRVxj2otQ13QgB1wrVuVE93xBVtjkw0dimTgFpZ4tEl4Lo/24ohtOwMYid19UTR YoAlE7OtzIe1OYy4B+qfmOryKuRgscDe5KlVU+7UH45bsu7j5j54syoblGZk4EOgcUhCqjSnU7w 4UFnbs/1VD7bWNMb+uK/vSgBGPqncDOOUltI9LR92Gr/TmmHJ5rnTd7j0aYg3U1Xc5PaQ6JPBzD a6bj6RFoCpDom/AC25ZStTy8/RvtMcRBcKK9eeCbauoGcntr9W32GA41BM9oCqvdLhmNJ0vmXJR mP93dJH2T02GFteMgNH3hRVVSlxfM6NJrW9wJ94cZFeFE0YjRdYJvSmA== X-Received: by 2002:a05:6a21:4846:b0:398:6ea8:21d2 with SMTP id adf61e73a8af0-3986ea82cb2mr3394774637.19.1772940014806; Sat, 07 Mar 2026 19:20:14 -0800 (PST) Received: from ryzen ([2601:644:8000:56f5::8bd]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-829a4657a10sm5422904b3a.21.2026.03.07.19.20.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Mar 2026 19:20:14 -0800 (PST) From: Rosen Penev To: linux-rdma@vger.kernel.org Cc: Dennis Dalessandro , linux-hardening@vger.kernel.org, gustavoars@kernel.org, Jason Gunthorpe , Leon Romanovsky , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] IB/hfi1: kzalloc to kzalloc_flex Date: Sat, 7 Mar 2026 19:19:56 -0800 Message-ID: <20260308031957.90900-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" Combine kzalloc and kcalloc with a flexible array member. Avoids having to free separately. Signed-off-by: Rosen Penev --- drivers/infiniband/hw/hfi1/user_exp_rcv.c | 10 +--------- drivers/infiniband/hw/hfi1/user_exp_rcv.h | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/infiniband/hw/hfi1/user_exp_rcv.c b/drivers/infiniband= /hw/hfi1/user_exp_rcv.c index 5b01070ed66f..2597d311fb1f 100644 --- a/drivers/infiniband/hw/hfi1/user_exp_rcv.c +++ b/drivers/infiniband/hw/hfi1/user_exp_rcv.c @@ -257,7 +257,7 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, if (tinfo->length =3D=3D 0) return -EINVAL; =20 - tidbuf =3D kzalloc(sizeof(*tidbuf), GFP_KERNEL); + tidbuf =3D kzalloc_flex(*tidbuf, psets, uctxt->expected_count); if (!tidbuf) return -ENOMEM; =20 @@ -265,12 +265,6 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, tidbuf->vaddr =3D tinfo->vaddr; tidbuf->length =3D tinfo->length; tidbuf->npages =3D num_user_pages(tidbuf->vaddr, tidbuf->length); - tidbuf->psets =3D kcalloc(uctxt->expected_count, sizeof(*tidbuf->psets), - GFP_KERNEL); - if (!tidbuf->psets) { - ret =3D -ENOMEM; - goto fail_release_mem; - } =20 if (fd->use_mn) { ret =3D mmu_interval_notifier_insert( @@ -448,7 +442,6 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, if (fd->use_mn) mmu_interval_notifier_remove(&tidbuf->notifier); kfree(tidbuf->pages); - kfree(tidbuf->psets); kfree(tidbuf); kfree(tidlist); return 0; @@ -471,7 +464,6 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, unpin_rcv_pages(fd, tidbuf, NULL, 0, pinned, false); fail_release_mem: kfree(tidbuf->pages); - kfree(tidbuf->psets); kfree(tidbuf); kfree(tidlist); return ret; diff --git a/drivers/infiniband/hw/hfi1/user_exp_rcv.h b/drivers/infiniband= /hw/hfi1/user_exp_rcv.h index 055726f7c139..b4a309a051f9 100644 --- a/drivers/infiniband/hw/hfi1/user_exp_rcv.h +++ b/drivers/infiniband/hw/hfi1/user_exp_rcv.h @@ -22,8 +22,8 @@ struct tid_user_buf { unsigned long length; unsigned int npages; struct page **pages; - struct tid_pageset *psets; unsigned int n_psets; + struct tid_pageset psets[]; }; =20 struct tid_rb_node { --=20 2.53.0