From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.197 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795153800; b=gciMiRrUUeHZXK7OP/yp9FTiq6wFxasPKQ1z4AAA2cqFMIim6Z6C3sBbAibQeIS4ZmwY mg9aSVOaUbUNjDl04xBzDEwmlzZTHo9pf3naUWfPGgP8ln/wmlzbJEUp6kxGUTZ/lkLZA Wpw3qHzB21LTRKwm/aHwaVrOUapcPa9JMn8/k0eS0V2zoUPjjnvAr3VuCar7zNy9D238Z WzUWWG/FOdCu78xptTgVxY1cw4+Y5B1AGN2PDyNDSyi91t7fU7HQwXCUNnwaPr1ftIK8w jkzBNeszly55WRegsHlThD9s3Qkemr55Qlpg8tRWSMkLp8luIdm3eVkQjrLaej4ytCA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795153800; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Received:Date:In-Reply-To:Mime-Version: References:X-Mailer:Message-ID:Subject:From:To:Cc:Content-Type; bh=sS0SldeaXn5TDHjcJ95CUMiwZNHLb7Du4QpHdaM76sw=; b=yoSr+nicyqE2RrGRRfigIQfH6SP9JXWSHBQlb68+9LNONhnfX4NSq94WCV02WduY10Zs MQT77eOP677d4PpJqP6mwgO5/D6LojVQawcbd1bs9BVCjkJqzjoZFhYopyzqBpVthSblM +r2BR1Ziee5pz9QoC4PtRCLBpaGDQNjQiNhZOo8x8vzPTCzFfz3+NF8L3/jWL5cru74tD rZAc90WeDjB+2/+DOE9XyXBaRGBXLgagfUFvPpqdmld9GSq17+1QjPAzIlqBuI3q7QRXn c98Jb15KE3jh2NcHRscmm8PsMF7hCv9+T7Fyfoa3YzelQ/HNIHmx8DXJmHG6Dre8ZaA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=SRRnGKL5; arc=none smtp.remote-ip=74.125.82.197 Received: from mail-dy1-f197.google.com (mail-dy1-f197.google.com [74.125.82.197]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 34A19606A331 for ; Fri, 20 Nov 2026 05:50:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 34A19606A331 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.a=rsa-sha256 header.s=20260707 header.b=SRRnGKL5 Received: by mail-dy1-f197.google.com with SMTP id 5a478bee46e88-3821eb27024so870209eec.1 for ; Thu, 19 Nov 2026 21:50:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1795153799; x=1795758599; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=sS0SldeaXn5TDHjcJ95CUMiwZNHLb7Du4QpHdaM76sw=; b=SRRnGKL5wOqFwJHawY8ldOYdwZWMCZWBYypSYWeAhK4pqRoNpxen1kex981B13DWh2 DTbh/3KTNprRYJzTaWiEWJ//0kyJKATx270AAYjJbNOMuoQPBJh/BuDfyqEUvFd69tgo Wb7I+6dWTlAg/MkLhPIUjZU5gDrqRhV45SkN1W0/Omesku2G7B5a5d4kMNeF7jWBdw5d jlOHrHE3vz8Ww8TlBeKa4anIf/zIG7j2PzQpV0dJW74nbEpOT68PeboL41Jr+K4nB2tm ex4WS/y681UVP51Ofgyc1jtk3jD+SJfaosBiPMRSCoJ2ZvmgdFKJ+ktsfdkSkU6YOone J2Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795153799; x=1795758599; h=content-type: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:content-type; bh=sS0SldeaXn5TDHjcJ95CUMiwZNHLb7Du4QpHdaM76sw=; b=ZkvuoDDK7B/eQlSTNOneKs009ZQUwIZsb/NsdyUt23hqwzKA/OO0tm7PI1dMms43LF 5UDbN5+QRFBpaY6TtX0mIx41gxXdDmCgSKGr8BB4AJmL+xRc4mJLxh57JqXwPu+Nsd8S mGqZs+Ly8ywsaAeKs+W1rsZ4zcD4mMIF+YNR7cmcDEZ9tzVwVW3kwauABUAAkO0mNVnn o+2TmmZQzh+Y1uea8UJEluVsBaByhE9aIB1lbfy7yTnxMSjbZafjDkPcemHP9cJNQL5e MsgduxeAiqCZu7WN149G2MtQFmzXH3+dtbvJIMrYJMLTOEjxSQ/6gu03k2FWmvQH4p4e +lrg== X-Gm-Message-State: APuU4Z9LhPJAXkp27pKY/E/pBXuWLaa84G/kH4s6x3e49oCx1ZB9JX78 dTAU56UmGwc1hhbfMF+fihUcCZ03Pb1ZOWtTb0l+RYNPLoVXTzIWBMZpP3V+cCMQbf/tFtSNXJf ZHjmOBdmxVAAq72Zezqz6M4C9T1zW52AhAsz6GCCUF/DK9iotGRZMkwsZQh6FsKQibvb8KnFbcn IgqGpcj3PGvP/f/xiYRGWv4M3HSoiJ7Umibf2Fdr+RRWY0+WAcMLBMvDxrScM7okM= X-Received: from dyev10.prod.google.com ([2002:a05:7300:430a:b0:343:520f:7a80]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:6da7:b0:376:77e6:a66 with SMTP id 5a478bee46e88-385704509cdmr2272904eec.16.1795153798802; Thu, 19 Nov 2026 21:49:58 -0800 (PST) Date: Fri, 20 Nov 2026 04:59:12 +0000 In-Reply-To: <20261120045918.1239746-1-almasrymina@google.com> X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261120045918.1239746-1-almasrymina@google.com> X-Mailer: git-send-email 2.56.1.750.gf70dc682cf-goog Message-ID: <20261120045918.1239746-2-almasrymina@google.com> Subject: [PATCH net-next v4 1/7] net: devmem: pass net_device pointer to net_devmem_lock_dev() From: Mina Almasry To: netdev@vger.kernel.org Cc: Mina Almasry , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , linux-kselftest@vger.kernel.org, Weiming Shi , Daniel Borkmann , Nikolay Aleksandrov , David Wei , Stanislav Fomichev , Bobby Eshleman , Dragos Tatulea Content-Type: text/plain; charset="UTF-8" Upcoming changes for leased queue support will track the physical DMA device and the bound device in separate net_device pointers on struct net_devmem_dmabuf_binding, with different teardown paths locking different pointers. Generalize net_devmem_lock_dev() to take a struct net_device **dev_ptr instead of struct net_devmem_dmabuf_binding *. No functional change. Reviewed-by: Dragos Tatulea Signed-off-by: Mina Almasry --- net/core/devmem.c | 36 ++++++++++++++++++------------------ net/core/devmem.h | 4 ++-- net/core/netdev-genl.c | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/net/core/devmem.c b/net/core/devmem.c index 3714364b5d9a5..056e185410cd4 100644 --- a/net/core/devmem.c +++ b/net/core/devmem.c @@ -85,39 +85,39 @@ net_devmem_dmabuf_binding_unmap(struct net_devmem_dmabuf_binding *binding) } /** - * net_devmem_lock_dev() - lock a binding's net_device if still alive - * @binding: devmem binding whose @dev pointer to lock + * net_devmem_lock_dev() - lock a binding's net_device pointer if still alive + * @dev_ptr: pointer to the net_device field on a devmem binding * @dev_tracker: reftracker for the held net_device reference * - * Safely dereference @binding->dev, acquire netdev_lock() on the device, and - * verify that @binding->dev has not been cleared while waiting for the lock. + * Safely dereference @dev_ptr, acquire netdev_lock() on the device, and + * verify that *@dev_ptr has not been cleared while waiting for the lock. * - * Invariant: @binding->dev is set once at bind time and is only ever cleared to - * NULL while holding netdev_lock(dev) (in mp_dmabuf_devmem_uninstall(), - * net_devmem_unbind_dmabuf(), or net_devmem_dev_unregister() during - * NETDEV_UNREGISTER before synchronize_net() and netdev_run_todo() free the - * net_device). + * Invariant: *@dev_ptr is set once at bind time and is only ever cleared to + * NULL while holding netdev_lock() on that device (in + * mp_dmabuf_devmem_uninstall(), net_devmem_unbind_dmabuf(), or + * net_devmem_dev_unregister() during NETDEV_UNREGISTER before + * synchronize_net() and netdev_run_todo() free the net_device). * - * Taking rcu_read_lock() guarantees that a non-NULL @dev read from - * @binding->dev has not yet completed unregister_netdevice_many_notify() + * Taking rcu_read_lock() guarantees that a non-NULL device read from + * *@dev_ptr has not yet completed unregister_netdevice_many_notify() * (which waits for an RCU grace period via synchronize_net() after * NETDEV_UNREGISTER before freeing the net_device), so netdev_hold() can * safely acquire a reference before sleeping on netdev_lock(). Once - * netdev_lock(dev) is held, re-checking that READ_ONCE(binding->dev) == dev - * guarantees that the device has not yet been detached from @binding and + * netdev_lock() is held, re-checking that READ_ONCE(*dev_ptr) == dev + * guarantees that the device has not yet been detached from the binding and * cannot finish unregistering until net_devmem_unlock_dev(). * - * Return: The locked and held net_device if @binding->dev is still non-NULL, + * Return: The locked and held net_device if *@dev_ptr is still non-NULL, * or NULL if already cleared. */ struct net_device * -net_devmem_lock_dev(struct net_devmem_dmabuf_binding *binding, +net_devmem_lock_dev(struct net_device **dev_ptr, netdevice_tracker *dev_tracker) { struct net_device *dev; rcu_read_lock(); - dev = READ_ONCE(binding->dev); + dev = READ_ONCE(*dev_ptr); if (!dev) { rcu_read_unlock(); return NULL; @@ -126,7 +126,7 @@ net_devmem_lock_dev(struct net_devmem_dmabuf_binding *binding, rcu_read_unlock(); netdev_lock(dev); - if (READ_ONCE(binding->dev) != dev) { + if (READ_ONCE(*dev_ptr) != dev) { netdev_unlock(dev); netdev_put(dev, dev_tracker); return NULL; @@ -157,7 +157,7 @@ void __net_devmem_dmabuf_binding_free(struct work_struct *wq) binding->area.num_niovs, binding->free_count); kvfree(binding->area.niovs); - dev = net_devmem_lock_dev(binding, &dev_tracker); + dev = net_devmem_lock_dev(&binding->dev, &dev_tracker); net_devmem_dmabuf_binding_unmap(binding); xa_erase(&net_devmem_dmabuf_bindings, binding->id); net_devmem_unlock_dev(dev, &dev_tracker); diff --git a/net/core/devmem.h b/net/core/devmem.h index c4f476947dfaa..c0aaba0041ff6 100644 --- a/net/core/devmem.h +++ b/net/core/devmem.h @@ -100,7 +100,7 @@ net_devmem_bind_dmabuf(struct net_device *dev, void *vdev, struct netlink_ext_ack *extack); struct net_devmem_dmabuf_binding *net_devmem_lookup_dmabuf(u32 id); struct net_device * -net_devmem_lock_dev(struct net_devmem_dmabuf_binding *binding, +net_devmem_lock_dev(struct net_device **dev_ptr, netdevice_tracker *dev_tracker); void net_devmem_unlock_dev(struct net_device *dev, netdevice_tracker *dev_tracker); @@ -189,7 +189,7 @@ static inline struct net_devmem_dmabuf_binding *net_devmem_lookup_dmabuf(u32 id) } static inline struct net_device * -net_devmem_lock_dev(struct net_devmem_dmabuf_binding *binding, +net_devmem_lock_dev(struct net_device **dev_ptr, netdevice_tracker *dev_tracker) { return NULL; diff --git a/net/core/netdev-genl.c b/net/core/netdev-genl.c index d2ccb1090496d..5f96808da59fd 100644 --- a/net/core/netdev-genl.c +++ b/net/core/netdev-genl.c @@ -1476,7 +1476,7 @@ void netdev_nl_sock_priv_destroy(struct netdev_nl_sock *priv) mutex_lock(&priv->lock); list_for_each_entry_safe(binding, temp, &priv->bindings, list) { - dev = net_devmem_lock_dev(binding, &dev_tracker); + dev = net_devmem_lock_dev(&binding->dev, &dev_tracker); net_devmem_unbind_dmabuf(binding); net_devmem_unlock_dev(dev, &dev_tracker); } -- 2.56.1.750.gf70dc682cf-goog