From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=91.218.175.39 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795257399; b=C3jxcbsM/PTlxd5s8BMsOuwawWwlMLgm19eGNa6DW3WN3S81WBxtgbWIwvChOdpIwH89 9qVbqd8TYNXdfv2nMAdmIja6UOZppGhrIxD1sI91vginpdBJ2CpFUDWajoVUEbNervAar TAYrjcrPRFq2bAQznAD/q8mkoTZgHLaXwi2beY1IFNl642MFg//F+xQPINOc2dzK0zse5 GgF0AJKe13c7o3D/78pFIQMJNABzA4nIcGQbTx8oCYG3fIK7zGhJRvXpYJunaiwhRYLg0 aTge7ELevZgljZL0Pp3nrP/rx1ndHEhAJaoExJhdgDM2xyExvll2WqSUGinawo5ulow== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795257399; h=DMARC-Filter:X-Envelope-To:DKIM-Signature:X-Envelope-To:Received: X-Mizu-Trace-ID:X-Migadu-Flow:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=zlgphkCqUOZkfZTPFhVitOlLwkz+8/Rg7msqF4mZoQ4=; b=wIgMNNTx3nsN8V474jvGDnhEwG/5UJM6K4qL/mT8X11pq1snI5i2cxV2kzp239KAOpf7 vP58nexWBwxhAGns9yBW8viVco578tpVe/3cM4CRB2nir3Hr7ZJBNnbs7CZenqpiyP2UZ LDtnSLEYo3SLUpupLt1VUqNkcPMVzO6M0yEtdGfJkL9sJcK1OPygR2cakqX2kjMj17ZgF 2XJkKPNLxIvUarshASNIsvaW3C0udu8ckdF25ADLHghN9mxBph+GYzJGK/PUliPOhtjqb MdNdEMGNiLxzjx7soLeRTSoyxDffyyGiGJpXtgcQacno+bLPV0aH6ZA490w96Gbc7oA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=QlIlaTTM; arc=none smtp.remote-ip=91.218.175.39 Received: from mta0.migadu.com (out-39.mta0.migadu.com [91.218.175.39]) (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 BC7F8606A32A for ; Sat, 21 Nov 2026 10:36:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org BC7F8606A32A Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=QlIlaTTM X-Envelope-To: netdev@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=HgIwESM6dA8y7hBlduhrBhg1MrV+gTYGCx00jHwO1zM=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1795257397; v=1; x=1795862197; b=QlIlaTTMw54R/GcZCIMXzUIfT+ENjKi+D6EEg/SYguChwGg7zVV1iV/SaaHO3Kexv/aFYQfz vXj9IIfwLs82BKY9/IeVXDsvqgVbiElyxPKsbFaWdVba5Aug31Y+JAzDana6jvoeQIJaMU44PQU 9iGs+rjeohCLmtmaGWksEIvk= X-Envelope-To: netdev@vger.kernel.org Received: by smtp.migadu.com with ESMTPS id f1a40ebd3524503a; Sat, 21 Nov 2026 10:36:36 +0000 X-Mizu-Trace-ID: f1a40ebd3524503a X-Migadu-Flow: FLOW_OUT From: Jiayuan Chen To: bpf@vger.kernel.org, ast@kernel.org Cc: Jiayuan Chen , John Fastabend , Jakub Sitnicki , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Kuniyuki Iwashima , Willem de Bruijn , Neal Cardwell , Andrii Nakryiko , Eduard Zingerman , Ihor Solodrai , Daniel Borkmann , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Shuah Khan , Sechang Lim , Mattia Meleleo , Michal Luczaj , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf 09/11] bpf, sockmap: Fix apply_bytes when a redirect sends only a part Date: Sat, 21 Nov 2026 18:30:10 +0800 Message-ID: <20261121103222.88209-10-jiayuan.chen@linux.dev> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261121103222.88209-1-jiayuan.chen@linux.dev> References: <20261121103222.88209-1-jiayuan.chen@linux.dev> 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 Content-Transfer-Encoding: 8bit An sk_msg prog can parse the header of an application message and call bpf_msg_apply_bytes() with the message length. The verdict then covers the whole message, and the prog runs again at the next header: +-----+-----------+-----+-------+-----+------ | hdr | body | hdr | body | hdr | ... +-----+-----------+-----+-------+-----+------ ^ ^ ^ prog: apply(len1) prog: apply(len2) prog: apply(len3) For SK_REDIRECT, tcp_bpf_send_verdict() takes tosend bytes off apply_bytes before the redirect. But the redirect can send only a part: the ingress target can't get more memory, or the egress target has no send buffer left. The rest stays in msg, or goes back to the user who sends it again. The verdict has already used up these bytes, so the prog runs on the rest, in the middle of a message: +-----+-----------+-----+-------+------ | hdr | body | hdr | body | ... +-----+-----------+-----+-------+------ |<- apply(len1) ->| |<-- sent -->| ^ prog runs here and takes body as a header >From then on the message boundaries are wrong. Give back the bytes that were not sent, and keep the verdict while apply_bytes is not 0. The bytes of a cork that fails are freed and reported as sent, so they stay used. Fixes: 604326b41a6f ("bpf, sockmap: convert to generic sk_msg interface") Signed-off-by: Jiayuan Chen --- net/ipv4/tcp_bpf.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c index da9caccfede79..25f222b569ec8 100644 --- a/net/ipv4/tcp_bpf.c +++ b/net/ipv4/tcp_bpf.c @@ -449,7 +449,7 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, { bool cork = false, enospc = sk_msg_full(msg), redir_ingress; struct sock *sk_redir; - u32 tosend, origsize, sent, delta = 0; + u32 tosend, origsize, sent, apply, delta = 0; u32 eval; int ret; @@ -518,6 +518,7 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, redir_ingress = psock->redir_ingress; sk_redir = psock->sk_redir; sock_hold(sk_redir); + apply = psock->apply_bytes; sk_msg_apply_bytes(psock, tosend); if (!psock->apply_bytes) { /* Clean up before releasing the sock lock. */ @@ -540,10 +541,6 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, msg, tosend, flags); sent = origsize - msg->sg.size; - if (eval == __SK_REDIRECT) - sock_put(sk_redir); - sock_put(sk_redir); - lock_sock(sk); sk_mem_uncharge(sk, sent); if (unlikely(ret < 0)) { @@ -566,6 +563,21 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, msg = NULL; ret = 0; } + /* + * Bytes that were not sent and come back, in msg or in the + * next sendmsg(), are still covered by the verdict. + */ + if (apply && sent < tosend && !cork) { + psock->apply_bytes += tosend - sent; + if (eval == __SK_REDIRECT) { + psock->eval = eval; + psock->sk_redir = sk_redir; + eval = __SK_NONE; + } + } + if (eval == __SK_REDIRECT) + sock_put(sk_redir); + sock_put(sk_redir); break; case __SK_DROP: default: -- 2.43.0