From f06bd5bdb8e131a566d0f0068835296112f69915 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 15 Feb 2023 19:40:38 +0100 Subject: [PATCH] bcm4908: refactor packet steering init MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- .../bcm4908/base-files/etc/init.d/fastnetwork | 46 ------------------- .../usr/libexec/platform/packet-steering.sh | 29 ++++++++++++ 2 files changed, 29 insertions(+), 46 deletions(-) delete mode 100755 target/linux/bcm4908/base-files/etc/init.d/fastnetwork create mode 100755 target/linux/bcm4908/base-files/usr/libexec/platform/packet-steering.sh diff --git a/target/linux/bcm4908/base-files/etc/init.d/fastnetwork b/target/linux/bcm4908/base-files/etc/init.d/fastnetwork deleted file mode 100755 index 88f6075990..0000000000 --- a/target/linux/bcm4908/base-files/etc/init.d/fastnetwork +++ /dev/null @@ -1,46 +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)" - local rps_eth0=0 - local rps_br_lan=0 - - [ "$num_cpus" -le 1 ] && return - - [ "$packet_steering" = 1 ] && { - if [ ${flow_offloading_hw:-0} -gt 0 ]; then - # HW offloading - # Not implemented - : - elif [ ${flow_offloading:-0} -gt 0 ]; then - # SW offloading - # BCM4908 always reaches ~940 Mb/s - : - else - # Default - case "$num_cpus" in - 2) rps_eth0=2; rps_br_lan=2;; - 4) rps_eth0=e; rps_br_lan=e;; - esac - fi - } - - echo $rps_eth0 > /sys/class/net/eth0/queues/rx-0/rps_cpus - echo $rps_br_lan > /sys/class/net/br-lan/queues/rx-0/rps_cpus -} diff --git a/target/linux/bcm4908/base-files/usr/libexec/platform/packet-steering.sh b/target/linux/bcm4908/base-files/usr/libexec/platform/packet-steering.sh new file mode 100755 index 0000000000..825bca311f --- /dev/null +++ b/target/linux/bcm4908/base-files/usr/libexec/platform/packet-steering.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +packet_steering="$(uci -q get network.@globals[0].packet_steering)" +num_cpus="$(grep -c "^processor.*:" /proc/cpuinfo)" +flow_offloading="$(uci -q get firewall.@defaults[0].flow_offloading)" +flow_offloading_hw="$(uci -q get firewall.@defaults[0].flow_offloading_hw)" +rps_eth0=0 +rps_br_lan=0 + +[ "$packet_steering" = 1 ] && { + if [ ${flow_offloading_hw:-0} -gt 0 ]; then + # HW offloading + # Not implemented + : + elif [ ${flow_offloading:-0} -gt 0 ]; then + # SW offloading + # BCM4908 always reaches ~940 Mb/s + : + else + # Default + case "$num_cpus" in + 2) rps_eth0=2; rps_br_lan=2;; + 4) rps_eth0=e; rps_br_lan=e;; + esac + fi +} + +echo $rps_eth0 > /sys/class/net/eth0/queues/rx-0/rps_cpus +echo $rps_br_lan > /sys/class/net/br-lan/queues/rx-0/rps_cpus -- 2.30.2