inet_diag: add support for tw_mark
Subsystems (2)
PATCH 1/1 inet_diag: add support for tw_mark
From: Maciej Żenczykowski <[email protected]>
Timewait sockets have included mark since approx 4.18.
--- net/ipv4/inet_diag.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
net/ipv4/inet_diag.c +10 -2
@@ -416,7 +416,7 @@ EXPORT_SYMBOL_GPL(inet_sk_diag_fill);static int inet_twsk_diag_fill (struct sock *sk,struct sk_buff *skb,struct netlink_callback *cb, -u16 nlmsg_flags) +u16 nlmsg_flags,bool net_admin) {struct inet_timewait_sock *tw =inet_twsk (sk);struct inet_diag_msg *r;
@@ -444,6 +444,12 @@ static int inet_twsk_diag_fill(struct sock *sk, r->idiag_uid =0 ; r->idiag_inode =0 ; +if (net_admin &&nla_put_u32 (skb,INET_DIAG_MARK , + tw->tw_mark)) { +nlmsg_cancel (skb, nlh); +return -EMSGSIZE ; + } +nlmsg_end (skb, nlh);return 0 ; }
@@ -494,7 +500,7 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, u16 nlmsg_flags, bool net_admin) {if (sk->sk_state ==TCP_TIME_WAIT ) -return inet_twsk_diag_fill (sk, skb, cb, nlmsg_flags); +return inet_twsk_diag_fill (sk, skb, cb, nlmsg_flags, net_admin);if (sk->sk_state ==TCP_NEW_SYN_RECV )return inet_req_diag_fill (sk, skb, cb, nlmsg_flags, net_admin);
@@ -801,6 +807,8 @@ int inet_diag_bc_sk(const struct nlattr *bc, struct sock *sk) entry.mark = sk->sk_mark; else if (sk->sk_state == TCP_NEW_SYN_RECV) entry.mark = inet_rsk(inet_reqsk(sk))->ir_mark; + else if (sk->sk_state == TCP_TIME_WAIT) + entry.mark = inet_twsk(sk)->tw_mark; else entry.mark = 0;#ifdef CONFIG_SOCK_CGROUP_DATA
Signature · 1 line
2.32.0.272.g935e593368-goog
Quoted 11 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
Timewait sockets have included mark since approx 4.18.
Cc Eric Dumazet <[email protected]>Cc Jon Maxwell <[email protected]>Fixes 00483690552c ("tcp: Add mark for TIMEWAIT sockets")Signed-off-by Maciej Żenczykowski <[email protected]>---
SGTM, thanks Maciej !
Quoted 58 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
Timewait sockets have included mark since approx 4.18.
Cc Eric Dumazet <[email protected]>Cc Jon Maxwell <[email protected]>Fixes 00483690552c ("tcp: Add mark for TIMEWAIT sockets")Signed-off-by Maciej Żenczykowski <[email protected]>--- net/ipv4/inet_diag.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)net/ipv4/inet_diag.c +10
-3@@ -416,7 +416,7 @@ EXPORT_SYMBOL_GPL(inet_sk_diag_fill);static int inet_twsk_diag_fill (struct sock *sk,struct sk_buff *skb,struct netlink_callback *cb, -u16 nlmsg_flags) +u16 nlmsg_flags,bool net_admin) {struct inet_timewait_sock *tw =inet_twsk (sk);struct inet_diag_msg *r;@@ -444,6 +444,12 @@ static int inet_twsk_diag_fill(struct sock *sk, r->idiag_uid =0 ; r->idiag_inode =0 ; +if (net_admin &&nla_put_u32 (skb,INET_DIAG_MARK , + tw->tw_mark)) { +nlmsg_cancel (skb, nlh); +return -EMSGSIZE ; + } +nlmsg_end (skb, nlh);return 0 ; }@@ -494,7 +500,7 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, u16 nlmsg_flags, bool net_admin) {if (sk->sk_state ==TCP_TIME_WAIT ) -return inet_twsk_diag_fill (sk, skb, cb, nlmsg_flags); +return inet_twsk_diag_fill (sk, skb, cb, nlmsg_flags, net_admin);if (sk->sk_state ==TCP_NEW_SYN_RECV )return inet_req_diag_fill (sk, skb, cb, nlmsg_flags, net_admin);@@ -801,6 +807,8 @@ int inet_diag_bc_sk(const struct nlattr *bc, struct sock *sk) entry.mark = sk->sk_mark; else if (sk->sk_state == TCP_NEW_SYN_RECV) entry.mark = inet_rsk(inet_reqsk(sk))->ir_mark; + else if (sk->sk_state == TCP_TIME_WAIT) + entry.mark = inet_twsk(sk)->tw_mark; else entry.mark = 0;#ifdef CONFIG_SOCK_CGROUP_DATA --
Quoted 2 lines
2.32.0.272.g935e593368-goog
Thanks for adding that to the inet_diag module.
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 10 lines · On Tue, 15 Jun 2021 23:06:04 -0700 you wrote:
From: Maciej Żenczykowski <[email protected]>
Timewait sockets have included mark since approx 4.18.
Cc Eric Dumazet <[email protected]>Cc Jon Maxwell <[email protected]>Fixes 00483690552c ("tcp: Add mark for TIMEWAIT sockets")Signed-off-by Maciej Żenczykowski <[email protected]>[...]
Here is the summary with links:
- inet_diag: add support for tw_mark
https://git.kernel.org/netdev/net-next/c/1b3fc771769c
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html