[ Sasha's backport helper bot ]
Hi,
Found matching upstream commit: 278a370c1766060d2144d6cf0b06c101e1043b6d
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.6.y | Present (different SHA1: ff33be9cecee)
6.1.y | Not found
Note: The patch differs from the upstream commit:
---
1: 278a370c17660 ! 1: 68463e6a71027 gve: Fixes for napi_poll when budget is 0
@@ Metadata
## Commit message ##
gve: Fixes for napi_poll when budget is 0
- Netpoll will explicilty pass the polling call with a budget of 0 to
+ Netpoll will explicitly 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.
+ The original fix was merged here:
+ https://lore.kernel.org/r/20231114004144.2022268-1-ziweixiao@xxxxxxxxxx
+ Resend it since the original one was not cleanly applied to 6.1 kernel.
+
+ commit 278a370c1766 ("gve: Fixes for napi_poll when budget is 0")
+
Fixes: f5cedc84a30d ("gve: Add transmit and receive support")
Signed-off-by: Ziwei Xiao <ziweixiao@xxxxxxxxxx>
- Link: https://lore.kernel.org/r/20231114004144.2022268-1-ziweixiao@xxxxxxxxxx
- Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
+ Reviewed-by: Praveen Kaligineedi <pkaligineedi@xxxxxxxxxx>
+ Signed-off-by: Praveen Kaligineedi <pkaligineedi@xxxxxxxxxx>
## drivers/net/ethernet/google/gve/gve_main.c ##
@@ drivers/net/ethernet/google/gve/gve_main.c: static int gve_napi_poll(struct napi_struct *napi, int budget)
- if (block->tx) {
- if (block->tx->q_num < priv->tx_cfg.num_queues)
- reschedule |= gve_tx_poll(block, budget);
-- else
-+ else if (budget)
- reschedule |= gve_xdp_poll(block, budget);
- }
+ if (block->tx)
+ reschedule |= gve_tx_poll(block, budget);
++
+ if (!budget)
+ return 0;
+
@@ drivers/net/ethernet/google/gve/gve_rx.c: int gve_rx_poll(struct gve_notify_bloc
## drivers/net/ethernet/google/gve/gve_tx.c ##
-@@ drivers/net/ethernet/google/gve/gve_tx.c: bool gve_xdp_poll(struct gve_notify_block *block, int budget)
- bool repoll;
+@@ drivers/net/ethernet/google/gve/gve_tx.c: 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 */
- nic_done = gve_tx_load_event_counter(priv, tx);
- to_do = min_t(u32, (nic_done - tx->done), budget);
+ /* In TX path, it may try to clean completed pkts in order to xmit,
+ * to avoid cleaning conflict, use spin_lock(), it yields better
+ * concurrency between xmit/clean than netif's lock.
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.1.y | Success | Success |
