From patchwork Thu Feb 27 04:12:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mina Almasry X-Patchwork-Id: 13993686 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 3506D1E5207 for ; Thu, 27 Feb 2025 04:12:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740629536; cv=none; b=pTAN5+F9p7Meziy7L77XSs2xqOGgf2TzOVM5e9jqr2f6kFHjOOJUqtXNdUFI3GXFQewPjDg7VgZ9/N9LB3aQrWUXx4eu2BDZetKzd8ArVUW6TPiMf5rnJvppKNCo3G0vEcJUqGP2iHOEdojfhWI6JY8fOZIaA014pgvdPi3vk1Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740629536; c=relaxed/simple; bh=aqMhgLGRT8wqD2vwklXc4v8x4EwzyFP01zvcFnJEYok=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=CW/3J4bribFZL5ZgHvIF8f+jxWyORjNJFsAb606TP/+fU0Rk2enBORzkIxja2C3tRFrcZ0kQcrLcr/jqVEOooGOXxEosfU1Ckpc81Vx0z23/l42BKBSGvYWKmMiZBpTfLVEI184fl1HAmgi6BkAXYOcurA1vJZ3ey43vzAGYjSA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=sNIboicW; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="sNIboicW" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2fc0bc05afdso1303088a91.0 for ; Wed, 26 Feb 2025 20:12:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740629533; x=1741234333; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=AAzyaCI9OiQ43qRYK7phukQVVG/+Mxsaskx4pqrfHKU=; b=sNIboicWjBVixm9PQeV+ha3X5Hy7P+xptolkg6u4NDR+9jQPlVftPp4GPyhecDgovv gzojpLk2tGxJ8fOc7NQ37yISQ7k9S94dHla6ZALuMw+Es2eSwH8TDL6zLVl9PT891of5 XRxyGIjMHEgEzHh7NS3EcC8wg9SMubKK28ytgMAwYAyB7zlGP9d6HJThD1LzTHpRZWFi TRXNl9GuaJbhiuvB/hFy+s84o7XCT+Q8h/4RHqMPS1dT8unwcp1nJXcOgPikt35itntC +8Ph0rQk7lZjG6T4LEsSobG+Bpwvedc1K7tEJ1JzlRC98+wDsYs4f4ID1C04qr4doUdx n0qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740629533; x=1741234333; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=AAzyaCI9OiQ43qRYK7phukQVVG/+Mxsaskx4pqrfHKU=; b=A4nngf/HNJOxc+wxNX0HA3PPDKHC1eZLQSgYLnUmJ37VHJQypzCKmmzLWvrcfsLqFV NF9K00nJPAEOQbahZ3qUMn0rEIfqdfbqGPb5suUOVAwvnqZAiJeIT1/YsyncMRYZOXm/ jriwTsd9mi4ypplcXE8/zxiKmQQ9HM7uhSs8URm60MlRgMKX0dp6SezwhWMeY/eD8I0J bzZmlIXp5siXO0lHo0dX6NqJe+uR1QDSd/matJDJVCbMunpL9EbkfcKDLOmf/5FKbUk7 6pk1SphONxf46+GfZQsnbsSH+JhhROl4k/A74q7pUG5LC8S3zU/aU5QJxTqeGyV8PMSq 4qdA== X-Forwarded-Encrypted: i=1; AJvYcCX0RqXbXJKImfYk11/o0UiRmRPDpykJ91hRl808+I86t+in2SXLZSwY0D6HmmUPsz74jmvBqcKXzZ+E2cOF8tU=@vger.kernel.org X-Gm-Message-State: AOJu0YxCE3l2yoY1HDI8vprj164IHQ1246thRQXAfRVF6TwUCrtD4iw/ p9wUH5P2agAGs0jblWzkuttbyUCqmqa+52Np9M3+5r4N2L9kMPcwQMjqDpGZwjwsyItM4ODi420 aODWJwZLBgp8ZdL0x0xDnOQ== X-Google-Smtp-Source: AGHT+IHBvdyTom8JJlmu7UpTE/MQ0+/6X7SoVmUqu4Fb8bwlhz+gM2+RPyQZrGi1044sHGola3AGFAckzKcIOJeXsg== X-Received: from pgll189.prod.google.com ([2002:a63:25c6:0:b0:ad5:4a28:559a]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:4a98:b0:1ee:c75c:beda with SMTP id adf61e73a8af0-1f0fc99c10emr18478742637.35.1740629533442; Wed, 26 Feb 2025 20:12:13 -0800 (PST) Date: Thu, 27 Feb 2025 04:12:02 +0000 In-Reply-To: <20250227041209.2031104-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250227041209.2031104-1-almasrymina@google.com> X-Mailer: git-send-email 2.48.1.658.g4767266eb4-goog Message-ID: <20250227041209.2031104-2-almasrymina@google.com> Subject: [PATCH net-next v6 1/8] net: add get_netmem/put_netmem support From: Mina Almasry To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, kvm@vger.kernel.org, virtualization@lists.linux.dev, linux-kselftest@vger.kernel.org Cc: Mina Almasry , Donald Hunter , Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Jonathan Corbet , Andrew Lunn , Jeroen de Borst , Harshitha Ramamurthy , Kuniyuki Iwashima , Willem de Bruijn , David Ahern , Neal Cardwell , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , " =?utf-8?q?Eugenio_P=C3=A9rez?= " , Stefan Hajnoczi , Stefano Garzarella , Shuah Khan , sdf@fomichev.me, asml.silence@gmail.com, dw@davidwei.uk, Jamal Hadi Salim , Victor Nogueira , Pedro Tammela , Samiullah Khawaja Currently net_iovs support only pp ref counts, and do not support a page ref equivalent. This is fine for the RX path as net_iovs are used exclusively with the pp and only pp refcounting is needed there. The TX path however does not use pp ref counts, thus, support for get_page/put_page equivalent is needed for netmem. Support get_netmem/put_netmem. Check the type of the netmem before passing it to page or net_iov specific code to obtain a page ref equivalent. For dmabuf net_iovs, we obtain a ref on the underlying binding. This ensures the entire binding doesn't disappear until all the net_iovs have been put_netmem'ed. We do not need to track the refcount of individual dmabuf net_iovs as we don't allocate/free them from a pool similar to what the buddy allocator does for pages. This code is written to be extensible by other net_iov implementers. get_netmem/put_netmem will check the type of the netmem and route it to the correct helper: pages -> [get|put]_page() dmabuf net_iovs -> net_devmem_[get|put]_net_iov() new net_iovs -> new helpers Signed-off-by: Mina Almasry Acked-by: Stanislav Fomichev --- v2: - Add comment on top of refcount_t ref explaining the usage in the XT path. - Fix missing definition of net_devmem_dmabuf_binding_put in this patch. --- include/linux/skbuff_ref.h | 4 ++-- include/net/netmem.h | 3 +++ net/core/devmem.c | 10 ++++++++++ net/core/devmem.h | 20 ++++++++++++++++++++ net/core/skbuff.c | 30 ++++++++++++++++++++++++++++++ 5 files changed, 65 insertions(+), 2 deletions(-) diff --git a/include/linux/skbuff_ref.h b/include/linux/skbuff_ref.h index 0f3c58007488..9e49372ef1a0 100644 --- a/include/linux/skbuff_ref.h +++ b/include/linux/skbuff_ref.h @@ -17,7 +17,7 @@ */ static inline void __skb_frag_ref(skb_frag_t *frag) { - get_page(skb_frag_page(frag)); + get_netmem(skb_frag_netmem(frag)); } /** @@ -40,7 +40,7 @@ static inline void skb_page_unref(netmem_ref netmem, bool recycle) if (recycle && napi_pp_put_page(netmem)) return; #endif - put_page(netmem_to_page(netmem)); + put_netmem(netmem); } /** diff --git a/include/net/netmem.h b/include/net/netmem.h index c61d5b21e7b4..a2148ffb203d 100644 --- a/include/net/netmem.h +++ b/include/net/netmem.h @@ -264,4 +264,7 @@ static inline unsigned long netmem_get_dma_addr(netmem_ref netmem) return __netmem_clear_lsb(netmem)->dma_addr; } +void get_netmem(netmem_ref netmem); +void put_netmem(netmem_ref netmem); + #endif /* _NET_NETMEM_H */ diff --git a/net/core/devmem.c b/net/core/devmem.c index 7c6e0b5b6acb..b1aafc66ebb7 100644 --- a/net/core/devmem.c +++ b/net/core/devmem.c @@ -325,6 +325,16 @@ net_devmem_bind_dmabuf(struct net_device *dev, unsigned int dmabuf_fd, return ERR_PTR(err); } +void net_devmem_get_net_iov(struct net_iov *niov) +{ + net_devmem_dmabuf_binding_get(net_devmem_iov_binding(niov)); +} + +void net_devmem_put_net_iov(struct net_iov *niov) +{ + net_devmem_dmabuf_binding_put(net_devmem_iov_binding(niov)); +} + /*** "Dmabuf devmem memory provider" ***/ int mp_dmabuf_devmem_init(struct page_pool *pool) diff --git a/net/core/devmem.h b/net/core/devmem.h index 7fc158d52729..946f2e015746 100644 --- a/net/core/devmem.h +++ b/net/core/devmem.h @@ -29,6 +29,10 @@ struct net_devmem_dmabuf_binding { * The binding undos itself and unmaps the underlying dmabuf once all * those refs are dropped and the binding is no longer desired or in * use. + * + * net_devmem_get_net_iov() on dmabuf net_iovs will increment this + * reference, making sure that the binding remains alive until all the + * net_iovs are no longer used. */ refcount_t ref; @@ -111,6 +115,9 @@ net_devmem_dmabuf_binding_put(struct net_devmem_dmabuf_binding *binding) __net_devmem_dmabuf_binding_free(binding); } +void net_devmem_get_net_iov(struct net_iov *niov); +void net_devmem_put_net_iov(struct net_iov *niov); + struct net_iov * net_devmem_alloc_dmabuf(struct net_devmem_dmabuf_binding *binding); void net_devmem_free_dmabuf(struct net_iov *ppiov); @@ -120,6 +127,19 @@ bool net_is_devmem_iov(struct net_iov *niov); #else struct net_devmem_dmabuf_binding; +static inline void +net_devmem_dmabuf_binding_put(struct net_devmem_dmabuf_binding *binding) +{ +} + +static inline void net_devmem_get_net_iov(struct net_iov *niov) +{ +} + +static inline void net_devmem_put_net_iov(struct net_iov *niov) +{ +} + static inline void __net_devmem_dmabuf_binding_free(struct net_devmem_dmabuf_binding *binding) { diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 5b241c9e6f38..6e853d55a3e8 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -89,6 +89,7 @@ #include #include "dev.h" +#include "devmem.h" #include "netmem_priv.h" #include "sock_destructor.h" @@ -7253,3 +7254,32 @@ bool csum_and_copy_from_iter_full(void *addr, size_t bytes, return false; } EXPORT_SYMBOL(csum_and_copy_from_iter_full); + +void get_netmem(netmem_ref netmem) +{ + if (netmem_is_net_iov(netmem)) { + /* Assume any net_iov is devmem and route it to + * net_devmem_get_net_iov. As new net_iov types are added they + * need to be checked here. + */ + net_devmem_get_net_iov(netmem_to_net_iov(netmem)); + return; + } + get_page(netmem_to_page(netmem)); +} +EXPORT_SYMBOL(get_netmem); + +void put_netmem(netmem_ref netmem) +{ + if (netmem_is_net_iov(netmem)) { + /* Assume any net_iov is devmem and route it to + * net_devmem_put_net_iov. As new net_iov types are added they + * need to be checked here. + */ + net_devmem_put_net_iov(netmem_to_net_iov(netmem)); + return; + } + + put_page(netmem_to_page(netmem)); +} +EXPORT_SYMBOL(put_netmem);