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

Commit 24029a36 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sock_diag_destruction_events' 



Craig Gallek says:

====================
Socket destruction events via netlink sock_diag

This series extends the netlink sock_diag interface to broadcast
socket information as they are being destroyed.  The current
interface is poll based and can not be used to retreive information
about sockets that are destroyed between poll intervals.

Only inet sockets are broadcast in this implementation, but other
families could easily be added as needed in the future.

If this patch set is accepted, a follow-up patch to the ss utility
in the iproute2 suite will also be submitted.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 916035dd 35ac838a

include/linux/inet_diag.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ struct inet_diag_handler { 
					  struct inet_diag_msg *r,

					  void *info);

	__u16		idiag_type;

	__u16		idiag_info_size;

};



struct inet_connection_sock;

include/linux/sock_diag.h

+42 −0
Original line number Diff line number Diff line 
#ifndef __SOCK_DIAG_H__

#define __SOCK_DIAG_H__



#include <linux/netlink.h>

#include <linux/user_namespace.h>

#include <net/net_namespace.h>

#include <net/sock.h>

#include <uapi/linux/sock_diag.h>



struct sk_buff;
@@ -11,6 +14,7 @@ struct sock; 
struct sock_diag_handler {

	__u8 family;

	int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);

	int (*get_info)(struct sk_buff *skb, struct sock *sk);

};



int sock_diag_register(const struct sock_diag_handler *h);
@@ -26,4 +30,42 @@ int sock_diag_put_meminfo(struct sock *sk, struct sk_buff *skb, int attr); 
int sock_diag_put_filterinfo(bool may_report_filterinfo, struct sock *sk,

			     struct sk_buff *skb, int attrtype);



static inline

enum sknetlink_groups sock_diag_destroy_group(const struct sock *sk)

{

	switch (sk->sk_family) {

	case AF_INET:

		switch (sk->sk_protocol) {

		case IPPROTO_TCP:

			return SKNLGRP_INET_TCP_DESTROY;

		case IPPROTO_UDP:

			return SKNLGRP_INET_UDP_DESTROY;

		default:

			return SKNLGRP_NONE;

		}

	case AF_INET6:

		switch (sk->sk_protocol) {

		case IPPROTO_TCP:

			return SKNLGRP_INET6_TCP_DESTROY;

		case IPPROTO_UDP:

			return SKNLGRP_INET6_UDP_DESTROY;

		default:

			return SKNLGRP_NONE;

		}

	default:

		return SKNLGRP_NONE;

	}

}



static inline

bool sock_diag_has_destroy_listeners(const struct sock *sk)

{

	const struct net *n = sock_net(sk);

	const enum sknetlink_groups group = sock_diag_destroy_group(sk);



	return group != SKNLGRP_NONE && n->diag_nlsk &&

		netlink_has_listeners(n->diag_nlsk, group);

}

void sock_diag_broadcast_destroy(struct sock *sk);



#endif

include/net/sock.h

+1 −0
Original line number Diff line number Diff line
@@ -1518,6 +1518,7 @@ static inline void unlock_sock_fast(struct sock *sk, bool slow) 
struct sock *sk_alloc(struct net *net, int family, gfp_t priority,

		      struct proto *prot, int kern);

void sk_free(struct sock *sk);

void sk_destruct(struct sock *sk);

struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority);



struct sk_buff *sock_wmalloc(struct sock *sk, unsigned long size, int force,

include/uapi/linux/inet_diag.h

+2 −1
Original line number Diff line number Diff line
@@ -111,9 +111,10 @@ enum { 
	INET_DIAG_SKMEMINFO,

	INET_DIAG_SHUTDOWN,

	INET_DIAG_DCTCPINFO,

	INET_DIAG_PROTOCOL,  /* response attribute only */

};



#define INET_DIAG_MAX INET_DIAG_DCTCPINFO

#define INET_DIAG_MAX INET_DIAG_PROTOCOL



/* INET_DIAG_MEM */

include/uapi/linux/sock_diag.h

+10 −0
Original line number Diff line number Diff line
@@ -23,4 +23,14 @@ enum { 
	SK_MEMINFO_VARS,

};



enum sknetlink_groups {

	SKNLGRP_NONE,

	SKNLGRP_INET_TCP_DESTROY,

	SKNLGRP_INET_UDP_DESTROY,

	SKNLGRP_INET6_TCP_DESTROY,

	SKNLGRP_INET6_UDP_DESTROY,

	__SKNLGRP_MAX,

};

#define SKNLGRP_MAX	(__SKNLGRP_MAX - 1)



#endif /* _UAPI__SOCK_DIAG_H__ */