From: Neal Cardwell <ncardwell.kernel@gmail.com>
To: Alexei Starovoitov <ast@kernel.org>
Cc: netdev@vger.kernel.org, Neal Cardwell <ncardwell@google.com>,
Yuchung Cheng <ycheng@google.com>, Kevin Yang <yyd@google.com>,
Eric Dumazet <edumazet@google.com>,
Lawrence Brakmo <brakmo@fb.com>
Subject: [PATCH bpf-next v3 4/5] tcp: simplify _bpf_setsockopt(): remove flags argument
Date: Thu, 10 Sep 2020 15:35:35 -0400 [thread overview]
Message-ID: <20200910193536.2980613-5-ncardwell.kernel@gmail.com> (raw)
In-Reply-To: <20200910193536.2980613-1-ncardwell.kernel@gmail.com>
From: Neal Cardwell <ncardwell@google.com>
Now that the previous patches have removed the code that uses the
flags argument to _bpf_setsockopt(), we can remove that argument.
Signed-off-by: Neal Cardwell <ncardwell@google.com>
Acked-by: Yuchung Cheng <ycheng@google.com>
Acked-by: Kevin Yang <yyd@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Lawrence Brakmo <brakmo@fb.com>
---
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 e89d6d7da03c..d266c6941967 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -4314,7 +4314,7 @@ static const struct bpf_func_proto bpf_get_socket_uid_proto = {
};
static int _bpf_setsockopt(struct sock *sk, int level, int optname,
- char *optval, int optlen, u32 flags)
+ char *optval, int optlen)
{
char devname[IFNAMSIZ];
int val, valbool;
@@ -4611,9 +4611,7 @@ static int _bpf_getsockopt(struct sock *sk, int level, int optname,
BPF_CALL_5(bpf_sock_addr_setsockopt, struct bpf_sock_addr_kern *, ctx,
int, level, int, optname, char *, optval, int, optlen)
{
- u32 flags = 0;
- return _bpf_setsockopt(ctx->sk, level, optname, optval, optlen,
- flags);
+ return _bpf_setsockopt(ctx->sk, level, optname, optval, optlen);
}
static const struct bpf_func_proto bpf_sock_addr_setsockopt_proto = {
@@ -4647,9 +4645,7 @@ static const struct bpf_func_proto bpf_sock_addr_getsockopt_proto = {
BPF_CALL_5(bpf_sock_ops_setsockopt, struct bpf_sock_ops_kern *, bpf_sock,
int, level, int, optname, char *, optval, int, optlen)
{
- u32 flags = 0;
- return _bpf_setsockopt(bpf_sock->sk, level, optname, optval, optlen,
- flags);
+ return _bpf_setsockopt(bpf_sock->sk, level, optname, optval, optlen);
}
static const struct bpf_func_proto bpf_sock_ops_setsockopt_proto = {
--
2.28.0.618.gf4bc123cb7-goog
next prev parent reply other threads:[~2020-09-10 19:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-10 19:35 [PATCH bpf-next v3 0/5] tcp: increase flexibility of EBPF congestion control initialization Neal Cardwell
2020-09-10 19:35 ` [PATCH bpf-next v3 1/5] tcp: only init congestion control if not initialized already Neal Cardwell
2020-09-10 19:35 ` [PATCH bpf-next v3 2/5] tcp: simplify EBPF TCP_CONGESTION to always init CC Neal Cardwell
2020-09-10 19:35 ` [PATCH bpf-next v3 3/5] tcp: simplify tcp_set_congestion_control(): always reinitialize Neal Cardwell
2020-09-10 19:35 ` Neal Cardwell [this message]
2020-09-10 19:35 ` [PATCH bpf-next v3 5/5] tcp: simplify tcp_set_congestion_control() load=false case Neal Cardwell
2020-09-11 3:28 ` [PATCH bpf-next v3 0/5] tcp: increase flexibility of EBPF congestion control initialization Martin KaFai Lau
2020-09-11 4:20 ` Alexei Starovoitov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200910193536.2980613-5-ncardwell.kernel@gmail.com \
--to=ncardwell.kernel@gmail.com \
--cc=ast@kernel.org \
--cc=brakmo@fb.com \
--cc=edumazet@google.com \
--cc=ncardwell@google.com \
--cc=netdev@vger.kernel.org \
--cc=ycheng@google.com \
--cc=yyd@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).