diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2023-02-13 10:32:45 +0100 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2023-02-15 14:25:57 +0100 |
| commit | 6e555ac3ad260fe35f17e770277cf02d211a25d5 (patch) | |
| tree | 7b56f9a23175c58737ac95c0b4d10c577aa59d0f | |
| parent | 601257e388d7abb5ada1c1ac93e2cd2259ea3dd1 (diff) | |
| download | upstream-6e555ac3ad260fe35f17e770277cf02d211a25d5.tar.gz upstream-6e555ac3ad260fe35f17e770277cf02d211a25d5.tar.bz2 upstream-6e555ac3ad260fe35f17e770277cf02d211a25d5.zip | |
bcm53xx: refactor packet steering init
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>
| -rwxr-xr-x | target/linux/bcm53xx/base-files/etc/init.d/fastnetwork | 44 | ||||
| -rwxr-xr-x | target/linux/bcm53xx/base-files/usr/libexec/platform/packet-steering.sh | 25 |
2 files changed, 25 insertions, 44 deletions
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 index 1999d13707..0000000000 --- a/target/linux/bcm53xx/base-files/etc/init.d/fastnetwork +++ /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 index 0000000000..dacd1adc7e --- /dev/null +++ b/target/linux/bcm53xx/base-files/usr/libexec/platform/packet-steering.sh @@ -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 |