[PATCH] kernel: set CONFIG_RCU_FANOUT=64 for 64bit targets

2021-07-30 Thread Stijn Tintel
The generic config has CONFIG_RCU_EXPERT=y, which exposes
CONFIG_RCU_FANOUT. This is set to 32 in the generic config, but the
default for 64bit kernels is 64. This causes a warning during boot:

[0.00] rcu: CONFIG_RCU_FANOUT set to non-default value of 32.

Set CONFIG_RCU_FANOUT=64 in kernel configs of 64bit targets, unless the
target config has disabled CONFIG_RCU_EXPERT.

Signed-off-by: Stijn Tintel 
---
 target/linux/armvirt/64/config-5.10  | 1 +
 target/linux/armvirt/64/config-5.4   | 1 +
 target/linux/bcm27xx/bcm2710/config-5.4  | 1 +
 target/linux/bcm27xx/bcm2711/config-5.4  | 1 +
 target/linux/bcm4908/config-5.4  | 1 +
 target/linux/malta/be64/config-default   | 1 +
 target/linux/malta/le64/config-default   | 1 +
 target/linux/mediatek/mt7622/config-5.10 | 1 +
 target/linux/mvebu/cortexa53/config-5.10 | 1 +
 target/linux/mvebu/cortexa53/config-5.4  | 1 +
 target/linux/mvebu/cortexa72/config-5.10 | 1 +
 target/linux/mvebu/cortexa72/config-5.4  | 1 +
 target/linux/octeon/config-5.10  | 1 +
 target/linux/octeon/config-5.4   | 1 +
 target/linux/octeontx/config-5.4 | 1 +
 target/linux/sunxi/cortexa53/config-5.4  | 1 +
 target/linux/uml/config/x86_64   | 1 +
 target/linux/x86/64/config-5.10  | 1 +
 target/linux/x86/64/config-5.4   | 1 +
 19 files changed, 19 insertions(+)

diff --git a/target/linux/armvirt/64/config-5.10 
b/target/linux/armvirt/64/config-5.10
index 51f3c3c952..7cd542fc81 100644
--- a/target/linux/armvirt/64/config-5.10
+++ b/target/linux/armvirt/64/config-5.10
@@ -130,6 +130,7 @@ CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
+CONFIG_RCU_FANOUT=64
 CONFIG_REGMAP=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
diff --git a/target/linux/armvirt/64/config-5.4 
b/target/linux/armvirt/64/config-5.4
index 2317dcd39d..464c7bfaa3 100644
--- a/target/linux/armvirt/64/config-5.4
+++ b/target/linux/armvirt/64/config-5.4
@@ -134,6 +134,7 @@ CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
+CONFIG_RCU_FANOUT=64
 CONFIG_REGMAP=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
diff --git a/target/linux/bcm27xx/bcm2710/config-5.4 
b/target/linux/bcm27xx/bcm2710/config-5.4
index 27884a0567..b0718a5f8d 100644
--- a/target/linux/bcm27xx/bcm2710/config-5.4
+++ b/target/linux/bcm27xx/bcm2710/config-5.4
@@ -364,6 +364,7 @@ CONFIG_RASPBERRYPI_POWER=y
 CONFIG_RATIONAL=y
 # CONFIG_RAVE_SP_CORE is not set
 CONFIG_RAW_DRIVER=y
+CONFIG_RCU_FANOUT=64
 CONFIG_RCU_NEED_SEGCBLIST=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_REFCOUNT_FULL=y
diff --git a/target/linux/bcm27xx/bcm2711/config-5.4 
b/target/linux/bcm27xx/bcm2711/config-5.4
index c82ae44942..40af97965f 100644
--- a/target/linux/bcm27xx/bcm2711/config-5.4
+++ b/target/linux/bcm27xx/bcm2711/config-5.4
@@ -376,6 +376,7 @@ CONFIG_RASPBERRYPI_POWER=y
 CONFIG_RATIONAL=y
 # CONFIG_RAVE_SP_CORE is not set
 CONFIG_RAW_DRIVER=y
+CONFIG_RCU_FANOUT=64
 CONFIG_RCU_NEED_SEGCBLIST=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_REFCOUNT_FULL=y
diff --git a/target/linux/bcm4908/config-5.4 b/target/linux/bcm4908/config-5.4
index 6f43a822c8..9076ae8cc2 100644
--- a/target/linux/bcm4908/config-5.4
+++ b/target/linux/bcm4908/config-5.4
@@ -183,6 +183,7 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
 CONFIG_RATIONAL=y
+CONFIG_RCU_FANOUT=64
 CONFIG_RCU_NEED_SEGCBLIST=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_REFCOUNT_FULL=y
diff --git a/target/linux/malta/be64/config-default 
b/target/linux/malta/be64/config-default
index ef044bb8ca..7d22120c14 100644
--- a/target/linux/malta/be64/config-default
+++ b/target/linux/malta/be64/config-default
@@ -7,3 +7,4 @@ CONFIG_CPU_MIPS64_R2=y
 # CONFIG_MIPS32_N32 is not set
 # CONFIG_MIPS32_O32 is not set
 # CONFIG_MIPS_VA_BITS_48 is not set
+CONFIG_RCU_FANOUT=64
diff --git a/target/linux/malta/le64/config-default 
b/target/linux/malta/le64/config-default
index 69e5387a1f..72ed33365f 100644
--- a/target/linux/malta/le64/config-default
+++ b/target/linux/malta/le64/config-default
@@ -6,3 +6,4 @@ CONFIG_CPU_MIPS64_R2=y
 # CONFIG_MIPS32_N32 is not set
 # CONFIG_MIPS32_O32 is not set
 # CONFIG_MIPS_VA_BITS_48 is not set
+CONFIG_RCU_FANOUT=64
diff --git a/target/linux/mediatek/mt7622/config-5.10 
b/target/linux/mediatek/mt7622/config-5.10
index caf0293f41..9d039212b0 100644
--- a/target/linux/mediatek/mt7622/config-5.10
+++ b/target/linux/mediatek/mt7622/config-5.10
@@ -368,6 +368,7 @@ CONFIG_QUEUED_SPINLOCKS=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
 # CONFIG_RAVE_SP_CORE is not set
+CONFIG_RCU_FANOUT=64
 CONFIG_RCU_NEED_SEGCBLIST=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_REALTEK_PHY=y
diff --git a/target/linux/mvebu/cortexa53/config-5.10 
b/target/linux/mvebu/cortexa53/config-5.10
index 24f26474bc..6b343d4658 100644
--- a/target/linux/mvebu/cortexa53/config-5.10
+++ b/target/linux/mvebu/cortexa53/config-5.10
@@ -66,6 +66,7 @@ 

[PATCH] kernel: kmod-xfrm-interface requires IPv6

2021-07-30 Thread Stijn Tintel
The xfrm_interface module will not be built if IPv6 is not enabled in
the kernel. Add this dependency in the kmod package to avoid people
wondering why it doesn't build when they disabled IPv6.

Signed-off-by: Stijn Tintel 
---
 package/kernel/linux/modules/netsupport.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kernel/linux/modules/netsupport.mk 
b/package/kernel/linux/modules/netsupport.mk
index 1eec9f9b63..62d79db51e 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -375,7 +375,7 @@ $(eval $(call KernelPackage,ip6-vti))
 define KernelPackage/xfrm-interface
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec XFRM Interface
-  DEPENDS:=+kmod-ipsec4 +IPV6:kmod-ipsec6
+  DEPENDS:=@IPV6 +kmod-ipsec4 +kmod-ipsec6
   KCONFIG:=CONFIG_XFRM_INTERFACE
   FILES:=$(LINUX_DIR)/net/xfrm/xfrm_interface.ko
   AUTOLOAD:=$(call AutoProbe,xfrm_interface)
-- 
2.31.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[PATCH] iwinfo: add missing CIPHER_NAMES and KMGMT_NAMES

2021-07-30 Thread Jianhui Zhao
Signed-off-by: Jianhui Zhao 
---
 iwinfo_lib.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/iwinfo_lib.c b/iwinfo_lib.c
index 70b080c..7fa8133 100644
--- a/iwinfo_lib.c
+++ b/iwinfo_lib.c
@@ -31,12 +31,15 @@ const char *IWINFO_CIPHER_NAMES[] = {
"WEP104",
"AES-OCB",
"CKIP",
+   "GCMP"
 };
 
 const char *IWINFO_KMGMT_NAMES[] = {
"NONE",
"802.1X",
"PSK",
+   "SAE",
+   "OWE"
 };
 
 const char *IWINFO_AUTH_NAMES[] = {
-- 
2.25.1


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


Re: dnsmasq ujail fs problem

2021-07-30 Thread Daniel Golle
On Fri, Jul 30, 2021 at 01:28:17PM +0200, e9hack wrote:
> Hi,
> 
> I'm using dnsmasq together with ujail. Since some time, I got an error 
> message in the log:
> 
> Fri Jul 30 13:05:10 2021 kern.warn kernel: [ 3149.592061] ext4 filesystem 
> being remounted at /tmp/ujail-NOnHik/tmp/dhcp.leases supports timestamps 
> until 2038 (0x7fff)
> Fri Jul 30 13:05:10 2021 user.err : jail: 
> creat(/tmp/ujail-NOnHik/tmp/hosts/dhcp) failed: Read-only file system
> Fri Jul 30 13:05:10 2021 kern.warn kernel: [ 3149.631741] ext4 filesystem 
> being remounted at /tmp/ujail-NOnHik/var/run/dnsmasq supports timestamps 
> until 2038 (0x7fff)
> Fri Jul 30 13:05:10 2021 kern.warn kernel: [ 3149.668281] ext4 filesystem 
> being remounted at /tmp/ujail-NOnHik/var/run/ubus/ubus.sock supports 
> timestamps until 2038 (0x7fff)
> 
> The file /tmp/hosts/dhcp does exist and since dhcp does work, this file is 
> used by dnsmasq.
> 
> This are the procd_add_jail_mount and procd_add_jail_mount_rw commands:
> 
> Fri Jul 30 13:05:07 2021 user.notice [DNSMASQ:19539]: procd_add_jail_mount 
> /var/etc/dnsmasq.conf /etc/dnsmasq.conf /etc/config/dhcp.dnsmasq 
> /usr/share/dnsmasq/trust-anchors.conf 
> /usr/share/dnsmasq/dhcpbogushostname.conf /usr/share/dnsmasq/rfc6761.conf 
> /tmp/hosts/dhcp /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom 
> /tmp/dnsmasq.d   /etc/hosts /etc/ethers /sbin/hotplug-call  
> /usr/lib/dnsmasq/dhcp-script.sh /tmp/hosts/
> Fri Jul 30 13:05:07 2021 user.notice [DNSMASQ:19539]: procd_add_jail_mount_rw 
> /var/run/dnsmasq/ /tmp/dhcp.leases
> 
> Any idea what triggers the error?

This is because /tmp/hosts/dhcp tries being mounted at /tmp/hosts which
already is a read-only mount. I guess mounting /tmp/hosts/dhcp became
unneeded now that /tmp/hosts is in the list already.

> 
> Regards,
> Hartmut
> 
> 
> 
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


dnsmasq ujail fs problem

2021-07-30 Thread e9hack

Hi,

I'm using dnsmasq together with ujail. Since some time, I got an error message 
in the log:

Fri Jul 30 13:05:10 2021 kern.warn kernel: [ 3149.592061] ext4 filesystem being 
remounted at /tmp/ujail-NOnHik/tmp/dhcp.leases supports timestamps until 2038 
(0x7fff)
Fri Jul 30 13:05:10 2021 user.err : jail: 
creat(/tmp/ujail-NOnHik/tmp/hosts/dhcp) failed: Read-only file system
Fri Jul 30 13:05:10 2021 kern.warn kernel: [ 3149.631741] ext4 filesystem being 
remounted at /tmp/ujail-NOnHik/var/run/dnsmasq supports timestamps until 2038 
(0x7fff)
Fri Jul 30 13:05:10 2021 kern.warn kernel: [ 3149.668281] ext4 filesystem being 
remounted at /tmp/ujail-NOnHik/var/run/ubus/ubus.sock supports timestamps until 
2038 (0x7fff)

The file /tmp/hosts/dhcp does exist and since dhcp does work, this file is used 
by dnsmasq.

This are the procd_add_jail_mount and procd_add_jail_mount_rw commands:

Fri Jul 30 13:05:07 2021 user.notice [DNSMASQ:19539]: procd_add_jail_mount 
/var/etc/dnsmasq.conf /etc/dnsmasq.conf /etc/config/dhcp.dnsmasq 
/usr/share/dnsmasq/trust-anchors.conf /usr/share/dnsmasq/dhcpbogushostname.conf 
/usr/share/dnsmasq/rfc6761.conf /tmp/hosts/dhcp /etc/passwd /etc/group /etc/TZ 
/dev/null /dev/urandom /tmp/dnsmasq.d   /etc/hosts /etc/ethers 
/sbin/hotplug-call  /usr/lib/dnsmasq/dhcp-script.sh /tmp/hosts/
Fri Jul 30 13:05:07 2021 user.notice [DNSMASQ:19539]: procd_add_jail_mount_rw 
/var/run/dnsmasq/ /tmp/dhcp.leases

Any idea what triggers the error?

Regards,
Hartmut



___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel