From: Geliang Tang <geliang.tang@suse.com>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <martin.lau@linux.dev>,
Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>,
Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>,
Jiri Olsa <jolsa@kernel.org>,
Florent Revest <revest@chromium.org>,
Brendan Jackman <jackmanb@chromium.org>,
Matthieu Baerts <matthieu.baerts@tessares.net>,
Mat Martineau <martineau@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
John Johansen <john.johansen@canonical.com>,
Paul Moore <paul@paul-moore.com>,
James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
Stephen Smalley <stephen.smalley.work@gmail.com>,
Eric Paris <eparis@parisplace.org>,
Mykola Lysenko <mykolal@fb.com>, Shuah Khan <shuah@kernel.org>
Cc: Geliang Tang <geliang.tang@suse.com>,
bpf@vger.kernel.org, netdev@vger.kernel.org,
mptcp@lists.linux.dev, apparmor@lists.ubuntu.com,
linux-security-module@vger.kernel.org, selinux@vger.kernel.org,
linux-kselftest@vger.kernel.org
Subject: [RFC bpf-next v7 1/6] net: socket: add update_socket_protocol hook
Date: Sat, 29 Jul 2023 17:57:22 +0800 [thread overview]
Message-ID: <b6637b9e4345bc906dcc336269e9faa5eafe0786.1690624340.git.geliang.tang@suse.com> (raw)
In-Reply-To: <cover.1690624340.git.geliang.tang@suse.com>
Add a hook named update_socket_protocol in __sys_socket(), for bpf progs
to attach to and update socket protocol. One user case is to force
legacy TCP apps to create and use MPTCP sockets instead of TCP ones.
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
net/socket.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/net/socket.c b/net/socket.c
index 2b0e54b2405c..6837a517ac9f 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -1644,11 +1644,37 @@ struct file *__sys_socket_file(int family, int type, int protocol)
return sock_alloc_file(sock, flags, NULL);
}
+/*
+ * A hook for bpf progs to attach to and update socket protocol.
+ *
+ * A static noinline declaration here could cause the compiler to optimize away
+ * the function. A global noinline declaration will keep the definition, but may
+ * optimize away the callsite. Therefore, __weak is needed to ensure that the
+ * call is still emitted, by telling the compiler that we don't know what the
+ * function might eventually be.
+ *
+ * __diag_* below are needed to dismiss the missing prototype warning.
+ */
+__diag_push();
+__diag_ignore_all("-Wmissing-prototypes",
+ "kfuncs which will be used in BPF programs");
+
+__weak noinline int update_socket_protocol(int family, int type, int protocol)
+{
+ return protocol;
+}
+
+__diag_pop();
+
int __sys_socket(int family, int type, int protocol)
{
struct socket *sock;
int flags;
+ protocol = update_socket_protocol(family, type, protocol);
+ if (protocol < 0 || protocol >= IPPROTO_MAX)
+ return -EINVAL;
+
sock = __sys_socket_create(family, type, protocol);
if (IS_ERR(sock))
return PTR_ERR(sock);
--
2.35.3
next prev parent reply other threads:[~2023-07-29 9:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-29 9:57 [RFC bpf-next v7 0/6] bpf: Force to MPTCP Geliang Tang
2023-07-29 9:57 ` Geliang Tang [this message]
2023-07-29 9:57 ` [RFC bpf-next v7 2/6] bpf: Register mptcp modret set Geliang Tang
2023-07-29 9:57 ` [RFC bpf-next v7 3/6] selftests/bpf: Add mptcpify program Geliang Tang
2023-07-29 9:57 ` [RFC bpf-next v7 4/6] selftests/bpf: use random netns name for mptcp Geliang Tang
2023-07-29 9:57 ` [RFC bpf-next v7 5/6] selftests/bpf: add two mptcp netns helpers Geliang Tang
2023-07-29 9:57 ` [RFC bpf-next v7 6/6] selftests/bpf: Add mptcpify selftest Geliang Tang
2023-08-01 0:43 ` [RFC bpf-next v7 0/6] bpf: Force to MPTCP Alexei Starovoitov
2023-08-02 2:19 ` Geliang Tang
2023-08-02 2:23 ` Alexei Starovoitov
2023-08-03 7:40 ` Matthieu Baerts
2023-08-02 8:03 ` Paolo Abeni
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=b6637b9e4345bc906dcc336269e9faa5eafe0786.1690624340.git.geliang.tang@suse.com \
--to=geliang.tang@suse.com \
--cc=andrii@kernel.org \
--cc=apparmor@lists.ubuntu.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=eparis@parisplace.org \
--cc=haoluo@google.com \
--cc=jackmanb@chromium.org \
--cc=jmorris@namei.org \
--cc=john.fastabend@gmail.com \
--cc=john.johansen@canonical.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=martineau@kernel.org \
--cc=matthieu.baerts@tessares.net \
--cc=mptcp@lists.linux.dev \
--cc=mykolal@fb.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=paul@paul-moore.com \
--cc=revest@chromium.org \
--cc=sdf@google.com \
--cc=selinux@vger.kernel.org \
--cc=serge@hallyn.com \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=stephen.smalley.work@gmail.com \
--cc=yhs@fb.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).