From patchwork Tue Jun 25 02:47:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mina Almasry X-Patchwork-Id: 13710538 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 678A761FF3 for ; Tue, 25 Jun 2024 02:47:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719283658; cv=none; b=s2Hg/ur5JHxg23WoKu0QwXWH1bn502h9J9kPUEe0NLRQXiTPWdjwjrBzo/EC97mmu9jhS4mFNOlaFvQuedIXUZ5D0fuRRj2oJ6xU6wwG8d71z4HD5ptlVNXQqhsH2+qEk2uMqZOHbWKB5Z4BZCC2KvMVbvoAw3y76AXqgC/7Srk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719283658; c=relaxed/simple; bh=SpMPi77DsJFlhQjGUdfJ2ImAR5GLXHN1rrSnFoFyLdQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ZJMRY0e7YF3nuIl6qDpXIF7Cd8br6NTpeUblLaSvtlH25X51sMmHj14PkuwB9m4B3NOk+GDZ1MuyDx6j7Q89+E1F7TD2f+WkMxc+HdolWR+Yr7EALGb2O3RT5/R8qqJn7rm6QOZOiPjIbulaG2phVMrK0oTDY/qrPhttCBpWTHg= 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=XwW9po5l; arc=none smtp.client-ip=209.85.216.74 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="XwW9po5l" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2c7a68c3a85so7031674a91.2 for ; Mon, 24 Jun 2024 19:47:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719283653; x=1719888453; 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=AwQAJUWNyaIevRNs1wg9XO3i1KEUwjv3iWNWn0kUg7E=; b=XwW9po5lFVR8OyvZjov9NBnRGT6Fa6rNz1cl6rm2zyV1nyKWE1UtnpTevVpbNqIWOp 0L2SSmxF49JyJcGQF1jmc6fxo+akY9RvN23LmsrrsUEx56C0DVh5S50oDe2GsWUrJVLD pnGAbW80KAQHqr+UAvhoWKWn8OEH3hlUIJJlDSzJGxVDZpQ4bh9X4768UPo+KlJjwhjO oq+srHbuKePVpNKo6ajB0EM0y4SRQ8vJlv/prZseCcliZKJ1vyOUZ8JZR35aMUZJ4yP9 e2+ExwIxwXfP9KhSjSO2Ap/O2aW82UD7B/4vx+nJgmcelrySWJtuh5aM1AUYnQD4BYem fdqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719283653; x=1719888453; 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=AwQAJUWNyaIevRNs1wg9XO3i1KEUwjv3iWNWn0kUg7E=; b=UN1fw9rH1DlfnyX7FT063ggN3JK05RRxZMGVD6GcwYJFvOE9xgcs3EdpmLX58peiDm u+cAf9t3DK0S6SN0z87bA20hHVlQ2/idhXFp7CjqFT7MbXkggZHlbIPs5gSzy92C54DM Lo68cwvtBA1ZU6LVNtVm4OqllWK4asCXul7dqxU+nfEVfrqWwT7QNWeNemnRQ0bDGeqk hJ198uujhE8yncpzXzow5LmAp6TTQH8z5U3ZrS1PfQXUrxzKP3p/cFWQkeqRCfpz0lsP qIlhFMqavuQ/n8b1VgzJH9/+Nju45aBwpkCBE9lXR3rTjFoa+N3AzyXe+UBz2mtpJ1fN kBuw== X-Forwarded-Encrypted: i=1; AJvYcCVfI+kAXooQGd9ZTdnhI9ziMC6/8RSb4QbIAOLjB7e1ewmAS1roubuBmfoGhqIN8pn5AeQ3RyKQ1bGni0TwO2ZzVcRT2ri0Zy4JJPrU03Tbq5dr X-Gm-Message-State: AOJu0Yyu6mv2Q0PLKcLaCk2tY5gm+2ga3wWPrZmzovYZz8RQ9/njuUuU N+gFg5rrIG5Hwhd79WDL3Gia4U70+V7M1Zja0MY8YvB1cSWkteB2bG+8pBhTb3cxueoyA4f1y/N eaftJ27ljJ6b6mDt2LuPDMA== X-Google-Smtp-Source: AGHT+IHycDHErutPdWvjN4pGj9nNdFTl5OiTXwHJMBuikYSKL5lMGSWLqUGu9RgiozyjJbZtRThhGjo95v2G/KzHhA== X-Received: from almasrymina.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:4bc5]) (user=almasrymina job=sendgmr) by 2002:a17:90b:4b48:b0:2c7:c6a1:42d6 with SMTP id 98e67ed59e1d1-2c861217a3fmr48008a91.1.1719283652521; Mon, 24 Jun 2024 19:47:32 -0700 (PDT) Date: Tue, 25 Jun 2024 02:47:07 +0000 In-Reply-To: <20240625024721.2140656-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240625024721.2140656-1-almasrymina@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Message-ID: <20240625024721.2140656-5-almasrymina@google.com> Subject: [PATCH net-next v13 04/13] netdev: netdevice devmem allocator From: Mina Almasry To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-alpha@vger.kernel.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, sparclinux@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-arch@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: Mina Almasry , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Donald Hunter , Jonathan Corbet , Richard Henderson , Ivan Kokshaysky , Matt Turner , Thomas Bogendoerfer , "James E.J. Bottomley" , Helge Deller , Andreas Larsson , Jesper Dangaard Brouer , Ilias Apalodimas , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Arnd Bergmann , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Steffen Klassert , Herbert Xu , David Ahern , Willem de Bruijn , Shuah Khan , Sumit Semwal , " =?utf-8?q?Christian_K=C3=B6nig?= " , Bagas Sanjaya , Christoph Hellwig , Nikolay Aleksandrov , Pavel Begunkov , David Wei , Jason Gunthorpe , Yunsheng Lin , Shailend Chand , Harshitha Ramamurthy , Shakeel Butt , Jeroen de Borst , Praveen Kaligineedi , Willem de Bruijn , Kaiyuan Zhang Implement netdev devmem allocator. The allocator takes a given struct netdev_dmabuf_binding as input and allocates net_iov from that binding. The allocation simply delegates to the binding's genpool for the allocation logic and wraps the returned memory region in a net_iov struct. Signed-off-by: Willem de Bruijn Signed-off-by: Kaiyuan Zhang Signed-off-by: Mina Almasry Reviewed-by: Pavel Begunkov --- v11: - Fix extraneous inline directive (Paolo) v8: - Rename netdev_dmabuf_binding -> net_devmem_dmabuf_binding to avoid patch-by-patch build error. - Move niov->pp_magic/pp/pp_ref_counter usage to later patch to avoid patch-by-patch build error. v7: - netdev_ -> net_devmem_* naming (Yunsheng). v6: - Add comment on net_iov_dma_addr to explain why we don't use niov->dma_addr (Pavel) - Refactor new functions into net/core/devmem.c (Pavel) v1: - Rename devmem -> dmabuf (David). --- include/net/devmem.h | 13 +++++++++++++ include/net/netmem.h | 18 ++++++++++++++++++ net/core/devmem.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+) diff --git a/include/net/devmem.h b/include/net/devmem.h index eaf3fd965d7a8..b65795a8f8f13 100644 --- a/include/net/devmem.h +++ b/include/net/devmem.h @@ -68,7 +68,20 @@ int net_devmem_bind_dmabuf(struct net_device *dev, unsigned int dmabuf_fd, void net_devmem_unbind_dmabuf(struct net_devmem_dmabuf_binding *binding); int net_devmem_bind_dmabuf_to_queue(struct net_device *dev, u32 rxq_idx, struct net_devmem_dmabuf_binding *binding); +struct net_iov * +net_devmem_alloc_dmabuf(struct net_devmem_dmabuf_binding *binding); +void net_devmem_free_dmabuf(struct net_iov *ppiov); #else +static inline struct net_iov * +net_devmem_alloc_dmabuf(struct net_devmem_dmabuf_binding *binding) +{ + return NULL; +} + +static inline void net_devmem_free_dmabuf(struct net_iov *ppiov) +{ +} + static inline void __net_devmem_dmabuf_binding_free(struct net_devmem_dmabuf_binding *binding) { diff --git a/include/net/netmem.h b/include/net/netmem.h index 72e932a1a9489..01dbdd216fae7 100644 --- a/include/net/netmem.h +++ b/include/net/netmem.h @@ -14,8 +14,26 @@ struct net_iov { struct dmabuf_genpool_chunk_owner *owner; + unsigned long dma_addr; }; +static inline struct dmabuf_genpool_chunk_owner * +net_iov_owner(const struct net_iov *niov) +{ + return niov->owner; +} + +static inline unsigned int net_iov_idx(const struct net_iov *niov) +{ + return niov - net_iov_owner(niov)->niovs; +} + +static inline struct net_devmem_dmabuf_binding * +net_iov_binding(const struct net_iov *niov) +{ + return net_iov_owner(niov)->binding; +} + /* netmem */ /** diff --git a/net/core/devmem.c b/net/core/devmem.c index cfb5a2f69dcd2..aeee25c91b844 100644 --- a/net/core/devmem.c +++ b/net/core/devmem.c @@ -32,6 +32,14 @@ static void net_devmem_dmabuf_free_chunk_owner(struct gen_pool *genpool, kfree(owner); } +static dma_addr_t net_devmem_get_dma_addr(const struct net_iov *niov) +{ + struct dmabuf_genpool_chunk_owner *owner = net_iov_owner(niov); + + return owner->base_dma_addr + + ((dma_addr_t)net_iov_idx(niov) << PAGE_SHIFT); +} + void __net_devmem_dmabuf_binding_free(struct net_devmem_dmabuf_binding *binding) { size_t size, avail; @@ -54,6 +62,42 @@ void __net_devmem_dmabuf_binding_free(struct net_devmem_dmabuf_binding *binding) kfree(binding); } +struct net_iov * +net_devmem_alloc_dmabuf(struct net_devmem_dmabuf_binding *binding) +{ + struct dmabuf_genpool_chunk_owner *owner; + unsigned long dma_addr; + struct net_iov *niov; + ssize_t offset; + ssize_t index; + + dma_addr = gen_pool_alloc_owner(binding->chunk_pool, PAGE_SIZE, + (void **)&owner); + if (!dma_addr) + return NULL; + + offset = dma_addr - owner->base_dma_addr; + index = offset / PAGE_SIZE; + niov = &owner->niovs[index]; + + niov->dma_addr = 0; + + net_devmem_dmabuf_binding_get(binding); + + return niov; +} + +void net_devmem_free_dmabuf(struct net_iov *niov) +{ + struct net_devmem_dmabuf_binding *binding = net_iov_binding(niov); + unsigned long dma_addr = net_devmem_get_dma_addr(niov); + + if (gen_pool_has_addr(binding->chunk_pool, dma_addr, PAGE_SIZE)) + gen_pool_free(binding->chunk_pool, dma_addr, PAGE_SIZE); + + net_devmem_dmabuf_binding_put(binding); +} + /* Protected by rtnl_lock() */ static DEFINE_XARRAY_FLAGS(net_devmem_dmabuf_bindings, XA_FLAGS_ALLOC1);