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>
(cherry picked from commit 06e64f9b364abe15c27bf0a7225fcac740819668)

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index 32524f5aedf1bfb44848f5a0e69c09ec68f9862a..fbcd008f2fb05be523719ed2220ad8d2ad4601d3 100644 (file)
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -1097,6 +1097,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.
 
+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
 

diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 97556e459db8998ae921a04856622e8e52009404..27268ee04398f58de89fea1bc9119d5c248c2d42 100644 (file)
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -1443,6 +1443,22 @@ endef
 $(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

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 ac53bd02812bf6f9f40744627223f04922e42382..5c1ce01a2ce93d8d1507bc993cf2fd1aa4e7e8c1 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.
+--- 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.