kernel: modules: add xdp-sockets-diag support

Support for PF_XDP sockets monitoring interface used by the ss tool.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index a770a9d797371dd128fab7cfb4aa7430aebb6bd3..76b0395f3735c690245689777d8c05a5e0979933 100644 (file)
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -1107,6 +1107,12 @@ config KERNEL_NET_L3_MASTER_DEV
          This module provides glue between core networking code and device
          drivers to support L3 master devices like VRF.
 
          This module provides glue between core networking code and device
          drivers to support L3 master devices like VRF.
 

+config KERNEL_XDP_SOCKETS
+       bool "XDP sockets support"
+       help
+         XDP sockets allows a channel between XDP programs and
+         userspace applications.
+

 config KERNEL_WIRELESS_EXT
        def_bool n
 
 config KERNEL_WIRELESS_EXT
        def_bool n
 

diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index cb85c46b78517a8dce1d5545f6d8467da29f6be8..2475828bdeb9ae5f6b35779907b4e91057b3541e 100644 (file)
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -1434,6 +1434,22 @@ endef
 $(eval $(call KernelPackage,inet-diag))
 
 
 $(eval $(call KernelPackage,inet-diag))
 
 

+define KernelPackage/xdp-sockets-diag
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=PF_XDP sockets monitoring interface support for ss utility
+  DEPENDS:=@KERNEL_XDP_SOCKETS
+  KCONFIG:=CONFIG_XDP_SOCKETS_DIAG
+  FILES:=$(LINUX_DIR)/net/xdp/xsk_diag.ko
+  AUTOLOAD:=$(call AutoLoad,31,xsk_diag)
+endef
+
+define KernelPackage/xdp-sockets-diag/description
+ Support for PF_XDP sockets monitoring interface used by the ss tool
+endef
+
+$(eval $(call KernelPackage,xdp-sockets-diag))
+
+

 define KernelPackage/wireguard
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=WireGuard secure network tunnel
 define KernelPackage/wireguard
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=WireGuard secure network tunnel

diff --git a/target/linux/generic/hack-5.15/901-debloat_sock_diag.patch b/target/linux/generic/hack-5.15/901-debloat_sock_diag.patch
index ac502bdd16d6668b1cc898c9fc360a6f4fde5ebd..1f3802aa5b3040427672721c6eb048fb278f38f7 100644 (file)
--- a/target/linux/generic/hack-5.15/901-debloat_sock_diag.patch
+++ b/target/linux/generic/hack-5.15/901-debloat_sock_diag.patch
@@ -160,3 +160,13 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        default n
        help
          Support for UNIX socket monitoring interface used by the ss tool.
        default n
        help
          Support for UNIX socket monitoring interface used by the ss tool.

+--- a/net/xdp/Kconfig
++++ b/net/xdp/Kconfig
+@@ -10,6 +10,7 @@ config XDP_SOCKETS
+ config XDP_SOCKETS_DIAG
+       tristate "XDP sockets: monitoring interface"
+       depends on XDP_SOCKETS
++      select SOCK_DIAG
+       default n
+       help
+         Support for PF_XDP sockets monitoring interface used by the ss tool.

diff --git a/target/linux/generic/hack-6.1/901-debloat_sock_diag.patch b/target/linux/generic/hack-6.1/901-debloat_sock_diag.patch
index 582a48cb182c777032677b29338b87be744380f4..88e2edd289f55d8352cf73966aa9db628c992d2a 100644 (file)
--- a/target/linux/generic/hack-6.1/901-debloat_sock_diag.patch
+++ b/target/linux/generic/hack-6.1/901-debloat_sock_diag.patch
@@ -162,3 +162,13 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        default n
        help
          Support for UNIX socket monitoring interface used by the ss tool.
        default n
        help
          Support for UNIX socket monitoring interface used by the ss tool.

+--- a/net/xdp/Kconfig
++++ b/net/xdp/Kconfig
+@@ -10,6 +10,7 @@ config XDP_SOCKETS
+ config XDP_SOCKETS_DIAG
+       tristate "XDP sockets: monitoring interface"
+       depends on XDP_SOCKETS
++      select SOCK_DIAG
+       default n
+       help
+         Support for PF_XDP sockets monitoring interface used by the ss tool.