Commit ff58e2df authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller

nfp: avoid soft lockups under control message storm

When FW floods the driver with control messages try to exit the cmsg
processing loop every now and then to avoid soft lockups.  Cmsg
processing is generally very lightweight so 512 seems like a reasonable
budget, which should not be exceeded under normal conditions.

Fixes: 77ece8d5 ("nfp: add control vNIC datapath")
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Tested-by: default avatarPieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe3a83af
...@@ -2077,14 +2077,17 @@ nfp_ctrl_rx_one(struct nfp_net *nn, struct nfp_net_dp *dp, ...@@ -2077,14 +2077,17 @@ nfp_ctrl_rx_one(struct nfp_net *nn, struct nfp_net_dp *dp,
return true; return true;
} }
static void nfp_ctrl_rx(struct nfp_net_r_vector *r_vec) static bool nfp_ctrl_rx(struct nfp_net_r_vector *r_vec)
{ {
struct nfp_net_rx_ring *rx_ring = r_vec->rx_ring; struct nfp_net_rx_ring *rx_ring = r_vec->rx_ring;
struct nfp_net *nn = r_vec->nfp_net; struct nfp_net *nn = r_vec->nfp_net;
struct nfp_net_dp *dp = &nn->dp; struct nfp_net_dp *dp = &nn->dp;
unsigned int budget = 512;
while (nfp_ctrl_rx_one(nn, dp, r_vec, rx_ring)) while (nfp_ctrl_rx_one(nn, dp, r_vec, rx_ring) && budget--)
continue; continue;
return budget;
} }
static void nfp_ctrl_poll(unsigned long arg) static void nfp_ctrl_poll(unsigned long arg)
...@@ -2096,9 +2099,13 @@ static void nfp_ctrl_poll(unsigned long arg) ...@@ -2096,9 +2099,13 @@ static void nfp_ctrl_poll(unsigned long arg)
__nfp_ctrl_tx_queued(r_vec); __nfp_ctrl_tx_queued(r_vec);
spin_unlock_bh(&r_vec->lock); spin_unlock_bh(&r_vec->lock);
nfp_ctrl_rx(r_vec); if (nfp_ctrl_rx(r_vec)) {
nfp_net_irq_unmask(r_vec->nfp_net, r_vec->irq_entry);
nfp_net_irq_unmask(r_vec->nfp_net, r_vec->irq_entry); } else {
tasklet_schedule(&r_vec->tasklet);
nn_dp_warn(&r_vec->nfp_net->dp,
"control message budget exceeded!\n");
}
} }
/* Setup and Configuration /* Setup and Configuration
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment