diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2022-01-06 14:57:54 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2022-01-06 13:45:02 +0000 |
| commit | 43d012123122cc69feacab55b71369f386c19566 (patch) | |
| tree | 5abb1df59a3fa95399b577e054d20d5b55bb595b /drivers/net/ethernet/rocker | |
| parent | ppp: ensure minimum packet size in ppp_write() (diff) | |
| download | linux-dev-43d012123122cc69feacab55b71369f386c19566.tar.xz linux-dev-43d012123122cc69feacab55b71369f386c19566.zip | |
rocker: fix a sleeping in atomic bug
This code is holding the &ofdpa->flow_tbl_lock spinlock so it is not
allowed to sleep. That means we have to pass the OFDPA_OP_FLAG_NOWAIT
flag to ofdpa_flow_tbl_del().
Fixes: 936bd486564a ("rocker: use FIB notifications instead of switchdev calls")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/rocker')
| -rw-r--r-- | drivers/net/ethernet/rocker/rocker_ofdpa.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/rocker/rocker_ofdpa.c b/drivers/net/ethernet/rocker/rocker_ofdpa.c index 3e1ca7a8d029..bc70c6abd6a5 100644 --- a/drivers/net/ethernet/rocker/rocker_ofdpa.c +++ b/drivers/net/ethernet/rocker/rocker_ofdpa.c @@ -2783,7 +2783,8 @@ static void ofdpa_fib4_abort(struct rocker *rocker) if (!ofdpa_port) continue; nh->fib_nh_flags &= ~RTNH_F_OFFLOAD; - ofdpa_flow_tbl_del(ofdpa_port, OFDPA_OP_FLAG_REMOVE, + ofdpa_flow_tbl_del(ofdpa_port, + OFDPA_OP_FLAG_REMOVE | OFDPA_OP_FLAG_NOWAIT, flow_entry); } spin_unlock_irqrestore(&ofdpa->flow_tbl_lock, flags); |