From nobody Mon Feb 9 14:38:19 2026 Received: from mail-yw1-f172.google.com (mail-yw1-f172.google.com [209.85.128.172]) (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 5CFDB349B15 for ; Fri, 16 Jan 2026 05:03:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768539804; cv=none; b=QFPcjZ5FEs3f2n15MTVgXn/q0efXmSSPAy+vLF8FRN4ri9+jEI0/hhI0gzWbWFCxo6vaPwcrT0RNKB65/saITe34jxJ1wGVwB2gW2lM6CkHzffy+E3qmv3MdocJ30mo2COyzkr1s2Z/DMf9sjzr+Z7fiAD5jZvBmxNAjOqyHq/A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768539804; c=relaxed/simple; bh=/8irlWx212MZNFNuTQquG/o/4qXs4GzUcqgDeIkWkeY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EIklChtzK+q6CGhlprvDPVM+m/5RwFlMA/KIjU1Yh9pP5XT9pv59EfVtqux+ODQ4h79qPToqXoOWRjBC1SSf8nLwtrFe+6BpkR2kAsCyxI+zr8AFpVTtZgHtWZUZCZgZCb/ytRaZV+WYnGbjaf+xNjKwScZu1ZEUF5EQPmwTOfA= 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=Anb1f3io; arc=none smtp.client-ip=209.85.128.172 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="Anb1f3io" Received: by mail-yw1-f172.google.com with SMTP id 00721157ae682-78fb9a67b06so16173727b3.1 for ; Thu, 15 Jan 2026 21:03:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768539799; x=1769144599; 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=Anb1f3iovHiDvlnpirku9R6ubteBBL791YYQz+9ZbGJ0zxCcO9CFupB7IEa4Lkld6b AYZSFNHidrxVDodoR5m6s86G/8TftF/m6AYTQVWQd+5OYr1CEojeyJ1mCBTHCh1Z2Xbq 4OupmM3Ci3yGW5Y3eeSWx6hV3vZXVTiq3FWUc7YvysxhQhrU8NJSqLsKQ1w4yv1w2Cg/ GMnf0VgWpzpqY9LdyhxcX7z3XKRzTB0NjzY/2xDzuobIn4/mE08a0WK4I4XzrxNc/3av JyQKQocsgd/untpIK9cYlIQeYhV5ce9pb6F4qK4eLGzHB3shm6yyygfb0+ahNxmk8KW/ CdiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768539799; x=1769144599; 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=sT+MTfYuixVtHL/PDLlJ9407wPsmocBxNu9dWIfsbh6AzzIi7xWJNe7UTmJNwkkZyE SA9Z5mImDfLLgbiy8SZ0q6IcFGwETH8GfqG/9V/qMjYaxX2QA+Z1ZfRUl8E7xAe13dzX JRtybv+cI9UZ4hBtr4GkTIWxZMIdPzYkvdsPNxIBJcXhShS08FY+1A5IN6Aglr9pM0Wz Pi6Ysn1ggej4fjRQqojxtjKQj5jMoCIRqK/kTyYHLCBxEloTLzrGMvK8JaSsGVSK+2gb 9ZFWgMqYapHQt9C36lRDJsorE4GX9D0UznAFTogyEbzTLyAcTih5ezSyc+70IeJZbMZc mV2Q== X-Forwarded-Encrypted: i=1; AJvYcCVm07TvwZemBhNJr9XvAEwXDRHKjdNdGRI8kBwhhxPuI6SmpOzL5ihCTjllPbkuPDxKnDjlGgb15clzHss=@vger.kernel.org X-Gm-Message-State: AOJu0YxKu57oJQbYqs4gmHM731ixbHYOGHd8/BGc0reGsoLB/PPCQx9h KNPD4QRQnocrlhogyfr5QE954C/5mJiqdu4buT0NnVB/h6CqePL1kAMp X-Gm-Gg: AY/fxX7TmiPpOF072eVa1ZPAeeo9+HQekm8n4eqyKT8xeN8sgFAdurs4j+9vkjDrd8S OyJHY/L9fsZTh26awIvniNAck/Asuz8KGYbtbo4ZGHKjWBn9gZ6o+hi9FZqSSDLMjqycnApg0zQ zxCrvVMdTQvclG/74Le+pHY22f4qn9J0Ju5Lvng3KnDasWB7ky0eyYxoT0hlK9kYk+Nl5onKhr1 9bDlbZcroyWU/NqJtJ1wOSFWXFFPblMzmv4htmnWFFUduyx/0/fpvlxRDn2fjvldul39Zf7f4p7 FIg0wYocOyBVJj/I4405flXdbWBiTy2xwZiKoWdHdCq30MBndJs6EmfMyZOU1jwlQrW4C5w3L8L QKy25hNvhmQ/Ku2yjvghLfQh3abLvEFfHHPwabuoKjPcKmvn3U35rcvaDA2mn49oj0bmw0zF2I9 rp8YOH7wwqfg== X-Received: by 2002:a05:690c:4a07:b0:787:d0d5:808e with SMTP id 00721157ae682-793c682d2ebmr12993417b3.50.1768539798910; Thu, 15 Jan 2026 21:03:18 -0800 (PST) Received: from localhost ([2a03:2880:25ff:52::]) by smtp.gmail.com with ESMTPSA id 00721157ae682-793c68c31dfsm5205817b3.51.2026.01.15.21.03.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 21:03:18 -0800 (PST) From: Bobby Eshleman Date: Thu, 15 Jan 2026 21:02:13 -0800 Subject: [PATCH net-next v10 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: <20260115-scratch-bobbyeshleman-devmem-tcp-token-upstream-v10-2-686d0af71978@meta.com> References: <20260115-scratch-bobbyeshleman-devmem-tcp-token-upstream-v10-0-686d0af71978@meta.com> In-Reply-To: <20260115-scratch-bobbyeshleman-devmem-tcp-token-upstream-v10-0-686d0af71978@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