[PATCH bpf-next 07/14] bpf: Embed kernel CONFIG check into the if statement... | netdev

[PATCH bpf-next 00/14] bpf: net: Remove duplicated codes from bpf_setsockopt() · Martin KaFai Lau <hidden> · 2022-07-27
[PATCH bpf-next 01/14] net: Change sock_setsockopt from taking sock ptr to sk ptr · Martin KaFai Lau <hidden> · 2022-07-27
RE: [PATCH bpf-next 01/14] net: Change sock_setsockopt from taking sock ptr to sk ptr · David Laight <hidden> · 2022-07-27
Re: [PATCH bpf-next 01/14] net: Change sock_setsockopt from taking sock ptr to sk ptr · Martin KaFai Lau <hidden> · 2022-07-27
Re: [PATCH bpf-next 01/14] net: Change sock_setsockopt from taking sock ptr to sk ptr · Eric Dumazet <edumazet@google.com> · 2022-07-27
Re: [PATCH bpf-next 01/14] net: Change sock_setsockopt from taking sock ptr to sk ptr · Martin KaFai Lau <hidden> · 2022-07-27
[PATCH bpf-next 02/14] bpf: net: Avoid sock_setsockopt() taking sk lock when called from bpf · Martin KaFai Lau <hidden> · 2022-07-27
RE: [PATCH bpf-next 02/14] bpf: net: Avoid sock_setsockopt() taking sk lock when called from bpf · David Laight <hidden> · 2022-07-27
Re: [PATCH bpf-next 02/14] bpf: net: Avoid sock_setsockopt() taking sk lock when called from bpf · Martin KaFai Lau <hidden> · 2022-07-27
Re: [PATCH bpf-next 02/14] bpf: net: Avoid sock_setsockopt() taking sk lock when called from bpf · <hidden> · 2022-07-27
Re: [PATCH bpf-next 02/14] bpf: net: Avoid sock_setsockopt() taking sk lock when called from bpf · Martin KaFai Lau <hidden> · 2022-07-27
Re: [PATCH bpf-next 02/14] bpf: net: Avoid sock_setsockopt() taking sk lock when called from bpf · Stanislav Fomichev <hidden> · 2022-07-27
Re: [PATCH bpf-next 02/14] bpf: net: Avoid sock_setsockopt() taking sk lock when called from bpf · Martin KaFai Lau <hidden> · 2022-07-27
Re: [PATCH bpf-next 02/14] bpf: net: Avoid sock_setsockopt() taking sk lock when called from bpf · Stanislav Fomichev <hidden> · 2022-07-27
Re: [PATCH bpf-next 02/14] bpf: net: Avoid sock_setsockopt() taking sk lock when called from bpf · Martin KaFai Lau <hidden> · 2022-07-28
Re: [PATCH bpf-next 02/14] bpf: net: Avoid sock_setsockopt() taking sk lock when called from bpf · Jakub Kicinski <kuba@kernel.org> · 2022-07-28
Re: [PATCH bpf-next 02/14] bpf: net: Avoid sock_setsockopt() taking sk lock when called from bpf · Martin KaFai Lau <hidden> · 2022-07-28
Re: [PATCH bpf-next 02/14] bpf: net: Avoid sock_setsockopt() taking sk lock when called from bpf · Jakub Kicinski <kuba@kernel.org> · 2022-07-28
Re: [PATCH bpf-next 02/14] bpf: net: Avoid sock_setsockopt() taking sk lock when called from bpf · Martin KaFai Lau <hidden> · 2022-07-28
Re: [PATCH bpf-next 02/14] bpf: net: Avoid sock_setsockopt() taking sk lock when called from bpf · Jakub Kicinski <kuba@kernel.org> · 2022-07-28
RE: [PATCH bpf-next 02/14] bpf: net: Avoid sock_setsockopt() taking sk lock when called from bpf · David Laight <hidden> · 2022-07-29
Re: [PATCH bpf-next 02/14] bpf: net: Avoid sock_setsockopt() taking sk lock when called from bpf · Martin KaFai Lau <hidden> · 2022-07-29
[PATCH bpf-next 03/14] bpf: net: Consider optval.is_bpf before capable check in sock_setsockopt() · Martin KaFai Lau <hidden> · 2022-07-27
Re: [PATCH bpf-next 03/14] bpf: net: Consider optval.is_bpf before capable check in sock_setsockopt() · <hidden> · 2022-07-27
Re: [PATCH bpf-next 03/14] bpf: net: Consider optval.is_bpf before capable check in sock_setsockopt() · Martin KaFai Lau <hidden> · 2022-07-27
[PATCH bpf-next 04/14] bpf: net: Avoid do_tcp_setsockopt() taking sk lock when called from bpf · Martin KaFai Lau <hidden> · 2022-07-27
[PATCH bpf-next 05/14] bpf: net: Avoid do_ip_setsockopt() taking sk lock when called from bpf · Martin KaFai Lau <hidden> · 2022-07-27
[PATCH bpf-next 06/14] bpf: net: Avoid do_ipv6_setsockopt() taking sk lock when called from bpf · Martin KaFai Lau <hidden> · 2022-07-27
[PATCH bpf-next 07/14] bpf: Embed kernel CONFIG check into the if statement in bpf_setsockopt · Martin KaFai Lau <hidden> · 2022-07-27
[PATCH bpf-next 08/14] bpf: Change bpf_setsockopt(SOL_SOCKET) to reuse sock_setsockopt() · Martin KaFai Lau <hidden> · 2022-07-27
[PATCH bpf-next 09/14] bpf: Refactor bpf specific tcp optnames to a new function · Martin KaFai Lau <hidden> · 2022-07-27
[PATCH bpf-next 10/14] bpf: Change bpf_setsockopt(SOL_TCP) to reuse do_tcp_setsockopt() · Martin KaFai Lau <hidden> · 2022-07-27
[PATCH bpf-next 11/14] bpf: Change bpf_setsockopt(SOL_IP) to reuse do_ip_setsockopt() · Martin KaFai Lau <hidden> · 2022-07-27
[PATCH bpf-next 12/14] bpf: Change bpf_setsockopt(SOL_IPV6) to reuse do_ipv6_setsockopt() · Martin KaFai Lau <hidden> · 2022-07-27
[PATCH bpf-next 13/14] bpf: Add a few optnames to bpf_setsockopt · Martin KaFai Lau <hidden> · 2022-07-27
[PATCH bpf-next 14/14] selftests/bpf: bpf_setsockopt tests · Martin KaFai Lau <hidden> · 2022-07-27
Re: [PATCH bpf-next 00/14] bpf: net: Remove duplicated codes from bpf_setsockopt() · Jakub Kicinski <kuba@kernel.org> · 2022-07-27
Re: [PATCH bpf-next 00/14] bpf: net: Remove duplicated codes from bpf_setsockopt() · Martin KaFai Lau <hidden> · 2022-07-27

STALE1401d

[PATCH bpf-next 07/14] bpf: Embed kernel CONFIG check into the if statement in bpf_setsockopt

From: Martin KaFai Lau <hidden>
Date: 2022-07-27 06:09:55
Also in: bpf
Subsystem: bpf [general] (safe dynamic programs and tools), bpf [networking] (tcx & tc bpf, sock_addr), networking [general], the rest · Maintainers: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, Eduard Zingerman, Kumar Kartikeya Dwivedi, Martin KaFai Lau, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds

This patch moves the "#ifdef CONFIG_XXX" check into the "if/else"
statement itself.  The change is done for the bpf_setsockopt()
function only.  It will make the latter patches easier to follow
without the surrounding ifdef macro.

Signed-off-by: Martin KaFai Lau <redacted>
---
 net/core/filter.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/net/core/filter.c b/net/core/filter.c
index 5669248aff25..01cb4a01b1c1 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c

@@ -5113,8 +5113,7 @@ static int __bpf_setsockopt(struct sock *sk, int level, int optname,
 		default:
 			ret = -EINVAL;
 		}
-#ifdef CONFIG_INET
-	} else if (level == SOL_IP) {
+	} else if (IS_ENABLED(CONFIG_INET) && level == SOL_IP) {
 		if (optlen != sizeof(int) || sk->sk_family != AF_INET)
 			return -EINVAL;

@@ -5135,8 +5134,7 @@ static int __bpf_setsockopt(struct sock *sk, int level, int optname,
 		default:
 			ret = -EINVAL;
 		}
-#if IS_ENABLED(CONFIG_IPV6)
-	} else if (level == SOL_IPV6) {
+	} else if (IS_ENABLED(CONFIG_IPV6) && level == SOL_IPV6) {
 		if (optlen != sizeof(int) || sk->sk_family != AF_INET6)
 			return -EINVAL;

@@ -5157,8 +5155,7 @@ static int __bpf_setsockopt(struct sock *sk, int level, int optname,
 		default:
 			ret = -EINVAL;
 		}
-#endif
-	} else if (level == SOL_TCP &&
+	} else if (IS_ENABLED(CONFIG_INET) && level == SOL_TCP &&
 		   sk->sk_prot->setsockopt == tcp_setsockopt) {
 		if (optname == TCP_CONGESTION) {
 			char name[TCP_CA_NAME_MAX];

@@ -5250,7 +5247,6 @@ static int __bpf_setsockopt(struct sock *sk, int level, int optname,
 				ret = -EINVAL;
 			}
 		}
-#endif
 	} else {
 		ret = -EINVAL;
 	}

-- 
2.30.2

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help