From: Alexei Starovoitov Date: Mon, 15 Jun 2026 00:38:55 +0000 (-0700) Subject: Merge branch 'bpf-fix-bpf_get-setsockopt-to-tos-for-ipv4-mapped-ipv6-socket' X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c79536c8146951cdad31cbced25d8e6bd1cad6c1;p=thirdparty%2Flinux.git Merge branch 'bpf-fix-bpf_get-setsockopt-to-tos-for-ipv4-mapped-ipv6-socket' Leon Hwang says: ==================== bpf: Fix bpf_get/setsockopt to tos for ipv4-mapped ipv6 socket When TCP over IPv4 via INET6 API, sk->sk_family is AF_INET6, but it is a v4 pkt. inet_csk(sk)->icsk_af_ops is ipv6_mapped and use ip_queue_xmit. The tos sockopt does not work for bpf [get,set]sockopt() helpers. Changelog: v3 -> v4: * Add 'sk->sk_type != SOCK_RAW && !ipv6_only_sock(sk)' check. * Re-implement test with LLM assistance. * v3: https://lore.kernel.org/all/20240914103226.71109-1-zhoufeng.zf@bytedance.com/ v2->v3: * Use sk_is_inet() helper. (Eric Dumazet) * https://lore.kernel.org/bpf/CANn89i+9GmBLCdgsfH=WWe-tyFYpiO27wONyxaxiU6aOBC6G8g@mail.gmail.com/T/ v1->v2: * Fix compilation error. (kernel test robot) * https://lore.kernel.org/bpf/202408152058.YXAnhLgZ-lkp@intel.com/T/ ==================== Link: https://patch.msgid.link/20260613162443.60515-1-leon.hwang@linux.dev Signed-off-by: Alexei Starovoitov --- c79536c8146951cdad31cbced25d8e6bd1cad6c1