Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6849a3a authored by Yafang Shao's avatar Yafang Shao Committed by David S. Miller
Browse files

net: init sk_cookie for inet socket 



With sk_cookie we can identify a socket, that is very helpful for
traceing and statistic, i.e. tcp tracepiont and ebpf.
So we'd better init it by default for inet socket.
When using it, we just need call atomic64_read(&sk->sk_cookie).

Signed-off-by: default avatarYafang Shao <laoar.shao@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ec8c360a

include/linux/sock_diag.h

+9 −0
Original line number Diff line number Diff line
@@ -25,6 +25,15 @@ void sock_diag_unregister(const struct sock_diag_handler *h); 
void sock_diag_register_inet_compat(int (*fn)(struct sk_buff *skb, struct nlmsghdr *nlh));

void sock_diag_unregister_inet_compat(int (*fn)(struct sk_buff *skb, struct nlmsghdr *nlh));



static inline

void sock_init_cookie(struct sock *sk)

{

	u64 res;



	res = atomic64_inc_return(&sock_net(sk)->cookie_gen);

	atomic64_set(&sk->sk_cookie, res);

}



u64 sock_gen_cookie(struct sock *sk);

int sock_diag_check_cookie(struct sock *sk, const __u32 *cookie);

void sock_diag_save_cookie(struct sock *sk, __u32 *cookie);

net/ipv4/tcp_input.c

+7 −1
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 
#include <linux/errqueue.h>

#include <trace/events/tcp.h>

#include <linux/static_key.h>

#include <linux/sock_diag.h>



int sysctl_tcp_max_orphans __read_mostly = NR_FILE;
@@ -6190,10 +6191,15 @@ struct request_sock *inet_reqsk_alloc(const struct request_sock_ops *ops, 
#if IS_ENABLED(CONFIG_IPV6)

		ireq->pktopts = NULL;

#endif

		atomic64_set(&ireq->ir_cookie, 0);

		ireq->ireq_state = TCP_NEW_SYN_RECV;

		write_pnet(&ireq->ireq_net, sock_net(sk_listener));

		ireq->ireq_family = sk_listener->sk_family;



		BUILD_BUG_ON(offsetof(struct inet_request_sock, ir_cookie) !=

					offsetof(struct sock, sk_cookie));

		BUILD_BUG_ON(offsetof(struct inet_request_sock, ireq_net) !=

					offsetof(struct sock, sk_net));

		sock_init_cookie((struct sock *)ireq);

	}



	return req;