2024-05-28 23:55:30

by Ronak Doshi

Subject: [PATCH v1 net-next 3/4] vmxnet3: add command to allow disabling of offloads

This patch adds a new command to disable certain offloads. This
allows user to specify, using VM configuration, if certain offloads
need to be disabled.

Signed-off-by: Ronak Doshi <[email protected]>
Acked-by: Guolin Yang <[email protected]>
---
drivers/net/vmxnet3/vmxnet3_defs.h | 4 ++++
drivers/net/vmxnet3/vmxnet3_drv.c | 19 +++++++++++++++++++
drivers/net/vmxnet3/vmxnet3_ethtool.c | 8 ++++++++
drivers/net/vmxnet3/vmxnet3_int.h | 1 +
4 files changed, 32 insertions(+)

diff --git a/drivers/net/vmxnet3/vmxnet3_defs.h b/drivers/net/vmxnet3/vmxnet3_defs.h
index dcf1cf8e7a86..5c5148768039 100644
--- a/drivers/net/vmxnet3/vmxnet3_defs.h
+++ b/drivers/net/vmxnet3/vmxnet3_defs.h
@@ -126,6 +126,7 @@ enum {
VMXNET3_CMD_GET_MAX_CAPABILITIES,
VMXNET3_CMD_GET_DCR0_REG,
VMXNET3_CMD_GET_TSRING_DESC_SIZE,
+ VMXNET3_CMD_GET_DISABLED_OFFLOADS,
};

/*
@@ -912,4 +913,7 @@ struct Vmxnet3_DriverShared {
/* when new capability is introduced, update VMXNET3_CAP_MAX */
#define VMXNET3_CAP_MAX VMXNET3_CAP_VERSION_7_MAX

+#define VMXNET3_OFFLOAD_TSO BIT(0)
+#define VMXNET3_OFFLOAD_LRO BIT(1)
+
#endif /* _VMXNET3_DEFS_H_ */
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 528bd269c721..0fe55234f2bf 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -3649,6 +3649,15 @@ static void
vmxnet3_declare_features(struct vmxnet3_adapter *adapter)
{
struct net_device *netdev = adapter->netdev;
+ unsigned long flags;
+
+ if (VMXNET3_VERSION_GE_9(adapter)) {
+ spin_lock_irqsave(&adapter->cmd_lock, flags);
+ VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
+ VMXNET3_CMD_GET_DISABLED_OFFLOADS);
+ adapter->disabledOffloads = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);
+ spin_unlock_irqrestore(&adapter->cmd_lock, flags);
+ }

netdev->hw_features = NETIF_F_SG | NETIF_F_RXCSUM |
NETIF_F_HW_CSUM | NETIF_F_HW_VLAN_CTAG_TX |
@@ -3666,6 +3675,16 @@ vmxnet3_declare_features(struct vmxnet3_adapter *adapter)
NETIF_F_GSO_UDP_TUNNEL_CSUM;
}

+ if (adapter->disabledOffloads & VMXNET3_OFFLOAD_TSO) {
+ netdev->hw_features &= ~(NETIF_F_TSO | NETIF_F_TSO6);
+ netdev->hw_enc_features &= ~(NETIF_F_TSO | NETIF_F_TSO6);
+ }
+
+ if (adapter->disabledOffloads & VMXNET3_OFFLOAD_LRO) {
+ netdev->hw_features &= ~(NETIF_F_LRO);
+ netdev->hw_enc_features &= ~(NETIF_F_LRO);
+ }
+
if (VMXNET3_VERSION_GE_7(adapter)) {
unsigned long flags;

diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
index 471f91c4204a..b78cda41f643 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
@@ -270,6 +270,14 @@ netdev_features_t vmxnet3_fix_features(struct net_device *netdev,
if (!(features & NETIF_F_RXCSUM))
features &= ~NETIF_F_LRO;

+ if ((features & NETIF_F_LRO) &&
+ (adapter->disabledOffloads & VMXNET3_OFFLOAD_LRO))
+ features &= ~NETIF_F_LRO;
+
+ if ((features & (NETIF_F_TSO | NETIF_F_TSO6)) &&
+ (adapter->disabledOffloads & VMXNET3_OFFLOAD_TSO))
+ features &= ~(NETIF_F_TSO | NETIF_F_TSO6);
+
/* If XDP is enabled, then LRO should not be enabled */
if (vmxnet3_xdp_enabled(adapter) && (features & NETIF_F_LRO)) {
netdev_err(netdev, "LRO is not supported with XDP");
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index 68358e71526c..31e8db568db2 100644
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
@@ -454,6 +454,7 @@ struct vmxnet3_adapter {
/* Size of buffer in the ts ring */
u16 tx_ts_desc_size;
u16 rx_ts_desc_size;
+ u32 disabledOffloads;
};

#define VMXNET3_WRITE_BAR0_REG(adapter, reg, val) \
--
2.11.0

2024-05-31 01:06:14

by Jakub Kicinski

Subject: Re: [PATCH v1 net-next 3/4] vmxnet3: add command to allow disabling of offloads

On Tue, 28 May 2024 16:39:05 -0700 Ronak Doshi wrote:
> @@ -270,6 +270,14 @@ netdev_features_t vmxnet3_fix_features(struct net_device *netdev,
> if (!(features & NETIF_F_RXCSUM))
> features &= ~NETIF_F_LRO;
>
> + if ((features & NETIF_F_LRO) &&
> + (adapter->disabledOffloads & VMXNET3_OFFLOAD_LRO))
> + features &= ~NETIF_F_LRO;
> +
> + if ((features & (NETIF_F_TSO | NETIF_F_TSO6)) &&
> + (adapter->disabledOffloads & VMXNET3_OFFLOAD_TSO))
> + features &= ~(NETIF_F_TSO | NETIF_F_TSO6);

Why do you clear them in fix_features?
They are not declared as supported how can they get enabled?
--
pw-bot: cr