Re: [PATCH net-next v9 3/5] net: devmem: implement autorelease token management

Bobby Eshleman
2026-01-14T17:04:07Z

On Tue, Jan 13, 2026 at 12:42:50PM -0800, Mina Almasry wrote:
> On Tue, Jan 13, 2026 at 12:32 PM Bobby Eshleman <bobbyeshleman@gmail.com> wrote:
> >
> > On Tue, Jan 13, 2026 at 11:27:38AM -0800, Mina Almasry wrote:
> > > On Mon, Jan 12, 2026 at 8:24 AM Bobby Eshleman <bobbyeshleman@gmail.com> wrote:
> > > >
> > > > On Sun, Jan 11, 2026 at 11:12:19AM -0800, Mina Almasry wrote:
> > > > > On Fri, Jan 9, 2026 at 6:19 PM Bobby Eshleman <bobbyeshleman@gmail.com> wrote:
> > > > > >
> > > > > > From: Bobby Eshleman <bobbyeshleman@meta.com>
> > > > > >
> > > > > > Add support for autorelease toggling of tokens using a static branch to
> > > > > > control system-wide behavior. This allows applications to choose between
> > > > > > two memory management modes:
> > > > > >
> > > > > > 1. Autorelease on: Leaked tokens are automatically released when the
> > > > > > socket closes.
> > > > > >
> > > > > > 2. Autorelease off: Leaked tokens are released during dmabuf unbind.
> > > > > >
> > > > > > The autorelease mode is requested via the NETDEV_A_DMABUF_AUTORELEASE
> > > > > > attribute of the NETDEV_CMD_BIND_RX message. Having separate modes per
> > > > > > binding is disallowed and is rejected by netlink. The system will be
> > > > > > "locked" into the mode that the first binding is set to. It can only be
> > > > > > changed again once there are zero bindings on the system.
> > > > > >
> > > > > > Disabling autorelease offers ~13% improvement in CPU utilization.
> > > > > >
> > > > > > Static branching is used to limit the system to one mode or the other.
> > > > > >
> > > > > > Signed-off-by: Bobby Eshleman <bobbyeshleman@meta.com>
> > > > > > ---
> > > > > > Changes in v9:
> > > > > > - Add missing stub for net_devmem_dmabuf_binding_get() when NET_DEVMEM=n
> > > > > > - Add wrapper around tcp_devmem_ar_key accesses so that it may be
> > > > > > stubbed out when NET_DEVMEM=n
> > > > > > - only dec rx binding count for rx bindings in free (v8 did not exclude
> > > > > > TX bindings)
> > > > > >
> > > > > > Changes in v8:
> > > > > > - Only reset static key when bindings go to zero, defaulting back to
> > > > > > disabled (Stan).
> > > > > > - Fix bad usage of xarray spinlock for sleepy static branch switching,
> > > > > > use mutex instead.
> > > > > > - Access pp_ref_count via niov->desc instead of niov directly.
> > > > > > - Move reset of static key to __net_devmem_dmabuf_binding_free() so that
> > > > > > the static key can not be changed while there are outstanding tokens
> > > > > > (free is only called when reference count reaches zero).
> > > > > > - Add net_devmem_dmabuf_rx_bindings_count because tokens may be active
> > > > > > even after xa_erase(), so static key changes must wait until all
> > > > > > RX bindings are finally freed (not just when xarray is empty). A
> > > > > > counter is a simple way to track this.
> > > > > > - socket takes reference on the binding, to avoid use-after-free on
> > > > > > sk_devmem_info.binding in the case that user releases all tokens,
> > > > > > unbinds, then issues SO_DEVMEM_DONTNEED again (with bad token).
> > > > > > - removed some comments that were unnecessary
> > > > > >
> > > > > > Changes in v7:
> > > > > > - implement autorelease with static branch (Stan)
> > > > > > - use netlink instead of sockopt (Stan)
> > > > > > - merge uAPI and implementation patches into one patch (seemed less
> > > > > > confusing)
> > > > > >
> > > > > > Changes in v6:
> > > > > > - remove sk_devmem_info.autorelease, using binding->autorelease instead
> > > > > > - move binding->autorelease check to outside of
> > > > > > net_devmem_dmabuf_binding_put_urefs() (Mina)
> > > > > > - remove overly defensive net_is_devmem_iov() (Mina)
> > > > > > - add comment about multiple urefs mapping to a single netmem ref (Mina)
> > > > > > - remove overly defense netmem NULL and netmem_is_net_iov checks (Mina)
> > > > > > - use niov without casting back and forth with netmem (Mina)
> > > > > > - move the autorelease flag from per-binding to per-socket (Mina)
> > > > > > - remove the batching logic in sock_devmem_dontneed_manual_release()
> > > > > > (Mina)
> > > > > > - move autorelease check inside tcp_xa_pool_commit() (Mina)
> > > > > > - remove single-binding restriction for autorelease mode (Mina)
> > > > > > - unbind always checks for leaked urefs
> > > > > >
> > > > > > Changes in v5:
> > > > > > - remove unused variables
> > > > > > - introduce autorelease flag, preparing for future patch toggle new
> > > > > > behavior
> > > > > >
> > > > > > Changes in v3:
> > > > > > - make urefs per-binding instead of per-socket, reducing memory
> > > > > > footprint
> > > > > > - fallback to cleaning up references in dmabuf unbind if socket leaked
> > > > > > tokens
> > > > > > - drop ethtool patch
> > > > > >
> > > > > > Changes in v2:
> > > > > > - always use GFP_ZERO for binding->vec (Mina)
> > > > > > - remove WARN for changed binding (Mina)
> > > > > > - remove extraneous binding ref get (Mina)
> > > > > > - remove WARNs on invalid user input (Mina)
> > > > > > - pre-assign niovs in binding->vec for RX case (Mina)
> > > > > > - use atomic_set(, 0) to initialize sk_user_frags.urefs
> > > > > > - fix length of alloc for urefs
> > > > > > ---
> > > > > > Documentation/netlink/specs/netdev.yaml | 12 ++++
> > > > > > include/net/netmem.h | 1 +
> > > > > > include/net/sock.h | 7 ++-
> > > > > > include/uapi/linux/netdev.h | 1 +
> > > > > > net/core/devmem.c | 104 ++++++++++++++++++++++++++++----
> > > > > > net/core/devmem.h | 27 ++++++++-
> > > > > > net/core/netdev-genl-gen.c | 5 +-
> > > > > > net/core/netdev-genl.c | 10 ++-
> > > > > > net/core/sock.c | 57 +++++++++++++++--
> > > > > > net/ipv4/tcp.c | 76 ++++++++++++++++++-----
> > > > > > net/ipv4/tcp_ipv4.c | 11 +++-
> > > > > > net/ipv4/tcp_minisocks.c | 3 +-
> > > > > > tools/include/uapi/linux/netdev.h | 1 +
> > > > > > 13 files changed, 269 insertions(+), 46 deletions(-)
> > > > > >
> > > > > > diff --git a/Documentation/netlink/specs/netdev.yaml b/Documentation/netlink/specs/netdev.yaml
> > > > > > index 596c306ce52b..7cbe9e7b9ee5 100644
> > > > > > --- a/Documentation/netlink/specs/netdev.yaml
> > > > > > +++ b/Documentation/netlink/specs/netdev.yaml
> > > > > > @@ -562,6 +562,17 @@ attribute-sets:
> > > > > > type: u32
> > > > > > checks:
> > > > > > min: 1
> > > > > > + -
> > > > > > + name: autorelease
> > > > > > + doc: |
> > > > > > + Token autorelease mode. If true (1), leaked tokens are automatically
> > > > > > + released when the socket closes. If false (0), leaked tokens are only
> > > > > > + released when the dmabuf is unbound. Once a binding is created with a
> > > > > > + specific mode, all subsequent bindings system-wide must use the same
> > > > > > + mode.
> > > > > > +
> > > > > > + Optional. Defaults to false if not specified.
> > > > > > + type: u8
> > > > > >
> > > > > > operations:
> > > > > > list:
> > > > > > @@ -769,6 +780,7 @@ operations:
> > > > > > - ifindex
> > > > > > - fd
> > > > > > - queues
> > > > > > + - autorelease
> > > > > > reply:
> > > > > > attributes:
> > > > > > - id
> > > > > > diff --git a/include/net/netmem.h b/include/net/netmem.h
> > > > > > index 9e10f4ac50c3..80d2263ba4ed 100644
> > > > > > --- a/include/net/netmem.h
> > > > > > +++ b/include/net/netmem.h
> > > > > > @@ -112,6 +112,7 @@ struct net_iov {
> > > > > > };
> > > > > > struct net_iov_area *owner;
> > > > > > enum net_iov_type type;
> > > > > > + atomic_t uref;
> > > > > > };
> > > > > >
> > > > > > struct net_iov_area {
> > > > > > diff --git a/include/net/sock.h b/include/net/sock.h
> > > > > > index aafe8bdb2c0f..9d3d5bde15e9 100644
> > > > > > --- a/include/net/sock.h
> > > > > > +++ b/include/net/sock.h
> > > > > > @@ -352,7 +352,7 @@ struct sk_filter;
> > > > > > * @sk_scm_rights: flagged by SO_PASSRIGHTS to recv SCM_RIGHTS
> > > > > > * @sk_scm_unused: unused flags for scm_recv()
> > > > > > * @ns_tracker: tracker for netns reference
> > > > > > - * @sk_user_frags: xarray of pages the user is holding a reference on.
> > > > > > + * @sk_devmem_info: the devmem binding information for the socket
> > > > > > * @sk_owner: reference to the real owner of the socket that calls
> > > > > > * sock_lock_init_class_and_name().
> > > > > > */
> > > > > > @@ -584,7 +584,10 @@ struct sock {
> > > > > > struct numa_drop_counters *sk_drop_counters;
> > > > > > struct rcu_head sk_rcu;
> > > > > > netns_tracker ns_tracker;
> > > > > > - struct xarray sk_user_frags;
> > > > > > + struct {
> > > > > > + struct xarray frags;
> > > > > > + struct net_devmem_dmabuf_binding *binding;
> > > > > > + } sk_devmem_info;
> > > > > >
> > > > > > #if IS_ENABLED(CONFIG_PROVE_LOCKING) && IS_ENABLED(CONFIG_MODULES)
> > > > > > struct module *sk_owner;
> > > > > > diff --git a/include/uapi/linux/netdev.h b/include/uapi/linux/netdev.h
> > > > > > index e0b579a1df4f..1e5c209cb998 100644
> > > > > > --- a/include/uapi/linux/netdev.h
> > > > > > +++ b/include/uapi/linux/netdev.h
> > > > > > @@ -207,6 +207,7 @@ enum {
> > > > > > NETDEV_A_DMABUF_QUEUES,
> > > > > > NETDEV_A_DMABUF_FD,
> > > > > > NETDEV_A_DMABUF_ID,
> > > > > > + NETDEV_A_DMABUF_AUTORELEASE,
> > > > > >
> > > > > > __NETDEV_A_DMABUF_MAX,
> > > > > > NETDEV_A_DMABUF_MAX = (__NETDEV_A_DMABUF_MAX - 1)
> > > > > > diff --git a/net/core/devmem.c b/net/core/devmem.c
> > > > > > index 05a9a9e7abb9..05c16df657c7 100644
> > > > > > --- a/net/core/devmem.c
> > > > > > +++ b/net/core/devmem.c
> > > > > > @@ -11,6 +11,7 @@
> > > > > > #include <linux/genalloc.h>
> > > > > > #include <linux/mm.h>
> > > > > > #include <linux/netdevice.h>
> > > > > > +#include <linux/skbuff_ref.h>
> > > > > > #include <linux/types.h>
> > > > > > #include <net/netdev_queues.h>
> > > > > > #include <net/netdev_rx_queue.h>
> > > > > > @@ -28,6 +29,19 @@
> > > > > >
> > > > > > static DEFINE_XARRAY_FLAGS(net_devmem_dmabuf_bindings, XA_FLAGS_ALLOC1);
> > > > > >
> > > > > > +/* If the user unbinds before releasing all tokens, the static key must not
> > > > > > + * change until all tokens have been released (to avoid calling the wrong
> > > > > > + * SO_DEVMEM_DONTNEED handler). We prevent this by making static key changes
> > > > > > + * and binding alloc/free atomic with regards to each other, using the
> > > > > > + * devmem_ar_lock. This works because binding free does not occur until all of
> > > > > > + * the outstanding token's references on the binding are dropped.
> > > > > > + */
> > > > > > +static DEFINE_MUTEX(devmem_ar_lock);
> > > > > > +
> > > > > > +DEFINE_STATIC_KEY_FALSE(tcp_devmem_ar_key);
> > > > > > +EXPORT_SYMBOL(tcp_devmem_ar_key);
> > > > > > +static int net_devmem_dmabuf_rx_bindings_count;
> > > > > > +
> > > > > > static const struct memory_provider_ops dmabuf_devmem_ops;
> > > > > >
> > > > > > bool net_is_devmem_iov(struct net_iov *niov)
> > > > > > @@ -60,6 +74,14 @@ void __net_devmem_dmabuf_binding_free(struct work_struct *wq)
> > > > > >
> > > > > > size_t size, avail;
> > > > > >
> > > > > > + if (binding->direction == DMA_FROM_DEVICE) {
> > > > > > + mutex_lock(&devmem_ar_lock);
> > > > > > + net_devmem_dmabuf_rx_bindings_count--;
> > > > > > + if (net_devmem_dmabuf_rx_bindings_count == 0)
> > > > > > + static_branch_disable(&tcp_devmem_ar_key);
> > > > > > + mutex_unlock(&devmem_ar_lock);
> > > > > > + }
> > > > > > +
> > > > >
> > > > > I find this loging with devmem_ar_lock and
> > > > > net_devmem_dmabuf_rx_bindigs_count a bit complicated. I wonder if we
> > > > > can do another simplification here? Can we have it such that the first
> > > > > binding sets the system in autorelease on or autorelease off mode, and
> > > > > all future bindings maintain this state? We already don't support
> > > > > autorelease on/off mix.
> > > >
> > > > I think that would greatly simplify things. We would still need a lock
> > > > to make the static branch change and first release mode setting atomic WRT
> > > > each other, but the other parts (like the one above) can be
> > > > removed.
> > > >
> > > > >
> > > > >
> > > > > > gen_pool_for_each_chunk(binding->chunk_pool,
> > > > > > net_devmem_dmabuf_free_chunk_owner, NULL);
> > > > > >
> > > > > > @@ -116,6 +138,24 @@ void net_devmem_free_dmabuf(struct net_iov *niov)
> > > > > > gen_pool_free(binding->chunk_pool, dma_addr, PAGE_SIZE);
> > > > > > }
> > > > > >
> > > > > > +static void
> > > > > > +net_devmem_dmabuf_binding_put_urefs(struct net_devmem_dmabuf_binding *binding)
> > > > > > +{
> > > > > > + int i;
> > > > > > +
> > > > > > + for (i = 0; i < binding->dmabuf->size / PAGE_SIZE; i++) {
> > > > > > + struct net_iov *niov;
> > > > > > + netmem_ref netmem;
> > > > > > +
> > > > > > + niov = binding->vec[i];
> > > > > > + netmem = net_iov_to_netmem(niov);
> > > > > > +
> > > > > > + /* Multiple urefs map to only a single netmem ref. */
> > > > > > + if (atomic_xchg(&niov->uref, 0) > 0)
> > > > > > + WARN_ON_ONCE(!napi_pp_put_page(netmem));
> > > > > > + }
> > > > > > +}
> > > > > > +
> > > > > > void net_devmem_unbind_dmabuf(struct net_devmem_dmabuf_binding *binding)
> > > > > > {
> > > > > > struct netdev_rx_queue *rxq;
> > > > > > @@ -143,6 +183,7 @@ void net_devmem_unbind_dmabuf(struct net_devmem_dmabuf_binding *binding)
> > > > > > __net_mp_close_rxq(binding->dev, rxq_idx, &mp_params);
> > > > > > }
> > > > > >
> > > > > > + net_devmem_dmabuf_binding_put_urefs(binding);
> > > > >
> > > > > Sigh, I think what you're trying to do here is very complicated. You
> > > > > need to think about this scenario:
> > > > >
> > > > > 1. user binds dmabuf and opens a autorelease=off socket.
> > > > > 2. Data arrives on these sockets, and sits in the receive queues,
> > > > > recvmsg has not been called yet by the user.
> > > > > 3. User unbinds the dma-buff, netmems are still in the receive queues.
> > > > > 4. User calls recvmsg on one of these sockets, which obtains a uref on
> > > > > the netmems in the receive queues.
> > > > > 5. user closes the socket.
> > > > >
> > > > > With autorelease=on, this works, because the binding remains alive
> > > > > until step 5 (even though it's unbound from the queue,
> > > > > ..._binding_free has not been called yet) and step 5 cleans up all
> > > > > references, even if the binding is unbound but alive, and
> > > > >
> > > > > calling net_devmem_dmabuf_binding_put_urefs here is weird.
> > > > > Autorelease=off implies the user must clean their urefs themselves,
> > > > > but we have this here in the unbind path, and it doesn't even
> > > > > guarantee that the urefs are free at this point because it may race
> > > > > with a recvmsg.
> > > > >
> > > > > Should we delete this uref cleanup here, and enforce that
> > > > > autorelease=off means that the user cleans up the references (the
> > > > > kernel never cleans them up on unbind or socket close)? The dontneed
> > > > > path needs to work whether the binding is active or unbound.
> > > > >
> > > >
> > > > I agree, I think we can do away with the "unbind drops references" idea.
> > > > A counter argument could be that it introduces the ability for one
> > > > process to interfere with another, but in fact that is already possible
> > > > with autorelease=on by not issuing dontneed and starving the other of
> > > > tokens.
> > > >
> > >
> > > On second thought I don't think we can remove the references drop
> > > completely. AFAIU if the userspace misbehaves and doens't dontneed the
> > > netmems in this setup, then the binding will leak forever, which is
> > > really not great.
> > >
> > > I think what may work is having a refcount on the binding for each
> > > rxqueue it's bound to and each socket that's using it. Once that
> > > refcount drops to 0, then we can be sure that the urefs in the binding
> > > are not in use anymore, and we can drop the urefs, which should make
> > > the binding refcount to hit 0 and the _binding_free() function to be
> > > called.
> > >
> >
> > That checks out. I guess a reasonable name to differentiate with
> > binding->ref might be binding->users?
> >
>
> I was turning that exact same question in my head. It would be nice to
> reuse binding->ref somehow, but without deep thinking I'm not sure
> that's possible. It seems that binding->ref should guard
> *_binding_free() being called when the binding is not used by anything
> (remember that each netmem allocated from the binding has effectively
> a ref on the page_pool it belong too, and the page_pool has a ref on
> the binding, so effectively the binding never goes away until all the
> netmems are returned to the pool).
>
> and seemingly binding->users should guard *_put_urefs() being called
> when we're user there is no userspace refs outstanding (no sockets
> open and no rx queues active).
>
>
> --
> Thanks,
> Mina

I know this is late in the game, but I'm considering a name change:

From NETDEV_A_DMABUF_AUTORELEASE to NETDEV_A_DMABUF_COMPAT_DONTNEED.

I think this will make it less confusing which one is which. WDYT?

Best,
Bobby