From: Florian Westphal <fw at strlen.de>
To: mptcp at lists.01.org
Subject: [MPTCP] [PATCH mptcp-next 5/9] mptcp: setsockopt: add SO_MARK support
Date: Wed, 17 Mar 2021 17:38:24 +0100 [thread overview]
Message-ID: <20210317163828.27406-6-fw@strlen.de> (raw)
In-Reply-To: 20210317163828.27406-1-fw@strlen.de
[-- Attachment #1: Type: text/plain, Size: 2198 bytes --]
Value is synced to all subflows.
Signed-off-by: Florian Westphal <fw(a)strlen.de>
---
net/mptcp/sockopt.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c
index a78e51ead3ae..face38d5e149 100644
--- a/net/mptcp/sockopt.c
+++ b/net/mptcp/sockopt.c
@@ -35,6 +35,37 @@ static int mptcp_get_int_option(struct mptcp_sock *msk, sockptr_t optval, unsign
return 0;
}
+static int mptcp_so_mark(struct mptcp_sock *msk, int val)
+{
+ sockptr_t optval = KERNEL_SOCKPTR(&val);
+ struct mptcp_subflow_context *subflow;
+ struct sock *sk = (struct sock *)msk;
+ int ret;
+
+ ret = sock_setsockopt(sk->sk_socket, SOL_SOCKET, SO_MARK,
+ optval, sizeof(val));
+ if (ret)
+ return ret;
+
+ lock_sock(sk);
+
+ mptcp_for_each_subflow(msk, subflow) {
+ struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
+ bool slow;
+
+ if (READ_ONCE(ssk->sk_mark) == sk->sk_mark)
+ continue;
+
+ slow = lock_sock_fast(ssk);
+ ssk->sk_mark = sk->sk_mark;
+ sk_dst_reset(ssk);
+ unlock_sock_fast(ssk, slow);
+ }
+
+ release_sock(sk);
+ return 0;
+}
+
static void mptcp_so_keepalive(struct mptcp_sock *msk, int val)
{
struct mptcp_subflow_context *subflow;
@@ -121,6 +152,8 @@ static int mptcp_setsockopt_sol_socket_int(struct mptcp_sock *msk, int optname,
return ret;
switch (optname) {
+ case SO_MARK:
+ return mptcp_so_mark(msk, val);
case SO_KEEPALIVE:
mptcp_so_keepalive(msk, val);
return 0;
@@ -213,6 +246,7 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname,
case SO_SNDBUFFORCE:
case SO_RCVBUF:
case SO_RCVBUFFORCE:
+ case SO_MARK:
return mptcp_setsockopt_sol_socket_int(msk, optname, optval, optlen);
case SO_LINGER:
return mptcp_setsockopt_sol_socket_linger(msk, optval, optlen);
@@ -540,6 +574,12 @@ static void sync_socket_options(struct mptcp_sock *msk, struct sock *ssk)
} else {
sock_reset_flag(ssk, SOCK_LINGER);
}
+
+ if (sk->sk_mark != ssk->sk_mark) {
+ ssk->sk_mark = sk->sk_mark;
+ sk_dst_reset(ssk);
+ }
+
unlock_sock_fast(ssk, slow);
}
--
2.26.2
reply other threads:[~2021-03-17 16:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20210317163828.27406-6-fw@strlen.de \
--to=mptcp@lists.linux.dev \
/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).