From eaaa31392690c7609f7afeec5ba38a79d009842d Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Thu, 21 Mar 2013 20:33:48 +0400 Subject: netlink: Diag core and basic socket info dumping (v2) The netlink_diag can be built as a module, just like it's done in unix sockets. The core dumping message carries the basic info about netlink sockets: family, type and protocol, portis, dst_group, dst_portid, state. Groups can be received as an optional parameter NETLINK_DIAG_GROUPS. Netlink sockets cab be filtered by protocols. The socket inode number and cookie is reserved for future per-socket info retrieving. The per-protocol filtering is also reserved for future by requiring the sdiag_protocol to be zero. The file /proc/net/netlink doesn't provide enough information for dumping netlink sockets. It doesn't provide dst_group, dst_portid, groups above 32. v2: fix NETLINK_DIAG_MAX. Now it's equal to the last constant. Acked-by: Pavel Emelyanov Cc: "David S. Miller" Cc: Eric Dumazet Cc: Pablo Neira Ayuso Cc: "Eric W. Biederman" Cc: Gao feng Cc: Thomas Graf Signed-off-by: Andrey Vagin Signed-off-by: David S. Miller --- net/netlink/Kconfig | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 net/netlink/Kconfig (limited to 'net/netlink/Kconfig') diff --git a/net/netlink/Kconfig b/net/netlink/Kconfig new file mode 100644 index 000000000000..5d6e8c05b3d4 --- /dev/null +++ b/net/netlink/Kconfig @@ -0,0 +1,10 @@ +# +# Netlink Sockets +# + +config NETLINK_DIAG + tristate "NETLINK: socket monitoring interface" + default n + ---help--- + Support for NETLINK socket monitoring interface used by the ss tool. + If unsure, say Y. -- cgit v1.2.3 From ee1bec9b3b49ea05e97ef40a3d38b70628cb947a Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Wed, 1 May 2013 01:37:20 +0000 Subject: netlink: kconfig: move mmap i/o into netlink kconfig Currently, in menuconfig, Netlink's new mmaped IO is the very first entry under the ``Networking support'' item and comes even before ``Networking options'': [ ] Netlink: mmaped IO Networking options ---> ... Lets move this into ``Networking options'' under netlink's Kconfig, since this might be more appropriate. Introduced by commit ccdfcc398 (``netlink: mmaped netlink: ring setup''). Signed-off-by: Daniel Borkmann Signed-off-by: David S. Miller --- net/Kconfig | 9 --------- net/netlink/Kconfig | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'net/netlink/Kconfig') diff --git a/net/Kconfig b/net/Kconfig index 1a2221630e6a..2ddc9046868e 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -23,15 +23,6 @@ menuconfig NET if NET -config NETLINK_MMAP - bool "Netlink: mmaped IO" - help - This option enables support for memory mapped netlink IO. This - reduces overhead by avoiding copying data between kernel- and - userspace. - - If unsure, say N. - config WANT_COMPAT_NETLINK_MESSAGES bool help diff --git a/net/netlink/Kconfig b/net/netlink/Kconfig index 5d6e8c05b3d4..2c5e95e9bfbd 100644 --- a/net/netlink/Kconfig +++ b/net/netlink/Kconfig @@ -2,6 +2,15 @@ # Netlink Sockets # +config NETLINK_MMAP + bool "NETLINK: mmaped IO" + ---help--- + This option enables support for memory mapped netlink IO. This + reduces overhead by avoiding copying data between kernel- and + userspace. + + If unsure, say N. + config NETLINK_DIAG tristate "NETLINK: socket monitoring interface" default n -- cgit v1.2.3