From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo2-f39.google.com (mail-oo2-f39.google.com [74.125.231.167]) (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 9C25437FF7A for ; Sat, 26 Sep 2026 15:49:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.231.167 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790437790; cv=none; b=pjJDxRPEvMCgxWMZpMxIEWzkaMuuH4sFFb2Fn+m+QjSByJaBxpq8uG3lqM3FEY/l/CTZYtWJYtwm0dLtsbEn56vhAjILmzGsue1vhoEewpY84JWRe9obl+BN/V4bLcY1RmlZWXW96Vgdzw2h4t0aMpgrrSvPzzgo0K8ce6EQqqE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790437790; c=relaxed/simple; bh=D8q+JFl8ShBAwd8HatsVWk4ClB609jvEFQM0NLY9Qlk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BtrYJa/YJjgNS+kYMNEJSyIBPRCphU0wEDb2UKd8/4iRcXeBXjtNwsWEQHF7ov61+y0xG40sHAQCBUf+VlY7VXTKhNIuu8J7NP4MhV0GRy5yTdluCGf776DZxXfB1dY459RfV+FqMF08q2DivfJ+oFPejZN2OReSG4+MzKV1A7w= 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=sst8+Yxw; arc=none smtp.client-ip=74.125.231.167 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="sst8+Yxw" Received: by mail-oo2-f39.google.com with SMTP id 46e09a7af769-7f4f0c89e33so1049273a34.0 for ; Sat, 26 Sep 2026 08:49:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790437785; x=1791042585; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=v5J6qvfoNxCIHw/hgiMJQWPeLhNGA42IA+QA8tl0rh4=; b=sst8+YxwPuldscdV+CM8PYE7o6nFopWbfVqJG2uWoMMhMDPD5b9rJ9Fb27MRox0q5T N+tR/CxyBRvxlnxDFp+fI/dJEHCcXMaMk9SOD7as5MSmiLcneeEgFAjsV8P6qj7+OkNi hFxQ3eDLCgy4vqqSwGn+UIQAeNVUEilKxQhjnxCPiuWFCoaP7QXpHo5wi8LuiCv8BzMR fBU/m11m9j8rdbue4j3rRaFnp38v0pdhN4cUxuOR0jXUfed8cuQob5A7hlPfcNO2XGSx w81t7Q9tl1Kc5I0Kc5roRMiP36228/h6ktrtL+MmEJhAQwkITv3nKE+Obkx2u3siUY7W OLog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790437785; x=1791042585; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=v5J6qvfoNxCIHw/hgiMJQWPeLhNGA42IA+QA8tl0rh4=; b=WHaMhY0OnVAa7etW0WpxFYoC+tLpjyCS6XfV7CHV+5+BGh/zK5kWs9ulv1rdace+4z 7VGs0OjfvYV4y7ChvyJDm7r4Gh+9GfZzTWQShsfdfLCfIqXbHktp9ShpJYm4JvtXQCr4 x60PBDnsXM6FXUHkvCj8BgbjjiztlJvGg6qAYyF5pm1CgvEGLscoLobxyQ7RQclB+rKh PxMOqJLHDS0RxQvQYmoXGs7OYL/5hXL+ELBIpKA+gRIASXJFLbu60ejSlOOlp4fJZUpG K3OJYb1PbhhU9tyZu+iVIqOYrjqgyUv7KF62HxZoY0536qfxeZK0tSQieQ1rDjUm7o/t Vuqw== X-Forwarded-Encrypted: i=1; AKwUvBzs5yNj/BwyAYVB7xnEwJlcCFft4EFseWU6iM4eWoeBqwWU9alCEFFbn5muX87pJQ+q3yWvV08=@vger.kernel.org X-Gm-Message-State: AFuF++lJE7QIzx3XBDenDEY5bbUf7SCWM8DxXIzBUsHiGHipwo02/lw+ LLNpXexiBe068fe6gcjmJtORFTWl+aYWcQyqyLa70lTSncyij4MwDDOY X-Gm-Gg: AYBFou0dy9tLVkQqi0/ZpVDuonP8FPezcIXzoc+0TYtwDYhWDVo1OMf7oG11+QzLwBj sQULTOT+WI+sH1Vu5WufzzoLt8dV58FKKmOlEDWw4beoAjM0iD4oBE+OyD2HDK3/3l13zLE3XWP jyyi8iYtkMTfvTcBHZm+s415y5mG4u16A4+/TyC5xqAcHlv5xnN1d+gk3rQ10HkMNDMb6V6SrRL 6zX2sNFkY+i+kXO0Aygt0a7QI+4KcbtGcXtGs/qNzaMgpk7WcXE5Gm+Yb9PTBR7gzo4MhL9Qie0 PcQUZe0a1QRvzpN/098/HyrcFJkXR+PahQPME/fHApyawnSPsVgjiVzSkx/bDL5FEJPz+BRivP4 US3f9StTQdflTwOpjZ/0d51J7QVmqiMBSpN7QH4q4e5RZIfp+tLN3YOo0sWvrPyzwKTsWudGgRx R5nOpDMIbtI3brtpMwAkw0gJvsnSzIXILIQ1SicFQvbd7FKEum2qK3OiYLMliUSxWwjMAV3y4vJ F4MRe9W/mPaJai1Oiu1lK0WqhjypAhLGuTEAKCcq4774M2LX+AFobcmXmIeYWkUMeaKV6IdSE0v 9e7WDf8dVCDueMPUmKYP+tVa21AWjJZ/r2A+21jYleEorT9NaW5xy5mujhnlCiyY8TKoxKir8rr 5c9A+Qn9JK6RH5PsYHBVM X-Received: by 2002:a05:6830:6686:b0:7f4:eb76:881d with SMTP id 46e09a7af769-81780693ca6mr10527443a34.5.1790437785355; Sat, 26 Sep 2026 08:49:45 -0700 (PDT) Received: from [127.0.1.1] (174-29-1-49.hlrn.qwest.net. [174.29.1.49]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-818e98b16d4sm5442366a34.26.2026.09.26.08.49.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2026 08:49:44 -0700 (PDT) From: James Hilliard Date: Sat, 26 Sep 2026 09:49:07 -0600 Subject: [PATCH net v4 12/15] xsk: allow drivers to retain DMA mappings independently of pools Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260926-submit-stmmac-reset-fixes-v1-v4-12-ec1c0250b3c9@gmail.com> References: <20260926-submit-stmmac-reset-fixes-v1-v4-0-ec1c0250b3c9@gmail.com> In-Reply-To: <20260926-submit-stmmac-reset-fixes-v1-v4-0-ec1c0250b3c9@gmail.com> To: Russell King , Andrew Lunn , Heiner Kallweit , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Joakim Zhang , "Russell King (Oracle)" , Maxime Chevallier , Andrew Lunn , Maxime Coquelin , Alexandre Torgue , Christian Marangi , Tiezhu Yang , Huacai Chen , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , Serge Semin , Suraj Jaiswal , Richard Cochran , Joao Pinto , Vladimir Oltean , Ong Boon Leong , Voon Weifeng , "Song, Yoong Siang" , Linus Walleij , Martin Blumenstingl , Magnus Karlsson , Maciej Fijalkowski , Simon Horman , =?utf-8?q?Bj=C3=B6rn_T=C3=B6pel?= , Thierry Reding , Jonathan Hunter , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Eric Dumazet Cc: Richard Genoud , Alastair D'Silva , Maxime Ripard , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, bpf@vger.kernel.org, ZhaoJinming , Lorenzo Bianconi , Ding Hui , James Hilliard , linux-tegra@vger.kernel.org, linux-sunxi@lists.linux.dev X-Mailer: b4 0.15.2 An unsuccessful device shutdown does not make its DMA memory safe to unmap. AF_XDP pool removal must nevertheless complete: the last socket release invokes the driver detach callback and then destroys the pool, regardless of the callback's return value. Provide an independent reference to the existing DMA mapping and its UMEM pages. A driver can take it while installing rings and release it after DMA has actually stopped. It does not retain pool metadata, fill or completion rings, or the pool users reference which triggers teardown. Keep the DMA device and the mapping's netdev lookup key allocated, without taking a netdev usage reference that would prevent unregister. Save the mapping attributes and unmap before dropping the last retained UMEM reference. Mapping reference operations are serialized by RTNL, like the existing mapping list operations. Signed-off-by: James Hilliard --- include/net/xdp_sock_drv.h | 23 ++++++++++++++++++++++ include/net/xsk_buff_pool.h | 4 ++++ net/xdp/xsk_buff_pool.c | 48 +++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 73 insertions(+), 2 deletions(-) diff --git a/include/net/xdp_sock_drv.h b/include/net/xdp_sock_drv.h index d94aeb506379..819410797db3 100644 --- a/include/net/xdp_sock_drv.h +++ b/include/net/xdp_sock_drv.h @@ -95,6 +95,20 @@ static inline void xsk_pool_dma_unmap(struct xsk_buff_pool *pool, xp_dma_unmap(pool, attrs); } +/* RTNL must be held. Keep DMA mappings and pinned pages independently of + * the socket/pool lifetime, for rings whose DMA shutdown can fail. + * This does not keep pool metadata alive or postpone the detach callback. + */ +static inline struct xsk_dma_map *xsk_pool_dma_get(struct xsk_buff_pool *pool) +{ + return xp_dma_get(pool); +} + +static inline void xsk_pool_dma_put(struct xsk_dma_map *dma_map) +{ + xp_dma_put(dma_map); +} + static inline int xsk_pool_dma_map(struct xsk_buff_pool *pool, struct device *dev, unsigned long attrs) { @@ -432,6 +446,15 @@ static inline void xsk_pool_dma_unmap(struct xsk_buff_pool *pool, { } +static inline struct xsk_dma_map *xsk_pool_dma_get(struct xsk_buff_pool *pool) +{ + return NULL; +} + +static inline void xsk_pool_dma_put(struct xsk_dma_map *dma_map) +{ +} + static inline int xsk_pool_dma_map(struct xsk_buff_pool *pool, struct device *dev, unsigned long attrs) { diff --git a/include/net/xsk_buff_pool.h b/include/net/xsk_buff_pool.h index a7df573784fd..25a09b098703 100644 --- a/include/net/xsk_buff_pool.h +++ b/include/net/xsk_buff_pool.h @@ -38,6 +38,8 @@ struct xsk_dma_map { dma_addr_t *dma_pages; struct device *dev; struct net_device *netdev; + struct xdp_umem *umem; + unsigned long attrs; refcount_t users; struct list_head list; /* Protected by the RTNL_LOCK */ u32 dma_pages_cnt; @@ -143,6 +145,8 @@ void xp_fill_cb(struct xsk_buff_pool *pool, struct xsk_cb_desc *desc); int xp_dma_map(struct xsk_buff_pool *pool, struct device *dev, unsigned long attrs, struct page **pages, u32 nr_pages); void xp_dma_unmap(struct xsk_buff_pool *pool, unsigned long attrs); +struct xsk_dma_map *xp_dma_get(struct xsk_buff_pool *pool); +void xp_dma_put(struct xsk_dma_map *dma_map); struct xdp_buff *xp_alloc(struct xsk_buff_pool *pool); u32 xp_alloc_batch(struct xsk_buff_pool *pool, struct xdp_buff **xdp, u32 max); bool xp_can_alloc(struct xsk_buff_pool *pool, u32 count); diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c index c58f56f24a9c..8f95eddc91fc 100644 --- a/net/xdp/xsk_buff_pool.c +++ b/net/xdp/xsk_buff_pool.c @@ -360,7 +360,8 @@ static struct xsk_dma_map *xp_find_dma_map(struct xsk_buff_pool *pool) } static struct xsk_dma_map *xp_create_dma_map(struct device *dev, struct net_device *netdev, - u32 nr_pages, struct xdp_umem *umem) + u32 nr_pages, struct xdp_umem *umem, + unsigned long attrs) { struct xsk_dma_map *dma_map; @@ -376,6 +377,8 @@ static struct xsk_dma_map *xp_create_dma_map(struct device *dev, struct net_devi dma_map->netdev = netdev; dma_map->dev = dev; + dma_map->umem = umem; + dma_map->attrs = attrs; dma_map->dma_pages_cnt = nr_pages; refcount_set(&dma_map->users, 1); list_add(&dma_map->list, &umem->xsk_dma_list); @@ -430,6 +433,47 @@ void xp_dma_unmap(struct xsk_buff_pool *pool, unsigned long attrs) } EXPORT_SYMBOL(xp_dma_unmap); +struct xsk_dma_map *xp_dma_get(struct xsk_buff_pool *pool) +{ + struct xsk_dma_map *dma_map; + + ASSERT_RTNL(); + if (!pool->dma_pages) + return NULL; + dma_map = xp_find_dma_map(pool); + if (WARN_ON_ONCE(!dma_map)) + return NULL; + + refcount_inc(&dma_map->users); + xdp_get_umem(dma_map->umem); + get_device(dma_map->dev); + /* Keep the mapping's lookup key alive without preventing unregister. */ + get_device(&dma_map->netdev->dev); + return dma_map; +} +EXPORT_SYMBOL_GPL(xp_dma_get); + +void xp_dma_put(struct xsk_dma_map *dma_map) +{ + struct net_device *netdev; + struct xdp_umem *umem; + struct device *dev; + + ASSERT_RTNL(); + if (!dma_map) + return; + dev = dma_map->dev; + netdev = dma_map->netdev; + umem = dma_map->umem; + if (refcount_dec_and_test(&dma_map->users)) + __xp_dma_unmap(dma_map, dma_map->attrs); + /* Unmap before the final reference can unpin the UMEM pages. */ + xdp_put_umem(umem, false); + put_device(&netdev->dev); + put_device(dev); +} +EXPORT_SYMBOL_GPL(xp_dma_put); + static void xp_check_dma_contiguity(struct xsk_dma_map *dma_map) { u32 i; @@ -487,7 +531,7 @@ int xp_dma_map(struct xsk_buff_pool *pool, struct device *dev, return 0; } - dma_map = xp_create_dma_map(dev, pool->netdev, nr_pages, pool->umem); + dma_map = xp_create_dma_map(dev, pool->netdev, nr_pages, pool->umem, attrs); if (!dma_map) return -ENOMEM; -- 2.53.0