Commit 459a70ba authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 

Tony Nguyen says:

====================
ice: one by one port representors creation

Michal Swiatkowski says:

Currently ice supports creating port representors only for VFs. For that
use case they can be created and removed in one step.

This patchset is refactoring current flow to support port representor
creation also for subfunctions and SIOV. In this case port representors
need to be created and removed one by one. Also, they can be added and
removed while other port representors are running.

To achieve that we need to change the switchdev configuration flow.
Three first patches are only cosmetic (renaming, removing not used code).
Next few ones are preparation for new flow. The most important one
is "add VF representor one by one". It fully implements new flow.

New type of port representor (for subfunction) will be introduced in
follow up patchset.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  ice: reserve number of CP queues
  ice: adjust switchdev rebuild path
  ice: add VF representors one by one
  ice: realloc VSI stats arrays
  ice: set Tx topology every time new repr is added
  ice: allow changing SWITCHDEV_CTRL VSI queues
  ice: return pointer to representor
  ice: make representor code generic
  ice: remove VF pointer reference in eswitch code
  ice: track port representors in xarray
  ice: use repr instead of vf->repr
  ice: track q_id in representor
  ice: remove unused control VSI parameter
  ice: remove redundant max_vsi_num variable
  ice: rename switchdev to eswitch
====================

Link: https://lore.kernel.org/r/20231114181449.1290117-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a49296e0 19b39cae

drivers/net/ethernet/intel/ice/ice.h

+10 −3
Original line number Diff line number Diff line
@@ -522,11 +522,18 @@ enum ice_misc_thread_tasks { 
	ICE_MISC_THREAD_NBITS		/* must be last */

};



struct ice_switchdev_info {

struct ice_eswitch {

	struct ice_vsi *control_vsi;

	struct ice_vsi *uplink_vsi;

	struct ice_esw_br_offloads *br_offloads;

	struct xarray reprs;

	bool is_running;

	/* struct to allow cp queues management optimization */

	struct {

		int to_reach;

		int value;

		bool is_reaching;

	} qs;

};



struct ice_agg_node {
@@ -637,7 +644,7 @@ struct ice_pf { 
	struct ice_link_default_override_tlv link_dflt_override;

	struct ice_lag *lag; /* Link Aggregation information */



	struct ice_switchdev_info switchdev;

	struct ice_eswitch eswitch;

	struct ice_esw_br_port *br_port;



#define ICE_INVALID_AGG_NODE_ID		0
@@ -846,7 +853,7 @@ static inline struct ice_vsi *ice_find_vsi(struct ice_pf *pf, u16 vsi_num) 
 */

static inline bool ice_is_switchdev_running(struct ice_pf *pf)

{

	return pf->switchdev.is_running;

	return pf->eswitch.is_running;

}



#define ICE_FD_STAT_CTR_BLOCK_COUNT	256

drivers/net/ethernet/intel/ice/ice_devlink.c

+29 −0
Original line number Diff line number Diff line
@@ -810,6 +810,10 @@ static void ice_traverse_tx_tree(struct devlink *devlink, struct ice_sched_node 
	struct ice_vf *vf;

	int i;



	if (node->rate_node)

		/* already added, skip to the next */

		goto traverse_children;



	if (node->parent == tc_node) {

		/* create root node */

		rate_node = devl_rate_node_create(devlink, node, node->name, NULL);
@@ -831,6 +835,7 @@ static void ice_traverse_tx_tree(struct devlink *devlink, struct ice_sched_node 
	if (rate_node && !IS_ERR(rate_node))

		node->rate_node = rate_node;



traverse_children:

	for (i = 0; i < node->num_children; i++)

		ice_traverse_tx_tree(devlink, node->children[i], tc_node, pf);

}
@@ -861,6 +866,30 @@ int ice_devlink_rate_init_tx_topology(struct devlink *devlink, struct ice_vsi *v 
	return 0;

}



static void ice_clear_rate_nodes(struct ice_sched_node *node)

{

	node->rate_node = NULL;



	for (int i = 0; i < node->num_children; i++)

		ice_clear_rate_nodes(node->children[i]);

}



/**

 * ice_devlink_rate_clear_tx_topology - clear node->rate_node

 * @vsi: main vsi struct

 *

 * Clear rate_node to cleanup creation of Tx topology.

 *

 */

void ice_devlink_rate_clear_tx_topology(struct ice_vsi *vsi)

{

	struct ice_port_info *pi = vsi->port_info;



	mutex_lock(&pi->sched_lock);

	ice_clear_rate_nodes(pi->root->children[0]);

	mutex_unlock(&pi->sched_lock);

}



/**

 * ice_set_object_tx_share - sets node scheduling parameter

 * @pi: devlink struct instance

drivers/net/ethernet/intel/ice/ice_devlink.h

+1 −0
Original line number Diff line number Diff line
@@ -20,5 +20,6 @@ void ice_devlink_destroy_regions(struct ice_pf *pf); 


int ice_devlink_rate_init_tx_topology(struct devlink *devlink, struct ice_vsi *vsi);

void ice_tear_down_devlink_rate_tree(struct ice_pf *pf);

void ice_devlink_rate_clear_tx_topology(struct ice_vsi *vsi);



#endif /* _ICE_DEVLINK_H_ */

drivers/net/ethernet/intel/ice/ice_eswitch.c

+306 −256

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/intel/ice/ice_eswitch.h

+17 −5

File changed.

Preview size limit exceeded, changes collapsed.