Merge branch 'onload-9.1'

abower-amd · abower-amd · commit 8ce6f4bffb9c · 2026-02-04T12:09:21.000Z
diff --git a/src/driver/linux_net/drivers/net/ethernet/sfc/debugfs.c b/src/driver/linux_net/drivers/net/ethernet/sfc/debugfs.c
@@ -12,6 +12,7 @@
 #include <linux/pci.h>
 #include <linux/debugfs.h>
 #include <linux/dcache.h>
+#include <linux/namei.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include "net_driver.h"
@@ -87,7 +88,7 @@ void efx_fini_debugfs_child(struct dentry *dir, const char *name)
 	struct qstr child_name = QSTR_INIT(name, strlen(name));
 	struct dentry *child;
 
-	child = d_hash_and_lookup(dir, &child_name);
+	child = try_lookup_noperm(&child_name, dir);
 	if (!IS_ERR_OR_NULL(child)) {
 		/* If it's a "regular" file, free its parameter binding */
 		if (S_ISREG(child->d_inode->i_mode))
diff --git a/src/driver/linux_net/drivers/net/ethernet/sfc/ef10.c b/src/driver/linux_net/drivers/net/ethernet/sfc/ef10.c
@@ -3055,16 +3055,23 @@ static void efx_ef10_tx_write(struct efx_tx_queue *tx_queue)
 	}
 }
 
+/* Check that we assume that we don't need to fragment a descriptor due to
+ * a DMA boundary for a single output packet. Use for initialising the
+ * default_max_mtu field of struct efx_nic_type.
+ */
+#define EFX_EF10_VERIFY_MAX_MTU(mtu) \
+	(BUILD_BUG_ON_ZERO((mtu) > EFX_EF10_MAX_TX_DESCRIPTOR_LEN) + (mtu))
+
 /* Maximum number of descriptors required for a single SKB */
 static unsigned int efx_ef10_tx_max_skb_descs(struct efx_nic *efx)
 {
 	struct efx_ef10_nic_data *nic_data = efx->nic_data;
 	unsigned int max_descs;
 
 	/* In all cases we assume that we don't need to fragment a descriptor
-	 * due to a DMA boundary for a single output packet.
+	 * due to a DMA boundary for a single output packet. Checked by using
+	 * EFX_EF10_VERIFY_MAX_MTU().
 	 */
-	BUILD_BUG_ON(EFX_MAX_MTU > EFX_EF10_MAX_TX_DESCRIPTOR_LEN);
 
 	if (efx_ef10_has_cap(nic_data->datapath_caps, TX_TSO)) {
 		/* We need a header, option and payload descriptor for each
@@ -5181,7 +5188,9 @@ static int efx_ef10_udp_tnl_unset_port(struct net_device *dev,
 static const struct udp_tunnel_nic_info efx_ef10_udp_tunnels = {
 	.set_port	= efx_ef10_udp_tnl_set_port,
 	.unset_port	= efx_ef10_udp_tnl_unset_port,
+#if defined(EFX_USE_KCOMPAT) && defined(EFX_HAVE_UDP_TUNNEL_NIC_INFO_MAY_SLEEP)
 	.flags          = UDP_TUNNEL_NIC_INFO_MAY_SLEEP,
+#endif
 	.tables         = {
 		{
 			.n_entries = 16,
@@ -6214,6 +6223,10 @@ static bool efx_ef10_vf_client_supported(struct efx_nic *efx,
 	 NETIF_F_RXHASH |		\
 	 NETIF_F_NTUPLE)
 
+/* Maximum possible MTU the driver supports */
+#define EFX_EF10_DEFAULT_MAX_MTU	EFX_EF10_VERIFY_MAX_MTU(9216)
+#define EFX_X4_DEFAULT_MAX_MTU		EFX_EF10_VERIFY_MAX_MTU(9100)
+
 #ifdef CONFIG_SFC_SRIOV
 const struct efx_nic_type efx_hunt_a0_vf_nic_type = {
 	.is_vf = true,
@@ -6376,6 +6389,7 @@ const struct efx_nic_type efx_hunt_a0_vf_nic_type = {
 	.check_caps = ef10_check_caps,
 	.rx_recycle_ring_size = efx_ef10_recycle_ring_size,
 	.has_fw_variants = true,
+	.default_max_mtu = EFX_EF10_DEFAULT_MAX_MTU,
 };
 
 const struct efx_nic_type efx_x4_vf_nic_type = {
@@ -6406,6 +6420,7 @@ const struct efx_nic_type efx_x4_vf_nic_type = {
 	.stop_stats = efx_ef10_stop_stats_vf,
 	.update_stats_period = efx_ef10_vf_schedule_stats_work,
 	.push_irq_moderation = efx_ef10_push_irq_moderation,
+	.hw_max_mtu = efx_x4_hw_max_mtu,
 	.reconfigure_mac = efx_x4_mac_reconfigure,
 	.check_mac_fault = efx_x4_mcdi_mac_check_fault,
 	.reconfigure_port = efx_x4_mcdi_port_reconfigure,
@@ -6540,6 +6555,7 @@ const struct efx_nic_type efx_x4_vf_nic_type = {
 	.rx_recycle_ring_size = efx_ef10_recycle_ring_size,
 	.has_dynamic_sensors = ef10_has_dynamic_sensors,
 	.has_fw_variants = true,
+	.default_max_mtu = EFX_X4_DEFAULT_MAX_MTU,
 };
 #endif
 
@@ -6746,6 +6762,7 @@ const struct efx_nic_type efx_hunt_a0_nic_type = {
 	.check_caps = ef10_check_caps,
 	.rx_recycle_ring_size = efx_ef10_recycle_ring_size,
 	.has_fw_variants = true,
+	.default_max_mtu = EFX_EF10_DEFAULT_MAX_MTU,
 };
 
 const struct efx_nic_type efx_x4_nic_type = {
@@ -6775,6 +6792,7 @@ const struct efx_nic_type efx_x4_nic_type = {
 	.update_stats = efx_ef10_update_stats_pf,
 	.pull_stats = efx_ef10_pull_stats_pf,
 	.push_irq_moderation = efx_ef10_push_irq_moderation,
+	.hw_max_mtu = efx_x4_hw_max_mtu,
 	.reconfigure_mac = efx_x4_mac_reconfigure,
 	.check_mac_fault = efx_x4_mcdi_mac_check_fault,
 	.reconfigure_port = efx_x4_mcdi_port_reconfigure,
@@ -6952,5 +6970,6 @@ const struct efx_nic_type efx_x4_nic_type = {
 	.rx_recycle_ring_size = efx_ef10_recycle_ring_size,
 	.has_dynamic_sensors = ef10_has_dynamic_sensors,
 	.has_fw_variants = true,
+	.default_max_mtu = EFX_X4_DEFAULT_MAX_MTU,
 };
 
diff --git a/src/driver/linux_net/drivers/net/ethernet/sfc/ef100_netdev.c b/src/driver/linux_net/drivers/net/ethernet/sfc/ef100_netdev.c
@@ -754,10 +754,10 @@ static int ef100_register_netdev(struct efx_nic *efx)
 	net_dev->netdev_ops = &ef100_netdev_ops;
 #if !defined(EFX_USE_KCOMPAT) || defined(EFX_HAVE_NETDEV_MTU_LIMITS)
 	net_dev->min_mtu = EFX_MIN_MTU;
-	net_dev->max_mtu = EFX_100_MAX_MTU;
+	net_dev->max_mtu = efx_max_mtu(efx);
 #elif defined(EFX_HAVE_NETDEV_EXT_MTU_LIMITS)
 	net_dev->extended->min_mtu = EFX_MIN_MTU;
-	net_dev->extended->max_mtu = EFX_100_MAX_MTU;
+	net_dev->extended->max_mtu = efx_max_mtu(efx);
 #endif
 	net_dev->ethtool_ops = &ef100_ethtool_ops;
 
diff --git a/src/driver/linux_net/drivers/net/ethernet/sfc/ef100_nic.c b/src/driver/linux_net/drivers/net/ethernet/sfc/ef100_nic.c
@@ -1783,6 +1783,9 @@ void ef100_remove(struct efx_nic *efx)
 	NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_FILTER)
 #endif
 
+/* Maximum possible MTU the driver supports */
+#define EFX_EF100_DEFAULT_MAX_MTU 9600
+
 const struct efx_nic_type ef100_pf_nic_type = {
 	.revision = EFX_REV_EF100,
 	.is_vf = false,
@@ -1921,6 +1924,7 @@ const struct efx_nic_type ef100_pf_nic_type = {
 	},
 #endif
 #endif
+	.default_max_mtu = EFX_EF100_DEFAULT_MAX_MTU,
 };
 
 const struct efx_nic_type ef100_vf_nic_type = {
@@ -2030,4 +2034,5 @@ const struct efx_nic_type ef100_vf_nic_type = {
 	},
 #endif
 #endif
+	.default_max_mtu = EFX_EF100_DEFAULT_MAX_MTU,
 };
diff --git a/src/driver/linux_net/drivers/net/ethernet/sfc/ef100_rep.c b/src/driver/linux_net/drivers/net/ethernet/sfc/ef100_rep.c
@@ -326,10 +326,10 @@ static struct efx_rep *efx_ef100_rep_create_netdev(struct efx_nic *efx,
 	net_dev->ethtool_ops = &efx_ef100_rep_ethtool_ops;
 #if !defined(EFX_USE_KCOMPAT) || defined(EFX_HAVE_NETDEV_MTU_LIMITS)
 	net_dev->min_mtu = EFX_MIN_MTU;
-	net_dev->max_mtu = EFX_100_MAX_MTU;
+	net_dev->max_mtu = efx_max_mtu(efx);
 #elif defined(EFX_HAVE_NETDEV_EXT_MTU_LIMITS)
 	net_dev->extended->min_mtu = EFX_MIN_MTU;
-	net_dev->extended->max_mtu = EFX_100_MAX_MTU;
+	net_dev->extended->max_mtu = efx_max_mtu(efx);
 #endif
 #if !defined(EFX_USE_KCOMPAT) || defined(EFX_HAVE_NETDEV_LLTX)
 	net_dev->lltx = true;
diff --git a/src/driver/linux_net/drivers/net/ethernet/sfc/efx.c b/src/driver/linux_net/drivers/net/ethernet/sfc/efx.c
@@ -845,10 +845,10 @@ static int efx_register_netdev(struct efx_nic *efx)
 	netif_set_tso_max_segs(net_dev, EFX_TSO_MAX_SEGS);
 #if !defined(EFX_USE_KCOMPAT) || defined(EFX_HAVE_NETDEV_MTU_LIMITS)
 	net_dev->min_mtu = EFX_MIN_MTU;
-	net_dev->max_mtu = EFX_MAX_MTU;
+	net_dev->max_mtu = efx_max_mtu(efx);
 #elif defined(EFX_HAVE_NETDEV_EXT_MTU_LIMITS)
 	net_dev->extended->min_mtu = EFX_MIN_MTU;
-	net_dev->extended->max_mtu = EFX_MAX_MTU;
+	net_dev->extended->max_mtu = efx_max_mtu(efx);
 #endif
 
 	rtnl_lock();
diff --git a/src/driver/linux_net/drivers/net/ethernet/sfc/efx_common.c b/src/driver/linux_net/drivers/net/ethernet/sfc/efx_common.c
@@ -324,10 +324,10 @@ int efx_change_mtu(struct net_device *net_dev, int new_mtu)
 		return rc;
 
 #if defined(EFX_USE_KCOMPAT) && !(defined(EFX_HAVE_NETDEV_MTU_LIMITS) || defined(EFX_HAVE_NETDEV_EXT_MTU_LIMITS))
-	if (new_mtu > (efx_nic_rev(efx) == EFX_REV_EF100? EFX_100_MAX_MTU: EFX_MAX_MTU)) {
+	if (new_mtu > efx_max_mtu(efx)) {
 		netif_err(efx, drv, efx->net_dev,
 			  "Requested MTU of %d too big (max: %d)\n",
-			  new_mtu, EFX_MAX_MTU);
+			  new_mtu, efx_max_mtu(efx));
 		return -EINVAL;
 	}
 	if (new_mtu < EFX_MIN_MTU) {
@@ -501,8 +501,9 @@ static int efx_start_datapath(struct efx_nic *efx)
 		/* Each packet can consume up to
 		 * ceil(max_frame_len / buffer_size) buffers
 		 */
-		efx->rx_max_frags = DIV_ROUND_UP(EFX_MAX_FRAME_LEN(EFX_MAX_MTU),
-						 efx->rx_dma_len);
+		efx->rx_max_frags =
+			DIV_ROUND_UP(EFX_MAX_FRAME_LEN(efx_max_mtu(efx)),
+				     efx->rx_dma_len);
 		efx->rx_buffer_order = 0;
 #if defined(EFX_NOT_UPSTREAM) && defined(EFX_USE_SFC_LRO)
 		efx->lro_available = false;
diff --git a/src/driver/linux_net/drivers/net/ethernet/sfc/kernel_compat.h b/src/driver/linux_net/drivers/net/ethernet/sfc/kernel_compat.h
@@ -1977,4 +1977,11 @@ static inline void time64_to_tm(time64_t totalsecs, int offset, struct tm *resul
 #define skb_gro_may_pull(_s, _l) !skb_gro_header_hard(_s, _l)
 #endif
 
+#ifdef EFX_NEED_TRY_LOOKUP_NOPERM
+static inline struct dentry *try_lookup_noperm(struct qstr *name, struct dentry *base)
+{
+	return d_hash_and_lookup(base, name);
+}
+#endif
+
 #endif /* EFX_KERNEL_COMPAT_H */
diff --git a/src/driver/linux_net/drivers/net/ethernet/sfc/kernel_compat.sh b/src/driver/linux_net/drivers/net/ethernet/sfc/kernel_compat.sh
@@ -128,6 +128,7 @@ EFX_NEED_PAGE_REF_ADD		nfile				include/linux/page_ref.h
 EFX_NEED_HWMON_DEVICE_REGISTER_WITH_INFO	nsymbol	hwmon_device_register_with_info	include/linux/hwmon.h
 EFX_HAVE_NDO_UDP_TUNNEL_ADD	member	struct_net_device_ops	ndo_udp_tunnel_add	include/linux/netdevice.h
 EFX_HAVE_UDP_TUNNEL_NIC_INFO	symbol	udp_tunnel_nic_info	include/net/udp_tunnel.h
+EFX_HAVE_UDP_TUNNEL_NIC_INFO_MAY_SLEEP	symbol UDP_TUNNEL_NIC_INFO_MAY_SLEEP	include/net/udp_tunnel.h
 EFX_HAVE_NEW_FLOW_KEYS		member	struct_flow_keys	basic		include/net/flow_dissector.h
 EFX_HAVE_NDO_ADD_GENEVE_PORT	member	struct_net_device_ops	ndo_add_geneve_port	include/linux/netdevice.h
 EFX_HAVE_NETDEV_LLTX		nsymbol	NETIF_F_LLTX	include/linux/netdev_features.h
@@ -291,6 +292,7 @@ EFX_HAVE_NET_RPS_H                     file       include/net/rps.h
 EFX_HAVE_IP_TUNNEL_FLAGS_TO_BE16	symbol	ip_tunnel_flags_to_be16	include/net/ip_tunnels.h
 EFX_NEED_TIME64_TO_TM			nsymbol	time64_to_tm		include/linux/time.h
 EFX_HAVE_ASSIGN_STR_NO_SRC_ARG      custom
+EFX_NEED_TRY_LOOKUP_NOPERM	nsymbol	try_lookup_noperm	include/linux/namei.h
 " | grep -E -v -e '^#' -e '^$' | sed 's/[ \t][ \t]*/:/g'
 }
 
diff --git a/src/driver/linux_net/drivers/net/ethernet/sfc/mcdi.h b/src/driver/linux_net/drivers/net/ethernet/sfc/mcdi.h
@@ -200,7 +200,6 @@ struct efx_mcdi_mon {
 #if !defined(EFX_USE_KCOMPAT) || defined(EFX_HAVE_RHASHTABLE)
 	struct rhashtable sensor_table;
 #endif
-	unsigned int generation_count;
 	unsigned int n_dynamic_sensors;
 	int pend_sensor_state_handle;
 };
diff --git a/src/driver/linux_net/drivers/net/ethernet/sfc/mcdi_mon.c b/src/driver/linux_net/drivers/net/ethernet/sfc/mcdi_mon.c
@@ -312,7 +312,8 @@ static void efx_mcdi_handle_dynamic_sensor_state_change(struct efx_nic *efx,
 	struct efx_mcdi_mon *hwmon = efx_mcdi_mon(efx);
 	struct efx_dynamic_sensor *sensor;
 	unsigned int handle, state, value;
-	const char *name, *state_txt;
+	const char *name = NULL;
+	const char *state_txt;
 
 	/* Ignore event if dynamic sensors have not been initialised */
 	if (!hwmon || !hwmon->sensor_list)
@@ -593,7 +594,6 @@ static int efx_mcdi_read_dynamic_sensor_list(struct efx_nic *efx)
 	MCDI_DECLARE_BUF(outbuf, MC_CMD_DYNAMIC_SENSORS_LIST_OUT_LENMAX);
 	struct efx_mcdi_mon *hwmon = efx_mcdi_mon(efx);
 	unsigned int n_sensors;
-	unsigned int gen_count;
 	void *new_sensor_list;
 	void *old_sensor_list;
 	size_t outlen;
@@ -606,12 +606,6 @@ static int efx_mcdi_read_dynamic_sensor_list(struct efx_nic *efx)
 	if (rc)
 		return rc;
 
-	gen_count = MCDI_DWORD(outbuf, DYNAMIC_SENSORS_LIST_OUT_GENERATION);
-	/* check if generation count changed */
-	if (gen_count == hwmon->generation_count)
-		return 0;
-	hwmon->generation_count = gen_count;
-
 	n_sensors = MCDI_DWORD(outbuf, DYNAMIC_SENSORS_LIST_OUT_COUNT);
 	if (outlen < MC_CMD_DYNAMIC_SENSORS_LIST_OUT_LEN(n_sensors)) {
 		WARN_ON(1);
diff --git a/src/driver/linux_net/drivers/net/ethernet/sfc/mcdi_port_handle.c b/src/driver/linux_net/drivers/net/ethernet/sfc/mcdi_port_handle.c
@@ -33,7 +33,24 @@ static u32 efx_x4_mcdi_max_frame_len(struct efx_nic *efx)
 	 * that includes an obsolete workaround for Siena hardware that is
 	 * ABI for the legacy MC_CMD_SET_MAC command.
 	 */
-	return efx->net_dev->mtu + ETH_HLEN + VLAN_HLEN + 4 /*FCS*/;
+	return efx->net_dev->mtu + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN;
+}
+
+unsigned int efx_x4_hw_max_mtu(struct efx_nic *efx)
+{
+	struct efx_x4_mcdi_port_data *port_data = efx->port_data;
+	unsigned int max_mtu;
+
+	if (efx_nic_port_handle_supported(efx)) {
+
+		/* Must be the inverse of efx_x4_mcdi_max_frame_len */
+		max_mtu = port_data->fixed_port.max_frame_len
+			- (ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN);
+
+		if (max_mtu >= ETH_MIN_MTU && max_mtu <= ETH_MAX_MTU)
+			return max_mtu;
+	}
+	return efx->type->default_max_mtu;
 }
 
 int efx_x4_mcdi_mac_ctrl(struct efx_nic *efx)
@@ -1105,6 +1122,9 @@ int efx_x4_mcdi_fixed_port_props(struct efx_nic *efx,
 	efx_x4_mcdi_tech_to_bitmap(port_data->fixed_port.tech_mask,
 				   (const efx_oword_t *)caps);
 
+	port_data->fixed_port.max_frame_len =
+		MCDI_DWORD(outbuf, GET_FIXED_PORT_PROPERTIES_OUT_MAX_FRAME_LEN);
+
 	port_data->fixed_port.fec =
 		MCDI_DWORD(outbuf, GET_FIXED_PORT_PROPERTIES_OUT_ABILITIES_FEC_MASK);
 	port_data->fixed_port.pause =
diff --git a/src/driver/linux_net/drivers/net/ethernet/sfc/mcdi_port_handle.h b/src/driver/linux_net/drivers/net/ethernet/sfc/mcdi_port_handle.h
@@ -49,6 +49,8 @@ struct efx_x4_mcdi_port_data {
 
 int efx_mcdi_get_port_handle(struct efx_nic *efx, u32 *handle);
 
+unsigned int efx_x4_hw_max_mtu(struct efx_nic *efx);
+
 int efx_x4_mcdi_mac_ctrl(struct efx_nic *efx);
 int efx_x4_mcdi_set_mtu(struct efx_nic *efx);
 
diff --git a/src/driver/linux_net/drivers/net/ethernet/sfc/net_driver.h b/src/driver/linux_net/drivers/net/ethernet/sfc/net_driver.h
@@ -92,7 +92,7 @@
  **************************************************************************/
 
 #ifdef EFX_NOT_UPSTREAM
-#define EFX_DRIVER_VERSION	"6.2.1.1000"
+#define EFX_DRIVER_VERSION	"6.2.1.1001"
 #endif
 
 #ifdef DEBUG
@@ -142,10 +142,6 @@
 #define EFX_TXQ_TYPES			3
 #define EFX_MAX_TX_QUEUES	(EFX_TXQ_TYPES * EFX_MAX_CORE_TX_QUEUES)
 
-/* Maximum possible MTU the driver supports */
-#define EFX_MAX_MTU (9 * 1024)
-#define EFX_100_MAX_MTU 9600
-
 /* Minimum MTU, from RFC791 (IP) */
 #define EFX_MIN_MTU 68
 
@@ -2118,6 +2114,7 @@ struct mae_mport_desc;
  * @reconfigure_port: Push loopback/power/txdis changes to the MAC and PHY
  * @check_link_change: Poll once to check for link state changes
  * @check_module_caps: Check advertised abilities after module change
+ * @hw_max_mtu: Get max MTU from fixed port properties (may be %NULL)
  * @reconfigure_mac: Push MAC address, MTU, flow control and filter settings
  *	to the hardware.  Serialised by the mac_lock.
  *	Only change MTU if mtu_only is set.
@@ -2289,6 +2286,7 @@ struct mae_mport_desc;
  * @mcdi_max_ver: Maximum MCDI version supported
  * @hwtstamp_filters: Mask of hardware timestamp filter types supported
  * @has_fw_variants: NIC supports multiple datapath firmware variants
+ * @default_max_mtu: Maximum MTU supported
  */
 struct efx_nic_type {
 	bool is_vf;
@@ -2327,6 +2325,7 @@ struct efx_nic_type {
 	int (*reconfigure_port)(struct efx_nic *efx);
 	bool (*check_link_change)(struct efx_nic *efx);
 	void (*check_module_caps)(struct efx_nic *efx);
+	unsigned int (*hw_max_mtu)(struct efx_nic *efx);
 	int (*reconfigure_mac)(struct efx_nic *efx, bool mtu_only);
 	bool (*check_mac_fault)(struct efx_nic *efx);
 	void (*get_wol)(struct efx_nic *efx, struct ethtool_wolinfo *wol);
@@ -2569,6 +2568,7 @@ struct efx_nic_type {
 	int mcdi_max_ver;
 	u32 hwtstamp_filters;
 	bool has_fw_variants;
+	unsigned int default_max_mtu;
 };
 
 /**************************************************************************
@@ -2779,7 +2779,14 @@ efx_rx_buf_next(struct efx_rx_queue *rx_queue, struct efx_rx_buffer *rx_buf)
  * this by adding a further 16 bytes.
  */
 #define EFX_MAX_FRAME_LEN(mtu) \
-	((((mtu) + ETH_HLEN + VLAN_HLEN + 4/* FCS */ + 7) & ~7) + 16)
+	((((mtu) + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN + 7) & ~7) + 16)
+
+static inline unsigned int efx_max_mtu(struct efx_nic *efx)
+{
+	if (efx->type->hw_max_mtu)
+		return efx->type->hw_max_mtu(efx);
+	return efx->type->default_max_mtu;
+}
 
 /*
  * WARNING: This calculation must match with the value of page_offset
