mirror of
https://github.com/breeze303/nss-packages.git
synced 2025-12-16 16:57:29 +00:00
qca-nss-drv: Rework smp_affinity + Add nss_stats
1.) Moved `set_affinity` function outside of `enable_rps`
2.) Added 2 new functions `bitmask_to_cpus` and `cpus_to_bitmask`
a.) bitmask_to_cpus - Takes a bitmask of CPUs and returns a
list of CPU numbers. (i.e. `bitmask_to_cpus "f"` -> 0,1,2,3)
b.) cpus_to_bitmask - Takes a comma/space or range list of CPUs and returns
a bitmask. (i.e. `cpus_to_bitmask "2,3"` -> c)
3.) Changed logic of `set_affinity` to now use physical CPUs rather than
knowing the bitmask. This should make it more straight forward when
testing changes
4.) Added an UCI option `enable_log` to enable/disable logging output to
`logger`. Default is `1` (on)
5.) Removed unused UCI options `nss_firmware *`
6.) Changed the way UCI options are retrieved to account for missing
options.
7.) Moved '/lib/debug/qca-nss-drv' to '/usr/bin/nss_stats' so it's in
$PATH and has a more intuitive name
This commit is contained in:
Qosmio
parent
29f9ba9648
commit
41f1217c5e
@ -98,9 +98,9 @@ define KernelPackage/qca-nss-drv/install
|
||||
$(INSTALL_DIR) $(1)/lib/debug
|
||||
|
||||
$(INSTALL_BIN) ./files/qca-nss-drv.init $(1)/etc/init.d/qca-nss-drv
|
||||
$(INSTALL_BIN) ./files/qca-nss-drv.conf $(1)/etc/config/nss
|
||||
$(INSTALL_BIN) ./files/qca-nss-drv.uci $(1)/etc/config/nss
|
||||
$(INSTALL_BIN) ./files/qca-nss-drv.hotplug $(1)/etc/hotplug.d/firmware/10-qca-nss-fw
|
||||
$(INSTALL_BIN) ./files/qca-nss-drv.debug $(1)/lib/debug/qca-nss-drv
|
||||
$(INSTALL_BIN) ./files/qca-nss-drv.debug $(1)/usr/bin/nss_stats
|
||||
|
||||
endef
|
||||
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
config nss_firmware 'qca_nss_0'
|
||||
|
||||
config nss_firmware 'qca_nss_1'
|
||||
|
||||
config general
|
||||
option enable_rps '1'
|
||||
@ -1,5 +1,6 @@
|
||||
#!/bin/sh /etc/rc.common
|
||||
#
|
||||
# vim: set syn=bash
|
||||
# shellcheck disable=2155,3019,3043,3057,3060
|
||||
# Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
|
||||
#
|
||||
# Permission to use, copy, modify, and/or distribute this software for any
|
||||
@ -13,53 +14,114 @@
|
||||
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
#
|
||||
######################################################################
|
||||
|
||||
START=70
|
||||
PROG="qca-nss-drv"
|
||||
|
||||
######################################################################
|
||||
### Takes a comma or space separated list of CPU numbers or ranges
|
||||
## and returns a bitmask of CPUs.
|
||||
## cpus_to_bitmask "0,1,2,3" -> f
|
||||
## cpus_to_bitmask "0 1 2 3" -> f
|
||||
## cpus_to_bitmask "0-3" -> f
|
||||
## cpus_to_bitmask "3" -> 8
|
||||
#######################################################################
|
||||
|
||||
cpus_to_bitmask() {
|
||||
|
||||
local bitmask=0
|
||||
# shellcheck disable=2048
|
||||
for range in ${*//,/ }; do
|
||||
start="${range%-*}"
|
||||
end="${range#*-}"
|
||||
if [ -z "$end" ]; then
|
||||
bitmask="$((bitmask | 1 << start))"
|
||||
else
|
||||
bitmask="$((bitmask | (2 ** (end - start + 1) - 1) << start))"
|
||||
fi
|
||||
done
|
||||
printf '%x' $bitmask
|
||||
}
|
||||
|
||||
######################################################################
|
||||
### Takes a bitmask of CPUs and returns a space separated list of
|
||||
## CPU numbers.
|
||||
## bitmask_to_cpus f -> 0 1 2 3
|
||||
######################################################################
|
||||
|
||||
bitmask_to_cpus() {
|
||||
|
||||
[ "${1:0:2}" != "0x" ] && set -- "0x$1"
|
||||
local bitmask="$(printf '%d' "$1")"
|
||||
|
||||
local cpus=""
|
||||
for i in $(seq 0 63); do
|
||||
if [ $((bitmask & 1)) -ne 0 ]; then
|
||||
cpus="$cpus $i"
|
||||
fi
|
||||
bitmask=$((bitmask >> 1))
|
||||
done
|
||||
echo "${cpus# }"
|
||||
}
|
||||
|
||||
######################################################################
|
||||
### Sets the affinity of the IRQs with the given name to the given CPU.
|
||||
## first argument: IRQ name ("nss_queue0")
|
||||
## second argument: CPU number
|
||||
## third argument: occurrence of the IRQ name
|
||||
## since NSS core 0/1 share the same IRQ names
|
||||
## set_affinity "nss_queue0" 1 1
|
||||
|
||||
enable_rps() {
|
||||
set_affinity() {
|
||||
awk -v irq_name="$1" -v affinity="$2" -v occurrence="$3" '
|
||||
|
||||
local irq_name="$1" affinity="$2" occurrence="$3" bitmask
|
||||
|
||||
awk -v irq_name="$irq_name" -v occurrence="$occurrence" '
|
||||
BEGIN{count=0}
|
||||
$NF==irq_name {
|
||||
if(++count==occurrence){
|
||||
sub(/:$/,"",$1);
|
||||
logger -t "ucitrack"
|
||||
system("logger -t \"qca-nss-drv\" \"Pinning IRQ " irq_name " occurance " occurrence " to core " affinity "\"");
|
||||
system("printf " affinity " > /proc/irq/" $1 "/smp_affinity");
|
||||
exit
|
||||
sub(/:$/,"",$1)
|
||||
print $1
|
||||
}
|
||||
}' /proc/interrupts
|
||||
}' /proc/interrupts | while read -r irq; do
|
||||
$enable_log && {
|
||||
logger -t "$PROG" "$(printf "NSS Core $((occurrence - 1)): Pinning IRQ($irq) %-19s to CPU ${affinity}\n" "$irq_name")"
|
||||
}
|
||||
bitmask=$(cpus_to_bitmask "$affinity") && echo "$bitmask" > /proc/irq/"$irq"/smp_affinity
|
||||
done
|
||||
}
|
||||
|
||||
# nss_queue set 1
|
||||
set_affinity 'nss_queue0' 2 1
|
||||
set_affinity 'nss_queue1' 4 1
|
||||
set_affinity 'nss_queue2' 8 1
|
||||
set_affinity 'nss_queue3' 1 1
|
||||
enable_rps() {
|
||||
|
||||
# nss_queue set 2
|
||||
set_affinity 'nss_queue0' 4 2
|
||||
set_affinity 'nss_queue1' 8 2
|
||||
set_affinity 'nss_queue2' 1 2
|
||||
set_affinity 'nss_queue3' 2 2
|
||||
# NSS Core 0 : 4 nss queues to each core
|
||||
set_affinity "nss_queue0" 1 1
|
||||
set_affinity "nss_queue1" 2 1
|
||||
set_affinity "nss_queue2" 3 1
|
||||
set_affinity "nss_queue3" 0 1
|
||||
|
||||
# nss buffer sos/queues set 1
|
||||
set_affinity 'nss_empty_buf_sos' 4 1
|
||||
set_affinity 'nss_empty_buf_queue' 8 1
|
||||
# NSS Core 1 : 1 nss queue to 3rd core
|
||||
set_affinity "nss_queue0" 2 2
|
||||
|
||||
# nss buffer sos/queues set 2
|
||||
set_affinity 'nss_empty_buf_sos' 4 2
|
||||
set_affinity 'nss_empty_buf_queue' 8 2
|
||||
# NSS Core 0 : 2 nss sos/queues to last core
|
||||
set_affinity "nss_empty_buf_sos" 3 1
|
||||
set_affinity "nss_empty_buf_queue" 3 1
|
||||
|
||||
# NSS Core 1 : 1 nss sos to last core
|
||||
set_affinity "nss_empty_buf_sos" 3 2
|
||||
|
||||
# Enable NSS RPS
|
||||
sysctl -w dev.nss.rps.enable=1 > /dev/null 2> /dev/null
|
||||
}
|
||||
|
||||
start() {
|
||||
local rps_enabled
|
||||
rps_enabled="$(uci_get nss @general[0] enable_rps)"
|
||||
if [ "$rps_enabled" -eq 1 ]; then
|
||||
enable_rps
|
||||
fi
|
||||
|
||||
local enable_rps
|
||||
|
||||
config_load nss
|
||||
config_get enable_rps "general" enable_rps 0
|
||||
config_get_bool enable_log "general" enable_log 0
|
||||
|
||||
[ "$enable_log" -eq 1 ] && enable_log=true || enable_log=false
|
||||
[ "$enable_rps" -eq 1 ] && enable_rps
|
||||
}
|
||||
|
||||
3
qca-nss-drv/files/qca-nss-drv.uci
Normal file
3
qca-nss-drv/files/qca-nss-drv.uci
Normal file
@ -0,0 +1,3 @@
|
||||
config nss 'general'
|
||||
option enable_rps '1'
|
||||
option enable_log '1'
|
||||
Loading…
Reference in New Issue
Block a user