bcm53xx: refactor packet steering init
authorRafał Miłecki <rafal@milecki.pl>
Mon, 13 Feb 2023 09:32:45 +0000 (10:32 +0100)
committerRafał Miłecki <rafal@milecki.pl>
Wed, 15 Feb 2023 13:25:57 +0000 (14:25 +0100)
Replace a standalone init.d script with a platform implementation as
supported by netifd. This avoids a race between netifd and target
specific setups.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
target/linux/bcm53xx/base-files/etc/init.d/fastnetwork [deleted file]
target/linux/bcm53xx/base-files/usr/libexec/platform/packet-steering.sh [new file with mode: 0755]

diff --git a/target/linux/bcm53xx/base-files/etc/init.d/fastnetwork b/target/linux/bcm53xx/base-files/etc/init.d/fastnetwork
deleted file mode 100755 (executable)
index 1999d13..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=25
-USE_PROCD=1
-
-start_service() {
-       reload_service
-}
-
-service_triggers() {
-       procd_add_reload_trigger "network"
-       procd_add_reload_trigger "firewall"
-       procd_add_reload_interface_trigger "lan"
-}
-
-reload_service() {
-       local packet_steering="$(uci -q get network.@globals[0].packet_steering)"
-       local num_cpus="$(grep -c "^processor.*:" /proc/cpuinfo)"
-       local flow_offloading="$(uci -q get firewall.@defaults[0].flow_offloading)"
-       local flow_offloading_hw="$(uci -q get firewall.@defaults[0].flow_offloading_hw)"
-
-       # Any steering on 1 CPU (BCM47081) worsens network performance
-       [ "$num_cpus" != 2 ] && return
-
-       [ "$packet_steering" != 1 ] && {
-               echo 0 > /sys/class/net/br-lan/queues/rx-0/rps_cpus
-               echo 0 > /sys/class/net/eth0/queues/rx-0/rps_cpus
-               return
-       }
-
-       if [ ${flow_offloading_hw:-0} -gt 0 ]; then
-               # HW offloading
-               echo 0 > /sys/class/net/br-lan/queues/rx-0/rps_cpus
-               echo 0 > /sys/class/net/eth0/queues/rx-0/rps_cpus
-       elif [ ${flow_offloading:-0} -gt 0 ]; then
-               # SW offloading
-               # br-lan setup doesn't seem to matter for offloading case
-               echo 2 > /sys/class/net/eth0/queues/rx-0/rps_cpus
-       else
-               # Default
-               echo 2 > /sys/class/net/br-lan/queues/rx-0/rps_cpus
-               echo 0 > /sys/class/net/eth0/queues/rx-0/rps_cpus
-       fi
-}
diff --git a/target/linux/bcm53xx/base-files/usr/libexec/platform/packet-steering.sh b/target/linux/bcm53xx/base-files/usr/libexec/platform/packet-steering.sh
new file mode 100755 (executable)
index 0000000..dacd1ad
--- /dev/null
@@ -0,0 +1,25 @@
+#!/bin/sh /etc/rc.common
+
+packet_steering="$(uci -q get network.@globals[0].packet_steering)"
+flow_offloading="$(uci -q get firewall.@defaults[0].flow_offloading)"
+flow_offloading_hw="$(uci -q get firewall.@defaults[0].flow_offloading_hw)"
+
+[ "$packet_steering" != 1 ] && {
+       echo 0 > /sys/class/net/br-lan/queues/rx-0/rps_cpus
+       echo 0 > /sys/class/net/eth0/queues/rx-0/rps_cpus
+       exit 0
+}
+
+if [ ${flow_offloading_hw:-0} -gt 0 ]; then
+       # HW offloading
+       echo 0 > /sys/class/net/br-lan/queues/rx-0/rps_cpus
+       echo 0 > /sys/class/net/eth0/queues/rx-0/rps_cpus
+elif [ ${flow_offloading:-0} -gt 0 ]; then
+       # SW offloading
+       # br-lan setup doesn't seem to matter for offloading case
+       echo 2 > /sys/class/net/eth0/queues/rx-0/rps_cpus
+else
+       # Default
+       echo 2 > /sys/class/net/br-lan/queues/rx-0/rps_cpus
+       echo 0 > /sys/class/net/eth0/queues/rx-0/rps_cpus
+fi