From patchwork Sat Sep 14 10:32:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Zhou X-Patchwork-Id: 13804349 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 A23181CEE87 for ; Sat, 14 Sep 2024 10:32:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726309970; cv=none; b=mY+QwRe1YFCOxB9Za1SJrGaHBDOiI3oQTHPhzp0m1k6uApmPols5RlPXAUuGK90pWTGOpAFn9CWhahOCGHVGIl9PSQxTeaw70vov4APhFmFWLEp7jWGOqcWh5tA/2NaIykOCJZMJzNCTVAT9MXWV74YfZ/O12XJDAaJPppNfVpg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726309970; c=relaxed/simple; bh=s8DsojteGWQbIibiQeeN+V7NoCWk/i240ms0OBizBQ8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KatOIR24CHD/0XvkYvJaWgSYviKEGjReBqGcLoZRX0z0/sde9bw4Lc/AbJqWGoIpVFYVt47OAiT9ogmyTbJkZHl8skd6TfoyCVZej7h4ml/7fbggZ5o/Hyt3cKInYflvROAyqtde4s3+rKXoU78dO38QFLxOgB2juzV2cs7jnRk= 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=EK7LQ/Is; arc=none smtp.client-ip=209.85.210.179 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="EK7LQ/Is" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-718e6299191so1738555b3a.2 for ; Sat, 14 Sep 2024 03:32:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1726309968; x=1726914768; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NjQqPR/O4cbkW/hD684XD91wFosDYzncY6/VLXc3j6E=; b=EK7LQ/IsdjLG9d2TMkz8SfAv2K5yE9ioe5VbSQF8+DBgw8FKj28CpsAtJUh7W50Ezf mZyRcNhHMSLpbOhBiCq0F7bkIzQqp/SIEyAooSFgBuOWmTl16WLzEOf1W4v5im31g8rG Xll4+71pNd45RcIO6UTQ3lblh7OjGCaGWq3MQ0HMkd5JL0csxtKOlT92AEJi2ltsZ1+2 TSN7+Ie2zLF/BheM8brRcF5HtF/RxfPqu/5aGxKNWql8j2RBKSYtB8S1BNp19I5zZ8EV Sz6WH4Jl0ejC3YUAHvwWxogPl5Wnk0Cavy5cOhjTvHudDmgoLAmR99bQnnaJGnt1//Do bGpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726309968; x=1726914768; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NjQqPR/O4cbkW/hD684XD91wFosDYzncY6/VLXc3j6E=; b=nowh9xnMx3po3eqi+YrIxfdFaTYDyVUgnhq3BaS/YJH+8xn5uDpZiLXT00bDG/xg5h TE11nSpdlYL1hMeWZs7okQei5+ivYwf8vxEBs6SgqVbQNlPcFr/QBCfNz/OM0ZopRNZ8 kQ3zp4sdVh7IoqcjWwwcxZJwHqpa/+vr6pYZrywM8OwGWcFNnSg65yvTkoU2h5sZSDUv /YxNF0RKqeN3Qp2lPR0abpRs/8w3Ww9V1/kGtvBRkzJZJhDChbXC880j+5R+PaWKQ5ji iXzBKWnwngE8s08UGMSULF2y+5GzzMPlXjxZWiAnXFBMQSlIuLebRvQ9JzZPr1pOyQyG 2+gQ== X-Forwarded-Encrypted: i=1; AJvYcCVkXEcFp292/0Rri/v7ZuLKe+hmmASlh2iVeSzz+FnrmF4vpdpGstWH18oOh7hbbYAxaF/48P3hffU633kXqC4=@vger.kernel.org X-Gm-Message-State: AOJu0YwD5gF/n31PHsaszH2DTlMnOjM6wcOGdWODm3+iaUhuC22CFZlA vLPz9lGL3WAWyXwa5dqDIaxIllgf9W9PSpRip1JU4m9YNEqQ8X8/9wzNsv8jpKM= X-Google-Smtp-Source: AGHT+IE3UauTZ/385KdWRCwcFSIlvJxIZ90AhgKMFaRWwNdUkCqO1ooNd68vWpjxwmGHl3ODnkxKfg== X-Received: by 2002:a05:6a20:c916:b0:1d0:45c2:8140 with SMTP id adf61e73a8af0-1d045c2821fmr12659050637.18.1726309967883; Sat, 14 Sep 2024 03:32:47 -0700 (PDT) Received: from C02F52LSML85.bytedance.net ([203.208.167.149]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71944ab50cbsm788332b3a.53.2024.09.14.03.32.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Sep 2024 03:32:47 -0700 (PDT) From: Feng zhou To: 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, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mykolal@fb.com, shuah@kernel.org, alan.maguire@oracle.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, yangzhenze@bytedance.com, wangdongdong.6@bytedance.com, zhoufeng.zf@bytedance.com Subject: [PATCH bpf-next v3 1/2] bpf: Fix bpf_get/setsockopt to tos not take effect when TCP over IPv4 via INET6 API Date: Sat, 14 Sep 2024 18:32:25 +0800 Message-Id: <20240914103226.71109-2-zhoufeng.zf@bytedance.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240914103226.71109-1-zhoufeng.zf@bytedance.com> References: <20240914103226.71109-1-zhoufeng.zf@bytedance.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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. Bpf_get/setsockopt use sk_is_inet() helper to fix this case. Signed-off-by: Feng Zhou Reviewed-by: Eric Dumazet --- net/core/filter.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/core/filter.c b/net/core/filter.c index e4a4454df5f9..90f4dbb8d2b5 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -5399,7 +5399,12 @@ static int sol_ip_sockopt(struct sock *sk, int optname, char *optval, int *optlen, bool getopt) { - if (sk->sk_family != AF_INET) + + /* + * SOL_IP socket options are available on AF_INET and AF_INET6, for + * example, TCP over IPv4 via INET6 API. + */ + if (!sk_is_inet(sk)) return -EINVAL; switch (optname) {