Skip to content

Fix wrongly disabling static key (for xdp locking) #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mmkhmmkh wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix wrongly disabling static key (for xdp locking) #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe2fb12
fix wrongly disabling static key (for xdp locking)
mmkhmmkh Nov 2, 2024
ec0b43d
cleanup
mmkhmmkh Nov 2, 2024
ac887ab
Merge branch 'fix-xdp-panic' of github.com:mmkhmmkh/ethernet-linux-ix…
mmkhmmkh Nov 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/ixgbe_lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,9 +1125,6 @@ static void ixgbe_free_q_vector(struct ixgbe_adapter *adapter, int v_idx)
adapter->tx_ring[ring->queue_index] = NULL;
}

if (static_key_enabled((struct static_key *)&ixgbe_xdp_locking_key))
static_branch_dec(&ixgbe_xdp_locking_key);

ixgbe_for_each_ring(ring, q_vector->rx)
adapter->rx_ring[ring->queue_index] = NULL;

Expand Down
7 changes: 5 additions & 2 deletions src/ixgbe_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8618,6 +8618,11 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter)
adapter->tx_work_limit = IXGBE_DEFAULT_TX_WORK;

set_bit(__IXGBE_DOWN, &adapter->state);

/* enable locking for XDP_TX if we have more CPUs than queues */
if (nr_cpu_ids > IXGBE_MAX_XDP_QS)
static_branch_enable(&ixgbe_xdp_locking_key);

out:
return err;
}
Expand Down Expand Up @@ -13234,8 +13239,6 @@ static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog)
*/
if (nr_cpu_ids > IXGBE_MAX_XDP_QS * 2)
return -ENOMEM;
else if (nr_cpu_ids > IXGBE_MAX_XDP_QS)
static_branch_inc(&ixgbe_xdp_locking_key);

old_prog = xchg(&adapter->xdp_prog, prog);
need_reset = (!!prog != !!old_prog);
Expand Down