From nobody Mon Feb 9 08:58:10 2026 Received: from mail-yx1-f44.google.com (mail-yx1-f44.google.com [74.125.224.44]) (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 CF6AC23E334 for ; Sat, 10 Jan 2026 02:19:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768011544; cv=none; b=BvxsbKZ4DjMxquxJ+vpbTePRv1kA8Me3E7xzQxsvjBRVg52MZ1ZvZKmgiBrsRl+wHEkjs15OO15NkCApT6XN9FyNmkn4ZYKC9nNZCYhNRGXRDZVEhrqh9q9vgDw8sj4rJH7sPFPIriuvzZWO0N5dhW2qREBRGTs9FP1xST2ACWQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768011544; c=relaxed/simple; bh=/8irlWx212MZNFNuTQquG/o/4qXs4GzUcqgDeIkWkeY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZSDyfvOK3D3CvnqaVHtSdRMdAviTTagmC2VoVtfoEzaViPFKrJwetkZhuas1J7qn5Eoqt5V6FYCUmOmJC6n38ZyBXQ8n2ZdkEtbWeY/nyCkmqHeeQPKGuvb2yta5wiiiMS/7iP22YVioup+Oz2pjtvz6kOf6Xic6oLdqd/8brGM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Pmh4gQv6; arc=none smtp.client-ip=74.125.224.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Pmh4gQv6" Received: by mail-yx1-f44.google.com with SMTP id 956f58d0204a3-644798bb299so4515083d50.3 for ; Fri, 09 Jan 2026 18:19:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768011542; x=1768616342; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=vJwRH55S+4zS4rc7LIeDbyFWVKjFx7zOxvxC4DTtZFU=; b=Pmh4gQv6CDB0sn4MOfoJNJplhGdYkdl806mn+HX/jQdzPnHdNtrmIAkAo6WQeipPFj q9IP8/gve/ApA78ioiaTE2hknb/mgSj2O66aYQia5uxObrhYl3SKgYdWUGtyM9GUoHIp YgdmgchvIoPttlKzKoVZXqls4rg02rtkJuweYqJSeD2oyD5i2I82qZhEKy6Mczv/KMBl CFkzK0QFpNV2jpONeDQsqjBid0Eclzv7/ESnvQriZUGTGIez7szNmuh+x3NKf5eGMRyC bntgEz+0P95+q2V4sfu5TeyGDkHRG9/cwbCJXisuHKvThcw/lwl+Y9e8bkDwUdV2KN07 GNxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768011542; x=1768616342; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=vJwRH55S+4zS4rc7LIeDbyFWVKjFx7zOxvxC4DTtZFU=; b=FwGjYttC1fsBwQgMAdC4eWPsGlliuxfJd73+cZ5lccm3f766pdh9DBFfFyi+waviMv U8LPi+nDbKxXNc9J3FD/HFmwEDGIeLOstNpkKNKjmh+yr1xDl07lhpOXtBLRkmVcMntq 0Kzudbz05Teiz8JR1zPFTar9t8QKPuZFB0XQNPrYrNxfGpUXya0uei6y9fJ0OL5FxrAT OpFWZLyz8bGV3wtwGj1YR7GX7n6EZEyH93wBy7qVgqOUImpkHrr2E+TgFcvtiXRjgFBu Gq/eUCDV5XWqm5zcfFyvjQ8qfi99KovqCCAdwndcwNwltP92cADZ04ibUYzYPgvNU5gO yokQ== X-Forwarded-Encrypted: i=1; AJvYcCU8TOXTdWVnBdKQWrAShMPTch5UPDdwrSi0labUfDcMX4kAP1EUluym+XG8MDt1OyAs3SVf6CwrDavkDbE=@vger.kernel.org X-Gm-Message-State: AOJu0YzAnxEzMFQOJlBGWrn8ByD+3LWdYZY4zAcdldEcJ9vHtL4jofmN 2oV6b/toj0t9mk2C1Fx5PEFoBs36p/hRm7yYa1YzKGfqsdPQWggco8wi X-Gm-Gg: AY/fxX6b5wJCt38F38uvL6fPSdsw35yUQkF6LTN70rJE7SzlQxtIXQbVlke9E1+bA0c yGL5POE9UzCs4exRam1+/HjuF9eTELKy/Me+QoZMIDxd5Cl/TEq37dmm9tvQt2uNA8V/csKnrwJ FBAQ7vapqUOjFBfxDjeGw879cAyik5rwQ80p0uMl50MbCQf29RDPKQA0ldjtoeXtWmicVaC9x5B oRKGCod6QODFp0SahCe/D6+TtkNu1pfEibf9HRJn1qv1+9z7N1lg6lgjwHROunbW0Hnd59ZENwS ow98UWh6qhBitQggsp3allQLPdQeEedhuQzncgsNdyjNwy+HjM3/RLQNdQzzdKybAWkqB9XcIYx muaRx3lcGLbXTzlYjKpUEZLuZkQ5XGDt3AQTqLhVLCFZZHeJZQl1iA4ACkUlM9A2NqOtvzwgN5k yrrTpsdC6ggw== X-Google-Smtp-Source: AGHT+IFOmZSfq1+B/UIacsFnpLVgmv9FPVdwArttfHVymmNEdJMthIaDrn+0zcXw3EHB1ioYKpS2zw== X-Received: by 2002:a53:e319:0:b0:644:7b34:7bd2 with SMTP id 956f58d0204a3-64716c804d2mr7062728d50.75.1768011541886; Fri, 09 Jan 2026 18:19:01 -0800 (PST) Received: from localhost ([2a03:2880:25ff:70::]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-6470d8b241csm5204761d50.19.2026.01.09.18.19.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jan 2026 18:19:01 -0800 (PST) From: Bobby Eshleman Date: Fri, 09 Jan 2026 18:18:16 -0800 Subject: [PATCH net-next v9 2/5] net: devmem: refactor sock_devmem_dontneed for autorelease split Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260109-scratch-bobbyeshleman-devmem-tcp-token-upstream-v9-2-8042930d00d7@meta.com> References: <20260109-scratch-bobbyeshleman-devmem-tcp-token-upstream-v9-0-8042930d00d7@meta.com> In-Reply-To: <20260109-scratch-bobbyeshleman-devmem-tcp-token-upstream-v9-0-8042930d00d7@meta.com> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Kuniyuki Iwashima , Willem de Bruijn , Neal Cardwell , David Ahern , Mina Almasry , Arnd Bergmann , Jonathan Corbet , Andrew Lunn , Shuah Khan , Donald Hunter Cc: Stanislav Fomichev , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, asml.silence@gmail.com, matttbe@kernel.org, skhawaja@google.com, Bobby Eshleman X-Mailer: b4 0.14.3 From: Bobby Eshleman Refactor sock_devmem_dontneed() in preparation for supporting both autorelease and manual token release modes. Split the function into two parts: - sock_devmem_dontneed(): handles input validation, token allocation, and copying from userspace - sock_devmem_dontneed_autorelease(): performs the actual token release via xarray lookup and page pool put This separation allows a future commit to add a parallel sock_devmem_dontneed_manual_release() function that uses a different token tracking mechanism (per-niov reference counting) without duplicating the input validation logic. The refactoring is purely mechanical with no functional change. Only intended to minimize the noise in subsequent patches. Reviewed-by: Mina Almasry Signed-off-by: Bobby Eshleman --- net/core/sock.c | 52 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index a1c8b47b0d56..f6526f43aa6e 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1082,30 +1082,13 @@ static int sock_reserve_memory(struct sock *sk, int= bytes) #define MAX_DONTNEED_FRAGS 1024 =20 static noinline_for_stack int -sock_devmem_dontneed(struct sock *sk, sockptr_t optval, unsigned int optle= n) +sock_devmem_dontneed_autorelease(struct sock *sk, struct dmabuf_token *tok= ens, + unsigned int num_tokens) { - unsigned int num_tokens, i, j, k, netmem_num =3D 0; - struct dmabuf_token *tokens; + unsigned int i, j, k, netmem_num =3D 0; int ret =3D 0, num_frags =3D 0; netmem_ref netmems[16]; =20 - if (!sk_is_tcp(sk)) - return -EBADF; - - if (optlen % sizeof(*tokens) || - optlen > sizeof(*tokens) * MAX_DONTNEED_TOKENS) - return -EINVAL; - - num_tokens =3D optlen / sizeof(*tokens); - tokens =3D kvmalloc_array(num_tokens, sizeof(*tokens), GFP_KERNEL); - if (!tokens) - return -ENOMEM; - - if (copy_from_sockptr(tokens, optval, optlen)) { - kvfree(tokens); - return -EFAULT; - } - xa_lock_bh(&sk->sk_user_frags); for (i =3D 0; i < num_tokens; i++) { for (j =3D 0; j < tokens[i].token_count; j++) { @@ -1135,6 +1118,35 @@ sock_devmem_dontneed(struct sock *sk, sockptr_t optv= al, unsigned int optlen) for (k =3D 0; k < netmem_num; k++) WARN_ON_ONCE(!napi_pp_put_page(netmems[k])); =20 + return ret; +} + +static noinline_for_stack int +sock_devmem_dontneed(struct sock *sk, sockptr_t optval, unsigned int optle= n) +{ + struct dmabuf_token *tokens; + unsigned int num_tokens; + int ret; + + if (!sk_is_tcp(sk)) + return -EBADF; + + if (optlen % sizeof(*tokens) || + optlen > sizeof(*tokens) * MAX_DONTNEED_TOKENS) + return -EINVAL; + + num_tokens =3D optlen / sizeof(*tokens); + tokens =3D kvmalloc_array(num_tokens, sizeof(*tokens), GFP_KERNEL); + if (!tokens) + return -ENOMEM; + + if (copy_from_sockptr(tokens, optval, optlen)) { + kvfree(tokens); + return -EFAULT; + } + + ret =3D sock_devmem_dontneed_autorelease(sk, tokens, num_tokens); + kvfree(tokens); return ret; } --=20 2.47.3