From nobody Sun Feb 8 15:42:37 2026 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 D0F521448E1 for ; Fri, 23 Aug 2024 08:53:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724403208; cv=none; b=AtmlhYz0gzvwY9oP54oMuqE0aPspgN/pXdbKY0GdnS0UdDLvNISBW+86HyzI/T92z6rW+lLy68egutG6eM/muB5nCceQdVN6BwuwTesW4TuKa6oyYfP82FPe85Xhb0PZ5hBnmUdOQvrOe8MTOk7ezy2t4sfyvPzxQ5+cHVH2/Rc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724403208; c=relaxed/simple; bh=Czg/K8OYgGDUZKZ32LDsFwF1lH6BFPUIGzT9yRSBDJo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=OufILy5hq4rTw8RpodRvTUCW1m56UhihPpFbFHiLCMDe0wWDFD1RTn68IsD/FcjZLK1/5YfPlySi1ReGpqwt9V0U4GowjJdbkvC3335U5NtNpK0gVSELo6v0tcGIJAnXtBcI25BW9Doe6Kst5kqgHNQrwNx10Vvnn0RkFBqB0Ag= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=SUMuf+H/; arc=none smtp.client-ip=209.85.216.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="SUMuf+H/" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2d3d7a1e45fso1261221a91.3 for ; Fri, 23 Aug 2024 01:53:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1724403206; x=1725008006; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ezFQroxpGkaUsSdMcah57ZHaQ9w5KjbUOSox/PwRH50=; b=SUMuf+H/LY7unKIiQ3uFyTTubrpi0/t7bx/ytZuaDRyZFqkf9E2tiBMh31X9H5NYZ0 qBnee29k7Th69WqQKu5Ev9nKraQ0BInB/QZJIMpR9WZwRuPfC24DL+1ge8NJdyN/SdhK UtXZIO8KH579RCdKWOstRNNb9+XqB+5Oep+TRFeC78cOeDbMzBCB34DL63DB7ETrv4fw aG6AD3/c6/a5QH5ZrHF4S+tkdTEkO14B1MkDJ7ngCyIiy6ZjA1Vf9eOkMi8GomOlPV15 pXlBu2yArknbGKrZAinhdyfLU0bjEPPJwNEZzWjGkCw4rKujChMVT60eSYEEPQ6rGWPW ZYkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724403206; x=1725008006; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ezFQroxpGkaUsSdMcah57ZHaQ9w5KjbUOSox/PwRH50=; b=L8Gn7UWotRu9H5QFiFThz+OBN0I1aFg6iQoncnZizoinJ0kE4A6SLlyV3WIxStU2Mq HB7hkbreQHbbkkcwElNBNO934CgHk3CfJxceDgfnaQeBmXqJcHZYuddPDAojIn+oIMbB euldCBgCxPT6rckmaCLolE9KniUwJrNt/qpwhm5qsQtRD4WR3HlAvNKsPwSjmI2wOuS5 dxm4M7U9Fh3I4f6hzjjtrz0YG0jS6SlW+P53gPYBHCgbTKNg1fchxzDrHORjDdQ/KGj5 3EkrEIZ8iWOPeUCIiCtgT7ZfurUQrT37gp+sdydUiPSUJoMwPYPPx2GaabD1JmlIehd+ y7WQ== X-Forwarded-Encrypted: i=1; AJvYcCVUIShioKFqCDwU4y1Ebi41GRc9IR16F87t/whA5UuqgmQr5M/n3rfsoqWZQTZ+MksDG+717HRInIjSWH0=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5aFFXVQDtFSt8pIaAqfa3oRc+kBkd9rBvDkmVjdowhGz6wrbo /XP5E9XMrtwAyHA+9zPIk8sBdPwKADl0gZUOyIEhiBMgxcVTl84HQexOq/4yPWE= X-Google-Smtp-Source: AGHT+IFaylOAd/toGYXIX2p8c9dCa2PThSma27XXT7LPRvz9cAudRL9wgkqY+ZW7DLfNiPVNny90yw== X-Received: by 2002:a17:90a:2ce2:b0:2cb:4b88:2aaf with SMTP id 98e67ed59e1d1-2d646bb512amr1410015a91.12.1724403205819; Fri, 23 Aug 2024 01:53:25 -0700 (PDT) Received: from C02F52LSML85.bytedance.net ([63.216.146.178]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d613b2048fsm3430129a91.54.2024.08.23.01.53.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Aug 2024 01:53:25 -0700 (PDT) From: Feng zhou To: edumazet@google.com, davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, dsahern@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, yangzhenze@bytedance.com, wangdongdong.6@bytedance.com, zhoufeng.zf@bytedance.com Subject: [PATCH bpf-next v2] bpf: Fix bpf_get/setsockopt to tos not take effect when TCP over IPv4 via INET6 API Date: Fri, 23 Aug 2024 16:53:13 +0800 Message-Id: <20240823085313.75419-1-zhoufeng.zf@bytedance.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Feng Zhou when TCP over IPv4 via INET6 API, bpf_get/setsockopt with ipv4 will fail, because sk->sk_family is AF_INET6. With ipv6 will success, not take effect, because inet_csk(sk)->icsk_af_ops is ipv6_mapped and use ip_queue_xmit, inet_sk(sk)->tos. So bpf_get/setsockopt needs add the judgment of this case. Just check "inet_csk(sk)->icsk_af_ops =3D=3D &ipv6_mapped". | Reported-by: kernel test robot | Closes: https://lore.kernel.org/oe-kbuild-all/202408152034.lw9Ilsj6-lkp@i= ntel.com/ Signed-off-by: Feng Zhou --- Changelog: v1->v2: Addressed comments from kernel test robot - Fix compilation error Details in here: https://lore.kernel.org/bpf/202408152058.YXAnhLgZ-lkp@intel.com/T/ include/net/tcp.h | 2 ++ net/core/filter.c | 6 +++++- net/ipv6/tcp_ipv6.c | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 2aac11e7e1cc..ea673f88c900 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -493,6 +493,8 @@ struct request_sock *cookie_tcp_reqsk_alloc(const struc= t request_sock_ops *ops, struct tcp_options_received *tcp_opt, int mss, u32 tsoff); =20 +bool is_tcp_sock_ipv6_mapped(struct sock *sk); + #if IS_ENABLED(CONFIG_BPF) struct bpf_tcp_req_attrs { u32 rcv_tsval; diff --git a/net/core/filter.c b/net/core/filter.c index ecf2ddf633bf..02a825e35c4d 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -5399,7 +5399,11 @@ static int sol_ip_sockopt(struct sock *sk, int optna= me, char *optval, int *optlen, bool getopt) { - if (sk->sk_family !=3D AF_INET) + if (sk->sk_family !=3D AF_INET +#if IS_BUILTIN(CONFIG_IPV6) + && !is_tcp_sock_ipv6_mapped(sk) +#endif + ) return -EINVAL; =20 switch (optname) { diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 200fea92f12f..125c69f1d085 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -92,6 +92,12 @@ static const struct tcp_sock_af_ops tcp_sock_ipv6_mapped= _specific; #define tcp_inet6_sk(sk) (&container_of_const(tcp_sk(sk), \ struct tcp6_sock, tcp)->inet6) =20 +bool is_tcp_sock_ipv6_mapped(struct sock *sk) +{ + return (inet_csk(sk)->icsk_af_ops =3D=3D &ipv6_mapped); +} +EXPORT_SYMBOL_GPL(is_tcp_sock_ipv6_mapped); + static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb) { struct dst_entry *dst =3D skb_dst(skb); --=20 2.30.2