Commit 24171a5a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Tony Nguyen
Browse files

ethernet: intel: fix building with large NR_CPUS 



With large values of CONFIG_NR_CPUS, three Intel ethernet drivers fail to
compile like:

In function ‘i40e_free_q_vector’,
    inlined from ‘i40e_vsi_alloc_q_vectors’ at drivers/net/ethernet/intel/i40e/i40e_main.c:12112:3:
  571 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
include/linux/rcupdate.h:1084:17: note: in expansion of macro ‘BUILD_BUG_ON’
 1084 |                 BUILD_BUG_ON(offsetof(typeof(*(ptr)), rhf) >= 4096);    \
drivers/net/ethernet/intel/i40e/i40e_main.c:5113:9: note: in expansion of macro ‘kfree_rcu’
 5113 |         kfree_rcu(q_vector, rcu);
      |         ^~~~~~~~~

The problem is that the 'rcu' member in 'q_vector' is too far from the start
of the structure. Move this member before the CPU mask instead, in all three
drivers.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Reviewed-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Reviewed-by: default avatarAlexander Lobakin <aleksander.lobakin@intel.com>
Tested-by: Sunitha Mekala <sunithax.d.mekala@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 0e941896

drivers/net/ethernet/intel/fm10k/fm10k.h

+2 −1
Original line number Diff line number Diff line
@@ -189,13 +189,14 @@ struct fm10k_q_vector { 
	struct fm10k_ring_container rx, tx;



	struct napi_struct napi;

	struct rcu_head rcu;	/* to avoid race with update stats on free */



	cpumask_t affinity_mask;

	char name[IFNAMSIZ + 9];



#ifdef CONFIG_DEBUG_FS

	struct dentry *dbg_q_vector;

#endif /* CONFIG_DEBUG_FS */

	struct rcu_head rcu;	/* to avoid race with update stats on free */



	/* for dynamic allocation of rings associated with this q_vector */

	struct fm10k_ring ring[] ____cacheline_internodealigned_in_smp;

drivers/net/ethernet/intel/i40e/i40e.h

+1 −1
Original line number Diff line number Diff line
@@ -945,6 +945,7 @@ struct i40e_q_vector { 
	u16 reg_idx;		/* register index of the interrupt */



	struct napi_struct napi;

	struct rcu_head rcu;	/* to avoid race with update stats on free */



	struct i40e_ring_container rx;

	struct i40e_ring_container tx;
@@ -955,7 +956,6 @@ struct i40e_q_vector { 
	cpumask_t affinity_mask;

	struct irq_affinity_notify affinity_notify;



	struct rcu_head rcu;	/* to avoid race with update stats on free */

	char name[I40E_INT_NAME_STR_LEN];

	bool arm_wb_state;

	bool in_busy_poll;

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+2 −1
Original line number Diff line number Diff line
@@ -507,9 +507,10 @@ struct ixgbe_q_vector { 
	struct ixgbe_ring_container rx, tx;



	struct napi_struct napi;

	struct rcu_head rcu;	/* to avoid race with update stats on free */



	cpumask_t affinity_mask;

	int numa_node;

	struct rcu_head rcu;	/* to avoid race with update stats on free */

	char name[IFNAMSIZ + 9];



	/* for dynamic allocation of rings associated with this q_vector */