gve: Fixes for napi_poll when budget is 0
commit278a370c17upstream. Netpoll will explicilty pass the polling call with a budget of 0 to indicate it's clearing the Tx path only. For the gve_rx_poll and gve_xdp_poll, they were mistakenly taking the 0 budget as the indication to do all the work. Add check to avoid the rx path and xdp path being called when budget is 0. And also avoid napi_complete_done being called when budget is 0 for netpoll. Fixes:f5cedc84a3("gve: Add transmit and receive support") Signed-off-by: Ziwei Xiao <ziweixiao@google.com> Link: https://lore.kernel.org/r/20231114004144.2022268-1-ziweixiao@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Reviewed-by: Praveen Kaligineedi <pkaligineedi@google.com> Signed-off-by: Praveen Kaligineedi <pkaligineedi@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
154cf95664
commit
221a2c8989
@@ -201,6 +201,10 @@ static int gve_napi_poll(struct napi_struct *napi, int budget)
|
||||
|
||||
if (block->tx)
|
||||
reschedule |= gve_tx_poll(block, budget);
|
||||
|
||||
if (!budget)
|
||||
return 0;
|
||||
|
||||
if (block->rx)
|
||||
reschedule |= gve_rx_poll(block, budget);
|
||||
|
||||
@@ -236,6 +240,9 @@ static int gve_napi_poll_dqo(struct napi_struct *napi, int budget)
|
||||
if (block->tx)
|
||||
reschedule |= gve_tx_poll_dqo(block, /*do_clean=*/true);
|
||||
|
||||
if (!budget)
|
||||
return 0;
|
||||
|
||||
if (block->rx) {
|
||||
work_done = gve_rx_poll_dqo(block, budget);
|
||||
reschedule |= work_done == budget;
|
||||
|
||||
@@ -606,10 +606,6 @@ bool gve_rx_poll(struct gve_notify_block *block, int budget)
|
||||
|
||||
feat = block->napi.dev->features;
|
||||
|
||||
/* If budget is 0, do all the work */
|
||||
if (budget == 0)
|
||||
budget = INT_MAX;
|
||||
|
||||
if (budget > 0)
|
||||
repoll |= gve_clean_rx_done(rx, budget, feat);
|
||||
else
|
||||
|
||||
@@ -686,10 +686,6 @@ bool gve_tx_poll(struct gve_notify_block *block, int budget)
|
||||
u32 nic_done;
|
||||
u32 to_do;
|
||||
|
||||
/* If budget is 0, do all the work */
|
||||
if (budget == 0)
|
||||
budget = INT_MAX;
|
||||
|
||||
/* Find out how much work there is to be done */
|
||||
tx->last_nic_done = gve_tx_load_event_counter(priv, tx);
|
||||
nic_done = be32_to_cpu(tx->last_nic_done);
|
||||
|
||||
Reference in New Issue
Block a user