[PATCH net-next] net: Fix net_devmem_bind_dmabuf for non-devmem configs

[PATCH net-next] net: Fix net_devmem_bind_dmabuf for non-devmem configs

[Pranjal Shrivastava]

Fix the signature of the net_devmem_bind_dmabuf API for
CONFIG_NET_DEVMEM=n.

Fixes: bd61848900bf ("net: devmem: Implement TX path")
Signed-off-by: Pranjal Shrivastava <praan@google.com>
---
 net/core/devmem.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/core/devmem.h b/net/core/devmem.h
index e7ba77050b8f..0a3b28ba5c13 100644
--- a/net/core/devmem.h
+++ b/net/core/devmem.h
@@ -170,8 +170,9 @@ static inline void __net_devmem_dmabuf_binding_free(struct work_struct *wq)
 }
 
 static inline struct net_devmem_dmabuf_binding *
-net_devmem_bind_dmabuf(struct net_device *dev, unsigned int dmabuf_fd,
+net_devmem_bind_dmabuf(struct net_device *dev,
 		       enum dma_data_direction direction,
+		       unsigned int dmabuf_fd,
 		       struct netdev_nl_sock *priv,
 		       struct netlink_ext_ack *extack)
 {
-- 
2.49.0.1238.gf8c92423fb-goog

Re: [PATCH net-next] net: Fix net_devmem_bind_dmabuf for non-devmem configs

[Mina Almasry]

On Wed, May 28, 2025 at 2:11 PM Pranjal Shrivastava <praan@google.com> wrote:
>
> Fix the signature of the net_devmem_bind_dmabuf API for
> CONFIG_NET_DEVMEM=n.
>
> Fixes: bd61848900bf ("net: devmem: Implement TX path")
> Signed-off-by: Pranjal Shrivastava <praan@google.com>

Patch itself looks good to me, but currently net-next is closed.

I've looked at the maintainer docs:
https://www.kernel.org/doc/Documentation/process/maintainer-netdev.rst

I'm unsure whether this needs to be resent to net now or wait for the
merge window to reopen. I think net is for fixes to code in mainline
linux, but the devmem TX path has not made it there yet (and is not
even in the net tree yet). My guess is that this patch should be
reposted to net-next once net-next reopens.

-- 
Thanks,
Mina

Re: [PATCH net-next] net: Fix net_devmem_bind_dmabuf for non-devmem configs

[Jakub Kicinski]

On Wed, 28 May 2025 14:53:35 -0700 Mina Almasry wrote:
> I'm unsure whether this needs to be resent to net now or wait for the
> merge window to reopen. I think net is for fixes to code in mainline
> linux, but the devmem TX path has not made it there yet (and is not
> even in the net tree yet). My guess is that this patch should be
> reposted to net-next once net-next reopens.

net-next "becomes" net during the merge window.
There's a period of tree-uncertainty while our PR is out,
and afterwards all fixes should target net.
No need to repost, we'll take this fix in tomorrow.

Re: [PATCH net-next] net: Fix net_devmem_bind_dmabuf for non-devmem configs

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Wed, 28 May 2025 21:10:58 +0000 you wrote:
> Fix the signature of the net_devmem_bind_dmabuf API for
> CONFIG_NET_DEVMEM=n.
> 
> Fixes: bd61848900bf ("net: devmem: Implement TX path")
> Signed-off-by: Pranjal Shrivastava <praan@google.com>
> ---
>  net/core/devmem.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Here is the summary with links:
  - [net-next] net: Fix net_devmem_bind_dmabuf for non-devmem configs
    https://git.kernel.org/netdev/net/c/c1f4cb8a8d48

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html