Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'bnxt_en-fix-rss-context-and-ntuple-filter-issues'
Michael Chan says:
====================
bnxt_en: Fix RSS context and ntuple filter issues
The first patch fixes the problem of ifup failing if one or more RSS
contexts were previously created. The 2nd patch fixes ntuple filter
deletion errors in ifdown state. The last patch adds self tests to
cover these failure cases.
====================
Link: https://patch.msgid.link/20260219185313.2682148-1-michael.chan@broadcom.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+105
-8
+7
-6
drivers/net/ethernet/broadcom/bnxt/bnxt.c
+7
-6
drivers/net/ethernet/broadcom/bnxt/bnxt.c
···
6240
6240
int rc;
6241
6241
6242
6242
set_bit(BNXT_FLTR_FW_DELETED, &fltr->base.state);
6243
+
if (!test_bit(BNXT_STATE_OPEN, &bp->state))
6244
+
return 0;
6245
+
6243
6246
rc = hwrm_req_init(bp, req, HWRM_CFA_NTUPLE_FILTER_FREE);
6244
6247
if (rc)
6245
6248
return rc;
···
10892
10889
struct bnxt_ntuple_filter *ntp_fltr;
10893
10890
int i;
10894
10891
10895
-
if (netif_running(bp->dev)) {
10896
-
bnxt_hwrm_vnic_free_one(bp, &rss_ctx->vnic);
10897
-
for (i = 0; i < BNXT_MAX_CTX_PER_VNIC; i++) {
10898
-
if (vnic->fw_rss_cos_lb_ctx[i] != INVALID_HW_RING_ID)
10899
-
bnxt_hwrm_vnic_ctx_free_one(bp, vnic, i);
10900
-
}
10892
+
bnxt_hwrm_vnic_free_one(bp, &rss_ctx->vnic);
10893
+
for (i = 0; i < BNXT_MAX_CTX_PER_VNIC; i++) {
10894
+
if (vnic->fw_rss_cos_lb_ctx[i] != INVALID_HW_RING_ID)
10895
+
bnxt_hwrm_vnic_ctx_free_one(bp, vnic, i);
10901
10896
}
10902
10897
if (!all)
10903
10898
return;
+98
-2
tools/testing/selftests/drivers/net/hw/rss_ctx.py
+98
-2
tools/testing/selftests/drivers/net/hw/rss_ctx.py
···
4
4
import datetime
5
5
import random
6
6
import re
7
+
import time
7
8
from lib.py import ksft_run, ksft_pr, ksft_exit
8
9
from lib.py import ksft_eq, ksft_ne, ksft_ge, ksft_in, ksft_lt, ksft_true, ksft_raises
9
10
from lib.py import NetDrvEpEnv
10
11
from lib.py import EthtoolFamily, NetdevFamily
11
12
from lib.py import KsftSkipEx, KsftFailEx
13
+
from lib.py import ksft_disruptive
12
14
from lib.py import rand_port
13
-
from lib.py import ethtool, ip, defer, GenerateTraffic, CmdExitFailure
15
+
from lib.py import cmd, ethtool, ip, defer, GenerateTraffic, CmdExitFailure, wait_file
14
16
15
17
16
18
def _rss_key_str(key):
···
811
809
'noise' : (0, 1) })
812
810
813
811
812
+
@ksft_disruptive
813
+
def test_rss_context_persist_ifupdown(cfg, pre_down=False):
814
+
"""
815
+
Test that RSS contexts and their associated ntuple filters persist across
816
+
an interface down/up cycle.
817
+
818
+
"""
819
+
820
+
require_ntuple(cfg)
821
+
822
+
qcnt = len(_get_rx_cnts(cfg))
823
+
if qcnt < 6:
824
+
try:
825
+
ethtool(f"-L {cfg.ifname} combined 6")
826
+
defer(ethtool, f"-L {cfg.ifname} combined {qcnt}")
827
+
except Exception as exc:
828
+
raise KsftSkipEx("Not enough queues for the test") from exc
829
+
830
+
ethtool(f"-X {cfg.ifname} equal 2")
831
+
defer(ethtool, f"-X {cfg.ifname} default")
832
+
833
+
ifup = defer(ip, f"link set dev {cfg.ifname} up")
834
+
if pre_down:
835
+
ip(f"link set dev {cfg.ifname} down")
836
+
837
+
try:
838
+
ctx1_id = ethtool_create(cfg, "-X", "context new start 2 equal 2")
839
+
defer(ethtool, f"-X {cfg.ifname} context {ctx1_id} delete")
840
+
except CmdExitFailure as exc:
841
+
raise KsftSkipEx("Create context not supported with interface down") from exc
842
+
843
+
ctx2_id = ethtool_create(cfg, "-X", "context new start 4 equal 2")
844
+
defer(ethtool, f"-X {cfg.ifname} context {ctx2_id} delete")
845
+
846
+
port_ctx2 = rand_port()
847
+
flow = f"flow-type tcp{cfg.addr_ipver} dst-ip {cfg.addr} dst-port {port_ctx2} context {ctx2_id}"
848
+
ntuple_id = ethtool_create(cfg, "-N", flow)
849
+
defer(ethtool, f"-N {cfg.ifname} delete {ntuple_id}")
850
+
851
+
if not pre_down:
852
+
ip(f"link set dev {cfg.ifname} down")
853
+
ifup.exec()
854
+
855
+
wait_file(f"/sys/class/net/{cfg.ifname}/carrier",
856
+
lambda x: x.strip() == "1", deadline=20)
857
+
858
+
remote_addr = cfg.remote_addr_v[cfg.addr_ipver]
859
+
for _ in range(10):
860
+
if cmd(f"ping -c 1 -W 1 {remote_addr}", fail=False).ret == 0:
861
+
break
862
+
time.sleep(1)
863
+
else:
864
+
raise KsftSkipEx("Cannot reach remote host after interface up")
865
+
866
+
ctxs = cfg.ethnl.rss_get({'header': {'dev-name': cfg.ifname}}, dump=True)
867
+
868
+
data1 = [c for c in ctxs if c.get('context') == ctx1_id]
869
+
ksft_eq(len(data1), 1, f"Context {ctx1_id} should persist after ifup")
870
+
871
+
data2 = [c for c in ctxs if c.get('context') == ctx2_id]
872
+
ksft_eq(len(data2), 1, f"Context {ctx2_id} should persist after ifup")
873
+
874
+
_ntuple_rule_check(cfg, ntuple_id, ctx2_id)
875
+
876
+
cnts = _get_rx_cnts(cfg)
877
+
GenerateTraffic(cfg).wait_pkts_and_stop(20000)
878
+
cnts = _get_rx_cnts(cfg, prev=cnts)
879
+
880
+
main_traffic = sum(cnts[0:2])
881
+
ksft_ge(main_traffic, 18000, f"Main context traffic distribution: {cnts}")
882
+
ksft_lt(sum(cnts[2:6]), 500, f"Other context queues should be mostly empty: {cnts}")
883
+
884
+
_send_traffic_check(cfg, port_ctx2, f"context {ctx2_id}",
885
+
{'target': (4, 5),
886
+
'noise': (0, 1),
887
+
'empty': (2, 3)})
888
+
889
+
890
+
def test_rss_context_persist_create_and_ifdown(cfg):
891
+
"""
892
+
Create RSS contexts then cycle the interface down and up.
893
+
"""
894
+
test_rss_context_persist_ifupdown(cfg, pre_down=False)
895
+
896
+
897
+
def test_rss_context_persist_ifdown_and_create(cfg):
898
+
"""
899
+
Bring interface down first, then create RSS contexts and bring up.
900
+
"""
901
+
test_rss_context_persist_ifupdown(cfg, pre_down=True)
902
+
903
+
814
904
def main() -> None:
815
905
with NetDrvEpEnv(__file__, nsim_test=False) as cfg:
816
906
cfg.context_cnt = None
···
917
823
test_rss_context_out_of_order, test_rss_context4_create_with_cfg,
918
824
test_flow_add_context_missing,
919
825
test_delete_rss_context_busy, test_rss_ntuple_addition,
920
-
test_rss_default_context_rule],
826
+
test_rss_default_context_rule,
827
+
test_rss_context_persist_create_and_ifdown,
828
+
test_rss_context_persist_ifdown_and_create],
921
829
args=(cfg, ))
922
830
ksft_exit()
923
831