onload_mktest_net_driver: Replacing net driver with fb8cb83f136caf82a47e32a57a5d1d8d437c641d

Author: ligallag-amd

src/driver/linux_net/drivers/net/ethernet/sfc/ef10.c

@@ -3909,11 +3909,13 @@ static int efx_ef10_ev_process(struct efx_channel *channel, int quota)
 	efx_qword_t event, *p_event, *cl_base, *old_cl_base = NULL;
 	bool fresh = false;
 	unsigned int read_ptr, cr_ptr;
+	unsigned int wrap_ptr;
 	int ev_code;
 	int spent = 0;
 	int rc;
 
 	read_ptr = channel->eventq_read_ptr;
+	wrap_ptr = read_ptr & channel->eventq_mask;
 
 	EFX_WARN_ON_ONCE_PARANOID(!IS_ALIGNED((uintptr_t)channel->eventq.addr,
 					      L1_CACHE_BYTES));
@@ -4013,6 +4015,17 @@ static int efx_ef10_ev_process(struct efx_channel *channel, int quota)
 				  channel->channel, ev_code,
 				  EFX_QWORD_VAL(event));
 		}
+		if ((read_ptr & channel->eventq_mask) == wrap_ptr) {
+			/* We have consumed an entire ring's worth of events,
+			 * probably scrambling to keep up with TX completions,
+			 * without seeing enough RX to spend our budget.
+			 * Finish this NAPI poll here, reporting the budget as
+			 * fully spent, so that the core can reschedule before
+			 * calling us again.
+			 */
+			spent = quota;
+			goto out;
+		}
 	}
 
 out:

src/driver/linux_net/drivers/net/ethernet/sfc/net_driver.h

@@ -92,7 +92,7 @@
  **************************************************************************/
 
 #ifdef EFX_NOT_UPSTREAM
-#define EFX_DRIVER_VERSION	"6.1.0.1007"
+#define EFX_DRIVER_VERSION	"6.1.0.1008"
 #endif
 
 #ifdef DEBUG
@@ -1309,13 +1309,15 @@ struct efx_arfs_rule {
 /**
  * struct efx_async_filter_insertion - Request to asynchronously insert a filter
  * @net_dev: Reference to the netdevice
+ * @net_dev_tracker: reference tracker entry for @net_dev
  * @spec: The filter to insert
  * @work: Workitem for this request
  * @rxq_index: Identifies the channel for which this request was made
  * @flow_id: Identifies the kernel-side flow for which this request was made
  */
 struct efx_async_filter_insertion {
 	struct net_device *net_dev;
+	netdevice_tracker net_dev_tracker;
 	struct efx_filter_spec spec;
 	struct work_struct work;
 	u16 rxq_index;

src/driver/linux_net/drivers/net/ethernet/sfc/rx_common.c

@@ -1845,7 +1845,7 @@ static void efx_filter_rfs_work(struct work_struct *data)
 
 	/* Release references */
 	clear_bit(slot_idx, &efx->rps_slot_map);
-	dev_put(req->net_dev);
+	netdev_put(req->net_dev, &req->net_dev_tracker);
 
 	return;
 }
@@ -1908,7 +1908,8 @@ int efx_filter_rfs(struct net_device *net_dev, const struct sk_buff *skb,
 	}
 
 	/* Queue the request */
-	dev_hold(req->net_dev = net_dev);
+	req->net_dev = net_dev;
+	netdev_hold(req->net_dev, &req->net_dev_tracker, GFP_ATOMIC);
 	INIT_WORK(&req->work, efx_filter_rfs_work);
 	req->rxq_index = rxq_index;
 	req->flow_id = flow_id;
@@ -1965,4 +1966,3 @@ bool __efx_filter_rfs_expire(struct efx_channel *channel, unsigned int quota)
 }
 
 #endif /* CONFIG_RFS_ACCEL */
-

src/driver/linux_net/drivers/net/ethernet/sfc/tc_encap_actions.c

@@ -209,7 +209,8 @@ static int efx_bind_neigh(struct efx_nic *efx,
 				EFX_TC_ERR_MSG(efx, extack, "Failed to lookup route for encap");
 				goto out_free;
 			}
-			dev_hold(neigh->egdev = dst->dev);
+			netdev_hold(neigh->egdev = dst->dev, &neigh->dev_tracker,
+				    GFP_KERNEL_ACCOUNT);
 			neigh->ttl = ip6_dst_hoplimit(dst);
 			n = dst_neigh_lookup(dst, &flow6.daddr);
 			dst_release(dst);
@@ -223,7 +224,8 @@ static int efx_bind_neigh(struct efx_nic *efx,
 				EFX_TC_ERR_MSG(efx, extack, "Failed to lookup route for encap");
 				goto out_free;
 			}
-			dev_hold(neigh->egdev = rt->dst.dev);
+			netdev_hold(neigh->egdev = rt->dst.dev, &neigh->dev_tracker,
+				    GFP_KERNEL_ACCOUNT);
 			neigh->ttl = ip4_dst_hoplimit(&rt->dst);
 			n = dst_neigh_lookup(&rt->dst, &flow4.daddr);
 			ip_rt_put(rt);
@@ -233,7 +235,7 @@ static int efx_bind_neigh(struct efx_nic *efx,
 		if (!n) {
 			rc = -ENETUNREACH;
 			EFX_TC_ERR_MSG(efx, extack, "Failed to lookup neighbour for encap");
-			dev_put(neigh->egdev);
+			netdev_put(neigh->egdev, &neigh->dev_tracker);
 			goto out_free;
 		}
 		refcount_set(&neigh->ref, 1);
@@ -273,7 +275,7 @@ static void efx_free_neigh(struct efx_neigh_binder *neigh)
 	rhashtable_remove_fast(&efx->tc->neigh_ht, &neigh->linkage,
 			       efx_neigh_ht_params);
 	synchronize_rcu();
-	dev_put(neigh->egdev);
+	netdev_put(neigh->egdev, &neigh->dev_tracker);
 	put_net(neigh->net);
 	kfree(neigh);
 }

src/driver/linux_net/drivers/net/ethernet/sfc/tc_encap_actions.h

@@ -26,6 +26,7 @@
  * @ttl: Time To Live associated with the route used
  * @dying: set when egdev is going away, to skip further updates
  * @egdev: egress device from the route lookup.  Holds a reference
+ * @dev_tracker: reference tracker entry for @egdev
  * @ref: counts encap actions referencing this entry
  * @used: jiffies of last time traffic hit any encap action using this.
  *      When counter reads update this, a new neighbour event is sent to
@@ -53,6 +54,7 @@ struct efx_neigh_binder {
 	u8 ttl;
 	bool dying;
 	struct net_device *egdev;
+	netdevice_tracker dev_tracker;
 	refcount_t ref;
 	unsigned long used;
 	struct list_head users;