summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianling Shen <cnsztl@immortalwrt.org>2023-05-23 15:43:14 +0800
committerHauke Mehrtens <hauke@hauke-m.de>2023-07-05 20:02:12 +0200
commit06e64f9b364abe15c27bf0a7225fcac740819668 (patch)
tree42e34a983994b450c29db6e89ef21546bbea0e1c
parent32ed9764462ae04fad5809f857450d4f606ac4c0 (diff)
downloadopenwrt-06e64f9b364abe15c27bf0a7225fcac740819668.tar.gz
openwrt-06e64f9b364abe15c27bf0a7225fcac740819668.tar.bz2
openwrt-06e64f9b364abe15c27bf0a7225fcac740819668.zip
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>
-rw-r--r--config/Config-kernel.in6
-rw-r--r--package/kernel/linux/modules/netsupport.mk16
-rw-r--r--target/linux/generic/hack-5.15/901-debloat_sock_diag.patch10
-rw-r--r--target/linux/generic/hack-6.1/901-debloat_sock_diag.patch10
4 files changed, 42 insertions, 0 deletions
diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index a770a9d797..76b0395f37 100644
--- 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.
+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 cb85c46b78..2475828bde 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -1434,6 +1434,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 ac502bdd16..1f3802aa5b 100644
--- 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.
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 582a48cb18..88e2edd289 100644
--- 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.
+--- 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.