From nobody Mon May 25 04:34:27 2026 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 8AAE927A133 for ; Tue, 19 May 2026 01:57:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779155880; cv=none; b=powmktb/zHCrcIzGdUIuu8eZchk1kvUsdJ8JA8XDr2WFHa77lmnl2WCArSAVeYeTDgQPPObe6RNZG3H7kOKKZ8btbzNWncmglc6m8WzWVy88aASPdOCbuQyESHvQVFLVhsBfYpTxG3GksKGMQsNARcOnt2dzY2u2LyrXXsDrvds= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779155880; c=relaxed/simple; bh=ZmP2GVNQxmyWh28+5svtLhnVf59ZI1Et7Dqph5Oc4lc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Q5CSJqVZ9I+1alqpLL8BqMpRr8/GUs6szjJzl9C6BixPFybckwlv1wVz/b2y62UUem9VySalwtg1PuklNCf4Sjie4NgHRe+l1tA0gN7MLhVCcGCwHDcyShtfkpuCR9t7t9XfY9H+WoSe4kYi0+hx4GSVCrPHVt0AVTL44pdrOKo= 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=hDfd04s0; arc=none smtp.client-ip=209.85.216.53 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="hDfd04s0" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-36622412e97so2156486a91.2 for ; Mon, 18 May 2026 18:57:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779155878; x=1779760678; 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=uWCy8XoZtO6zzmfkdQNcucAepPeXkJBlpgh0VJwhWow=; b=hDfd04s0GrR4qAPrzc0aaee2u+ktolQHMRVayVFF+qTwb2yh1RVvEQXNgg7uTuWc4x +9C4oMTv6av+lw/LaZpylyvtqLUbrdj4VMoStO2nCobcDlKPUQj+SBHJcFUzLhf87/nj I2OzXgZqkJ5tLhlblZPcFnPwtgGfRlDJRjgEDMJdz8W3a9EbgzA8qT2l3gk377Oz7JCB jNctHIi24K9vbCfa5PqDleIDahPJnyrD8+1LrnrhVn5dYh4DiEzBJ6r7YXcDYAc+ouMk hk8C9F+2spKa1zbi/acuT9d1pLZunkmrk3kGsxT8vdAJ7F08qrxSdu546/+iz5R5AByu xQxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779155878; x=1779760678; 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=uWCy8XoZtO6zzmfkdQNcucAepPeXkJBlpgh0VJwhWow=; b=AfwdL/ESzJAupSAuK+sWTdm0Ni8HdCShppcs40dHJF+1l3uK2u7rv165sR0X7Mz6tG rz74F0ctdursiPu9gWs+g5zx1jUNUybSJskNUa+oBgf7NAyyb1SNFszeWRXxt3ovZbz2 QjSHV9zjw4a3OH1+Sw6fqlSpjZB3t64aMvjRmKzop87PF8xfgy+lHpqiziO0cIkEl/Wq 3CACplDvhK9whvbIKZKiyj7qgi1Z4xES3YCVoUMpDbsQ/h/HghEKdquQ1SDTZpzqxCGu lK1k7Dfq2Gcoo/zOfo9+SdUq5qnoSMY9xwGpzD5VtFwvhf2vWBgHiK8WX033vR+ye4af Mlfg== X-Forwarded-Encrypted: i=1; AFNElJ+Fsi0B8y/ioag+spa6D6Ha4rYDC4ITk/9zFX6UvBjP7+iOymS7yLgbArUSnJKHUbW/U7qn90+lV4NBI8w=@vger.kernel.org X-Gm-Message-State: AOJu0Yzb0YCcScdNpTnu9JgmjHWtkE6/G+qRJmA+gAE5UtNQtzIJpC3s jj//tQI1DrLUbDuKZErQD6JkpALBMMdkEqcZTwFbORDPi45/kmiGKvAZTfN/we0g X-Gm-Gg: Acq92OEF4TS3idXKIaXBGMWg3zZnEbcJwd8cJ+EOiNaeHXG7xPio9TOfBUFum1OCJS1 OEXkgrj7Ti+bI39g9CgbFJiPSf78cx97L9w1pRmu57xde1gAJH8SP4EcSWoL7MbuT+VB4OkXQAJ YH4IS4T4a4H7dS9XhQ3Zo+pIA0qCY2UF9iUk74dT4dQ0h6xe6EUbjKO8+2kPIFozvDeEf8ZSu2b biIrYRWyFRl39Eznj8oYsSns/oNT9QeEJMTVwCr46+7cXMqwPcQL7+WSp7sLRQGsv6nFv/fA7+R Uc9AMH3KvYMjH7Fw7SDH0vc7KGgUACDJ8GGF4Uz52bk9CjD5em8MxaSAzsERr22DfMXFVh4G/q8 jb8pNEYqRYBFK+QBoaW8R2IySXYl1PNgS2e3LgFyuYZQvXUTT0xtgWpNYOdDyAYQlwdMl7s8Liv +kbYksgj2wl5SnHSg9SBXPOpKBn/kJhP/rOWSMZTQdsOym3JlTq8taavgCM/ROVxOM5j7eeOt++ d0g3jyr8xbVLbTa9YEDtmfvHvVJZShDZh5DQsG2PYvyiUZoZ5ztERyQ X-Received: by 2002:a17:90b:5848:b0:366:1172:597e with SMTP id 98e67ed59e1d1-369519f2d87mr16881054a91.9.1779155877904; Mon, 18 May 2026 18:57:57 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-369572a2a57sm4801619a91.5.2026.05.18.18.57.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2026 18:57:57 -0700 (PDT) From: Rosen Penev To: v9fs@lists.linux.dev Cc: Eric Van Hensbergen , Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] 9p/xen: Use flexible array for data rings Date: Mon, 18 May 2026 18:57:39 -0700 Message-ID: <20260519015739.634423-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: quoted-printable Content-Type: text/plain; charset="utf-8" Store the fixed set of Xen 9p data rings in the frontend private allocation instead of allocating a separate rings array. This keeps the data ring storage tied to the frontend lifetime and simplifies the allocation and cleanup paths. Assisted-by: Codex:GPT-5.5 Signed-off-by: Rosen Penev --- net/9p/trans_xen.c | 68 ++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 38 deletions(-) diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c index f9fb2db7a066..5a110d71d18c 100644 --- a/net/9p/trans_xen.c +++ b/net/9p/trans_xen.c @@ -55,7 +55,7 @@ struct xen_9pfs_front_priv { char *tag; struct p9_client *client; =20 - struct xen_9pfs_dataring *rings; + struct xen_9pfs_dataring rings[]; }; =20 static LIST_HEAD(xen_9pfs_devs); @@ -277,41 +277,38 @@ static void xen_9pfs_front_free(struct xen_9pfs_front= _priv *priv) { int i, j; =20 - if (priv->rings) { - for (i =3D 0; i < XEN_9PFS_NUM_RINGS; i++) { - struct xen_9pfs_dataring *ring =3D &priv->rings[i]; + for (i =3D 0; i < XEN_9PFS_NUM_RINGS; i++) { + struct xen_9pfs_dataring *ring =3D &priv->rings[i]; =20 - cancel_work_sync(&ring->work); + cancel_work_sync(&ring->work); =20 - if (!ring->intf) - break; - if (ring->irq >=3D 0) { - unbind_from_irqhandler(ring->irq, ring); - ring->irq =3D -1; - } - if (ring->data.in) { - for (j =3D 0; j < (1 << ring->intf->ring_order); - j++) { - grant_ref_t ref; - - ref =3D ring->intf->ref[j]; - gnttab_end_foreign_access(ref, NULL); - ring->intf->ref[j] =3D INVALID_GRANT_REF; - } - free_pages_exact(ring->data.in, - 1UL << (ring->intf->ring_order + - XEN_PAGE_SHIFT)); - ring->data.in =3D NULL; - ring->data.out =3D NULL; - } - if (ring->ref !=3D INVALID_GRANT_REF) { - gnttab_end_foreign_access(ring->ref, NULL); - ring->ref =3D INVALID_GRANT_REF; + if (!ring->intf) + break; + if (ring->irq >=3D 0) { + unbind_from_irqhandler(ring->irq, ring); + ring->irq =3D -1; + } + if (ring->data.in) { + for (j =3D 0; j < (1 << ring->intf->ring_order); + j++) { + grant_ref_t ref; + + ref =3D ring->intf->ref[j]; + gnttab_end_foreign_access(ref, NULL); + ring->intf->ref[j] =3D INVALID_GRANT_REF; } - free_page((unsigned long)ring->intf); - ring->intf =3D NULL; + free_pages_exact(ring->data.in, + 1UL << (ring->intf->ring_order + + XEN_PAGE_SHIFT)); + ring->data.in =3D NULL; + ring->data.out =3D NULL; } - kfree(priv->rings); + if (ring->ref !=3D INVALID_GRANT_REF) { + gnttab_end_foreign_access(ring->ref, NULL); + ring->ref =3D INVALID_GRANT_REF; + } + free_page((unsigned long)ring->intf); + ring->intf =3D NULL; } kfree(priv->tag); kfree(priv); @@ -446,15 +443,10 @@ static int xen_9pfs_front_init(struct xenbus_device *= dev) if (p9_xen_trans.maxsize > XEN_FLEX_RING_SIZE(max_ring_order)) p9_xen_trans.maxsize =3D XEN_FLEX_RING_SIZE(max_ring_order) / 2; =20 - priv =3D kzalloc_obj(*priv); + priv =3D kzalloc_flex(*priv, rings, XEN_9PFS_NUM_RINGS); if (!priv) return -ENOMEM; priv->dev =3D dev; - priv->rings =3D kzalloc_objs(*priv->rings, XEN_9PFS_NUM_RINGS); - if (!priv->rings) { - kfree(priv); - return -ENOMEM; - } =20 for (i =3D 0; i < XEN_9PFS_NUM_RINGS; i++) { priv->rings[i].priv =3D priv; --=20 2.54.0