[Linuxarm] Re: [RFCv7 PATCH net-next 04/36] net: sfc: replace const features initialization with DECLARE_NETDEV_FEATURE_SET

Reviewed-by: Hao Lan lanhao@huawei.com

On 2022/7/30 18:17, Jian Shen wrote:

There are some drivers(e.g. sfc) use netdev_features in global structure initialization. Changed the its netdev_features_t memeber to netdev_features_t *, and make it refer to a netdev_features_t global variables.

Signed-off-by: Jian Shen shenjian15@huawei.com

drivers/net/ethernet/sfc/ef10.c | 11 ++---- drivers/net/ethernet/sfc/ef100_netdev.c | 6 ++-- drivers/net/ethernet/sfc/ef100_nic.c | 9 ++--- drivers/net/ethernet/sfc/efx.c | 36 ++++++++++++++++++-- drivers/net/ethernet/sfc/falcon/efx.c | 25 ++++++++++++-- drivers/net/ethernet/sfc/falcon/efx.h | 3 ++ drivers/net/ethernet/sfc/falcon/falcon.c | 4 +-- drivers/net/ethernet/sfc/falcon/net_driver.h | 2 +- drivers/net/ethernet/sfc/net_driver.h | 2 +- drivers/net/ethernet/sfc/rx_common.c | 2 +- drivers/net/ethernet/sfc/rx_common.h | 4 +++ drivers/net/ethernet/sfc/siena/efx.c | 20 +++++++++-- drivers/net/ethernet/sfc/siena/efx.h | 2 ++ drivers/net/ethernet/sfc/siena/net_driver.h | 2 +- drivers/net/ethernet/sfc/siena/rx_common.c | 2 +- drivers/net/ethernet/sfc/siena/siena.c | 3 +- 16 files changed, 99 insertions(+), 34 deletions(-)

diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c index 0a44a0beed4e..babaf0cf8762 100644 --- a/drivers/net/ethernet/sfc/ef10.c +++ b/drivers/net/ethernet/sfc/ef10.c @@ -4029,13 +4029,6 @@ static unsigned int efx_ef10_recycle_ring_size(const struct efx_nic *efx) return ret; }

-#define EF10_OFFLOAD_FEATURES \

• (NETIF_F_IP_CSUM | \

• NETIF_F_HW_VLAN_CTAG_FILTER |	\
  

• NETIF_F_IPV6_CSUM |		\
  

• NETIF_F_RXHASH |		\
  

• NETIF_F_NTUPLE)
  

const struct efx_nic_type efx_hunt_a0_vf_nic_type = { .is_vf = true, .mem_bar = efx_ef10_vf_mem_bar, @@ -4136,7 +4129,7 @@ const struct efx_nic_type efx_hunt_a0_vf_nic_type = { .always_rx_scatter = true, .min_interrupt_mode = EFX_INT_MODE_MSIX, .timer_period_max = 1 << ERF_DD_EVQ_IND_TIMER_VAL_WIDTH,

• .offload_features = EF10_OFFLOAD_FEATURES,

• .offload_features = &ef10_offload_features, .mcdi_max_ver = 2, .max_rx_ip_filters = EFX_MCDI_FILTER_TBL_ROWS, .hwtstamp_filters = 1 << HWTSTAMP_FILTER_NONE |

@@ -4274,7 +4267,7 @@ const struct efx_nic_type efx_hunt_a0_nic_type = { .option_descriptors = true, .min_interrupt_mode = EFX_INT_MODE_LEGACY, .timer_period_max = 1 << ERF_DD_EVQ_IND_TIMER_VAL_WIDTH,

• .offload_features = EF10_OFFLOAD_FEATURES,

• .offload_features = &ef10_offload_features, .mcdi_max_ver = 2, .max_rx_ip_filters = EFX_MCDI_FILTER_TBL_ROWS, .hwtstamp_filters = 1 << HWTSTAMP_FILTER_NONE |

diff --git a/drivers/net/ethernet/sfc/ef100_netdev.c b/drivers/net/ethernet/sfc/ef100_netdev.c index 4aadf6928102..4eb2d268b252 100644 --- a/drivers/net/ethernet/sfc/ef100_netdev.c +++ b/drivers/net/ethernet/sfc/ef100_netdev.c @@ -368,9 +368,9 @@ int ef100_probe_netdev(struct efx_probe_data *probe_data) efx->net_dev = net_dev; SET_NETDEV_DEV(net_dev, &efx->pci_dev->dev);

• net_dev->features |= efx->type->offload_features;
• net_dev->hw_features |= efx->type->offload_features;
• net_dev->hw_enc_features |= efx->type->offload_features;

• net_dev->features |= *efx->type->offload_features;
• net_dev->hw_features |= *efx->type->offload_features;
• net_dev->hw_enc_features |= *efx->type->offload_features; net_dev->vlan_features |= NETIF_F_ALL_TSO; netdev_vlan_features_set_array(net_dev, &ef100_vlan_feature_set); netif_set_tso_max_segs(net_dev,

diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c index b7d655d551da..c50d5e70d3c3 100644 --- a/drivers/net/ethernet/sfc/ef100_nic.c +++ b/drivers/net/ethernet/sfc/ef100_nic.c @@ -1098,16 +1098,11 @@ void ef100_remove(struct efx_nic *efx)

/* NIC level access functions */ -#define EF100_OFFLOAD_FEATURES (NETIF_F_HW_CSUM | NETIF_F_RXCSUM | \

• NETIF_F_HIGHDMA | NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_NTUPLE | \
• NETIF_F_RXHASH | NETIF_F_RXFCS | NETIF_F_TSO_ECN | NETIF_F_RXALL | \
• NETIF_F_HW_VLAN_CTAG_TX)

const struct efx_nic_type ef100_pf_nic_type = { .revision = EFX_REV_EF100, .is_vf = false, .probe = ef100_probe_main,

• .offload_features = EF100_OFFLOAD_FEATURES,

• .offload_features = &ef100_offload_features, .mcdi_max_ver = 2, .mcdi_request = ef100_mcdi_request, .mcdi_poll_response = ef100_mcdi_poll_response,

@@ -1196,7 +1191,7 @@ const struct efx_nic_type ef100_vf_nic_type = { .revision = EFX_REV_EF100, .is_vf = true, .probe = ef100_probe_vf,

• .offload_features = EF100_OFFLOAD_FEATURES,

• .offload_features = &ef100_offload_features, .mcdi_max_ver = 2, .mcdi_request = ef100_mcdi_request, .mcdi_poll_response = ef100_mcdi_poll_response,

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 3baebaabdf32..897a0113e257 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -1013,9 +1013,9 @@ static int efx_pci_probe_post_io(struct efx_nic *efx) }

/* Determine netdevice features */

• net_dev->features |= efx->type->offload_features;

• net_dev->features |= *efx->type->offload_features; netdev_active_features_set_array(net_dev, &efx_active_feature_set);

• if (efx->type->offload_features & (NETIF_F_IPV6_CSUM | NETIF_F_HW_CSUM))

• if (*efx->type->offload_features & (NETIF_F_IPV6_CSUM | NETIF_F_HW_CSUM)) net_dev->features |= NETIF_F_TSO6; /* Check whether device supports TSO */ if (!efx->type->tso_versions || !efx->type->tso_versions(efx))

@@ -1296,6 +1296,36 @@ static struct pci_driver efx_pci_driver = { #endif };

+static DECLARE_NETDEV_FEATURE_SET(ef10_offload_feature_set,

• 		  NETIF_F_IP_CSUM_BIT,
  

• 		  NETIF_F_HW_VLAN_CTAG_FILTER_BIT,
  

• 		  NETIF_F_IPV6_CSUM_BIT,
  

• 		  NETIF_F_RXHASH_BIT,
  

• 		  NETIF_F_NTUPLE_BIT);
  

+static DECLARE_NETDEV_FEATURE_SET(ef100_offload_feature_set,

• 		  NETIF_F_HW_CSUM_BIT,
  

• 		  NETIF_F_RXCSUM_BIT,
  

• 		  NETIF_F_HIGHDMA_BIT,
  

• 		  NETIF_F_SG_BIT,
  

• 		  NETIF_F_FRAGLIST_BIT,
  

• 		  NETIF_F_NTUPLE_BIT,
  

• 		  NETIF_F_RXHASH_BIT,
  

• 		  NETIF_F_RXFCS_BIT,
  

• 		  NETIF_F_TSO_ECN_BIT,
  

• 		  NETIF_F_RXALL_BIT,
  

• 		  NETIF_F_HW_VLAN_CTAG_TX_BIT);
  

+netdev_features_t ef10_offload_features __ro_after_init; +netdev_features_t ef100_offload_features __ro_after_init;

+static void __init efx_features_init(void) +{

• netdev_features_set_array(&ef10_offload_feature_set,

• 		  &ef10_offload_features);
  

• netdev_features_set_array(&ef100_offload_feature_set,

• 		  &ef100_offload_features);
  

+}

/**************************************************************************

• Kernel module interface

@@ -1324,6 +1354,8 @@ static int __init efx_init_module(void) if (rc < 0) goto err_pci_ef100;

• efx_features_init();

• return 0;

  err_pci_ef100:

diff --git a/drivers/net/ethernet/sfc/falcon/efx.c b/drivers/net/ethernet/sfc/falcon/efx.c index 0240c7f5843a..8692dc18efff 100644 --- a/drivers/net/ethernet/sfc/falcon/efx.c +++ b/drivers/net/ethernet/sfc/falcon/efx.c @@ -1689,7 +1689,7 @@ static int ef4_probe_filters(struct ef4_nic *efx) goto out_unlock;

#ifdef CONFIG_RFS_ACCEL

• if (efx->type->offload_features & NETIF_F_NTUPLE) {

• if (*efx->type->offload_features & NETIF_F_NTUPLE) { struct ef4_channel *channel; int i, success = 1;

@@ -2904,7 +2904,7 @@ static int ef4_pci_probe(struct pci_dev *pci_dev, if (rc) goto fail3;

• net_dev->features |= (efx->type->offload_features | NETIF_F_SG |

• net_dev->features |= (*efx->type->offload_features | NETIF_F_SG | NETIF_F_RXCSUM); /* Mask for features that also apply to VLAN devices */ netdev_vlan_features_set_array(net_dev, &efx_vlan_feature_set);

@@ -3168,6 +3168,25 @@ static struct pci_driver ef4_pci_driver = { .err_handler = &ef4_err_handlers, };

+static DECLARE_NETDEV_FEATURE_SET(falcon_b0_offload_feature_set,

• 		  NETIF_F_IP_CSUM_BIT,
  

• 		  NETIF_F_RXHASH_BIT,
  

• 		  NETIF_F_NTUPLE_BIT);
  

+static DECLARE_NETDEV_FEATURE_SET(falcon_a1_offload_feature_set,

• 		  NETIF_F_IP_CSUM_BIT);
  

+netdev_features_t falcon_b0_offload_features __ro_after_init; +netdev_features_t falcon_a1_offload_features __ro_after_init;

+static void __init ef4_features_init(void) +{

• netdev_features_set_array(&falcon_b0_offload_feature_set,

• 		  &falcon_b0_offload_features);
  

• netdev_features_set_array(&falcon_a1_offload_feature_set,

• 		  &falcon_a1_offload_features);
  

+}

/**************************************************************************

• Kernel module interface

@@ -3198,6 +3217,8 @@ static int __init ef4_init_module(void) if (rc < 0) goto err_pci;

• ef4_features_init();

• return 0;

  err_pci:

diff --git a/drivers/net/ethernet/sfc/falcon/efx.h b/drivers/net/ethernet/sfc/falcon/efx.h index d3b4646545fa..f31b5c6e02bc 100644 --- a/drivers/net/ethernet/sfc/falcon/efx.h +++ b/drivers/net/ethernet/sfc/falcon/efx.h @@ -271,4 +271,7 @@ static inline bool ef4_rwsem_assert_write_locked(struct rw_semaphore *sem) return true; }

+extern netdev_features_t falcon_b0_offload_features __ro_after_init; +extern netdev_features_t falcon_a1_offload_features __ro_after_init;

#endif /* EF4_EFX_H */ diff --git a/drivers/net/ethernet/sfc/falcon/falcon.c b/drivers/net/ethernet/sfc/falcon/falcon.c index 3324a6219a09..fda25f3f8e66 100644 --- a/drivers/net/ethernet/sfc/falcon/falcon.c +++ b/drivers/net/ethernet/sfc/falcon/falcon.c @@ -2799,7 +2799,7 @@ const struct ef4_nic_type falcon_a1_nic_type = { .can_rx_scatter = false, .max_interrupt_mode = EF4_INT_MODE_MSI, .timer_period_max = 1 << FRF_AB_TC_TIMER_VAL_WIDTH,

• .offload_features = NETIF_F_IP_CSUM,

• .offload_features = &falcon_a1_offload_features,

};

const struct ef4_nic_type falcon_b0_nic_type = { @@ -2898,6 +2898,6 @@ const struct ef4_nic_type falcon_b0_nic_type = { .can_rx_scatter = true, .max_interrupt_mode = EF4_INT_MODE_MSIX, .timer_period_max = 1 << FRF_AB_TC_TIMER_VAL_WIDTH,

• .offload_features = NETIF_F_IP_CSUM | NETIF_F_RXHASH | NETIF_F_NTUPLE,

• .offload_features = &falcon_b0_offload_features, .max_rx_ip_filters = FR_BZ_RX_FILTER_TBL0_ROWS,

}; diff --git a/drivers/net/ethernet/sfc/falcon/net_driver.h b/drivers/net/ethernet/sfc/falcon/net_driver.h index 8ee0cc45e8ad..f04b66b62840 100644 --- a/drivers/net/ethernet/sfc/falcon/net_driver.h +++ b/drivers/net/ethernet/sfc/falcon/net_driver.h @@ -1154,7 +1154,7 @@ struct ef4_nic_type { bool always_rx_scatter; unsigned int max_interrupt_mode; unsigned int timer_period_max;

• netdev_features_t offload_features;

• const netdev_features_t *offload_features; unsigned int max_rx_ip_filters;

};

diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h index f24919747711..5c099ef8152a 100644 --- a/drivers/net/ethernet/sfc/net_driver.h +++ b/drivers/net/ethernet/sfc/net_driver.h @@ -1541,7 +1541,7 @@ struct efx_nic_type { bool option_descriptors; unsigned int min_interrupt_mode; unsigned int timer_period_max;

• netdev_features_t offload_features;

• const netdev_features_t *offload_features; int mcdi_max_ver; unsigned int max_rx_ip_filters; u32 hwtstamp_filters;

diff --git a/drivers/net/ethernet/sfc/rx_common.c b/drivers/net/ethernet/sfc/rx_common.c index bd21d6ac778a..d3729b5669a4 100644 --- a/drivers/net/ethernet/sfc/rx_common.c +++ b/drivers/net/ethernet/sfc/rx_common.c @@ -799,7 +799,7 @@ int efx_probe_filters(struct efx_nic *efx) goto out_unlock;

#ifdef CONFIG_RFS_ACCEL

• if (efx->type->offload_features & NETIF_F_NTUPLE) {

• if (*efx->type->offload_features & NETIF_F_NTUPLE) { struct efx_channel *channel; int i, success = 1;

diff --git a/drivers/net/ethernet/sfc/rx_common.h b/drivers/net/ethernet/sfc/rx_common.h index fbd2769307f9..09b38b0cb401 100644 --- a/drivers/net/ethernet/sfc/rx_common.h +++ b/drivers/net/ethernet/sfc/rx_common.h @@ -113,4 +113,8 @@ bool __efx_filter_rfs_expire(struct efx_channel *channel, unsigned int quota); int efx_probe_filters(struct efx_nic *efx); void efx_remove_filters(struct efx_nic *efx);

+extern netdev_features_t ef10_offload_features __ro_after_init; +extern netdev_features_t ef100_offload_features __ro_after_init; +extern netdev_features_t siena_offload_features __ro_after_init;

#endif diff --git a/drivers/net/ethernet/sfc/siena/efx.c b/drivers/net/ethernet/sfc/siena/efx.c index 050e1b0ad0cb..4829f66a47e7 100644 --- a/drivers/net/ethernet/sfc/siena/efx.c +++ b/drivers/net/ethernet/sfc/siena/efx.c @@ -996,9 +996,9 @@ static int efx_pci_probe_post_io(struct efx_nic *efx) }

/* Determine netdevice features */

• net_dev->features |= efx->type->offload_features;

• net_dev->features |= *efx->type->offload_features; netdev_active_features_set_array(net_dev, &efx_active_feature_set);

• if (efx->type->offload_features & (NETIF_F_IPV6_CSUM | NETIF_F_HW_CSUM))

• if (*efx->type->offload_features & (NETIF_F_IPV6_CSUM | NETIF_F_HW_CSUM)) net_dev->features |= NETIF_F_TSO6; /* Check whether device supports TSO */ if (!efx->type->tso_versions || !efx->type->tso_versions(efx))

@@ -1270,6 +1270,20 @@ static struct pci_driver efx_pci_driver = { #endif };

+static DECLARE_NETDEV_FEATURE_SET(siena_offload_feature_set,

• 		  NETIF_F_IP_CSUM_BIT,
  

• 		  NETIF_F_IPV6_CSUM_BIT,
  

• 		  NETIF_F_RXHASH_BIT,
  

• 		  NETIF_F_NTUPLE_BIT);
  

+netdev_features_t siena_offload_features __ro_after_init;

+static void __init efx_features_init(void) +{

• netdev_features_set_array(&siena_offload_feature_set,

• 		  &siena_offload_features);
  

+}

/**************************************************************************

• Kernel module interface

@@ -1300,6 +1314,8 @@ static int __init efx_init_module(void) if (rc < 0) goto err_pci;

• efx_features_init();

• return 0;

  err_pci:

diff --git a/drivers/net/ethernet/sfc/siena/efx.h b/drivers/net/ethernet/sfc/siena/efx.h index 27d1d3f19cae..6f1768a75ee8 100644 --- a/drivers/net/ethernet/sfc/siena/efx.h +++ b/drivers/net/ethernet/sfc/siena/efx.h @@ -12,6 +12,8 @@ #include "net_driver.h" #include "filter.h"

+extern netdev_features_t siena_offload_features __ro_after_init;

/* TX */ void efx_siena_init_tx_queue_core_txq(struct efx_tx_queue *tx_queue); netdev_tx_t efx_siena_hard_start_xmit(struct sk_buff *skb, diff --git a/drivers/net/ethernet/sfc/siena/net_driver.h b/drivers/net/ethernet/sfc/siena/net_driver.h index ff7bbc325952..331af932e56d 100644 --- a/drivers/net/ethernet/sfc/siena/net_driver.h +++ b/drivers/net/ethernet/sfc/siena/net_driver.h @@ -1473,7 +1473,7 @@ struct efx_nic_type { bool option_descriptors; unsigned int min_interrupt_mode; unsigned int timer_period_max;

• netdev_features_t offload_features;

• netdev_features_t *offload_features; int mcdi_max_ver; unsigned int max_rx_ip_filters; u32 hwtstamp_filters;

diff --git a/drivers/net/ethernet/sfc/siena/rx_common.c b/drivers/net/ethernet/sfc/siena/rx_common.c index 4579f43484c3..be17b8676fff 100644 --- a/drivers/net/ethernet/sfc/siena/rx_common.c +++ b/drivers/net/ethernet/sfc/siena/rx_common.c @@ -805,7 +805,7 @@ int efx_siena_probe_filters(struct efx_nic *efx) goto out_unlock;

#ifdef CONFIG_RFS_ACCEL

• if (efx->type->offload_features & NETIF_F_NTUPLE) {

• if (*efx->type->offload_features & NETIF_F_NTUPLE) { struct efx_channel *channel; int i, success = 1;

diff --git a/drivers/net/ethernet/sfc/siena/siena.c b/drivers/net/ethernet/sfc/siena/siena.c index a44c8fa25748..a92cf1bef772 100644 --- a/drivers/net/ethernet/sfc/siena/siena.c +++ b/drivers/net/ethernet/sfc/siena/siena.c @@ -1099,8 +1099,7 @@ const struct efx_nic_type siena_a0_nic_type = { .option_descriptors = false, .min_interrupt_mode = EFX_INT_MODE_LEGACY, .timer_period_max = 1 << FRF_CZ_TC_TIMER_VAL_WIDTH,

• .offload_features = (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |

• 	     NETIF_F_RXHASH | NETIF_F_NTUPLE),
  

• .offload_features = &siena_offload_features, .mcdi_max_ver = 1, .max_rx_ip_filters = FR_BZ_RX_FILTER_TBL0_ROWS, .hwtstamp_filters = (1 << HWTSTAMP_FILTER_NONE |