* [PATCH net-next v3 01/15] ice: add new VSI type for subfunctions
2024-08-08 17:30 [PATCH net-next v3 00/15][pull request] ice: support devlink subfunction Tony Nguyen
@ 2024-08-08 17:30 ` Tony Nguyen
2024-08-08 17:30 ` [PATCH net-next v3 02/15] ice: export ice ndo_ops functions Tony Nguyen
` (13 subsequent siblings)
14 siblings, 0 replies; 26+ messages in thread
From: Tony Nguyen @ 2024-08-08 17:30 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Piotr Raczynski, anthony.l.nguyen, michal.swiatkowski, jiri,
shayd, wojciech.drewek, horms, sridhar.samudrala,
mateusz.polchlopek, kalesh-anakkur.purayil, michal.kubiak,
pio.raczynski, przemyslaw.kitszel, jacob.e.keller,
maciej.fijalkowski, Rafal Romanowski
From: Piotr Raczynski <piotr.raczynski@intel.com>
Add required plumbing for new VSI type dedicated to devlink subfunctions.
Make sure that the vsi is properly configured and destroyed. Also allow
loading XDP and AF_XDP sockets.
The first implementation of devlink subfunctions supports only one Tx/Rx
queue pair per given subfunction.
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: Piotr Raczynski <piotr.raczynski@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ice/ice_base.c | 5 +++-
drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 1 +
drivers/net/ethernet/intel/ice/ice_lib.c | 25 ++++++++++++++++++--
drivers/net/ethernet/intel/ice/ice_main.c | 7 ++++--
drivers/net/ethernet/intel/ice/ice_type.h | 1 +
drivers/net/ethernet/intel/ice/ice_xsk.c | 2 +-
6 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c
index 1facf179a96f..bcc59dea7564 100644
--- a/drivers/net/ethernet/intel/ice/ice_base.c
+++ b/drivers/net/ethernet/intel/ice/ice_base.c
@@ -330,6 +330,9 @@ ice_setup_tx_ctx(struct ice_tx_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf
tlan_ctx->vmvf_num = hw->func_caps.vf_base_id + vsi->vf->vf_id;
tlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_VF;
break;
+ case ICE_VSI_SF:
+ tlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_VMQ;
+ break;
default:
return;
}
@@ -526,7 +529,7 @@ static int ice_vsi_cfg_rxq(struct ice_rx_ring *ring)
ring->rx_buf_len = ring->vsi->rx_buf_len;
- if (ring->vsi->type == ICE_VSI_PF) {
+ if (ring->vsi->type == ICE_VSI_PF || ring->vsi->type == ICE_VSI_SF) {
if (!xdp_rxq_info_is_reg(&ring->xdp_rxq)) {
err = __xdp_rxq_info_reg(&ring->xdp_rxq, ring->netdev,
ring->q_index,
diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c
index a94e7072b570..a7c510832824 100644
--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c
@@ -187,6 +187,7 @@ void ice_vsi_set_dcb_tc_cfg(struct ice_vsi *vsi)
vsi->tc_cfg.numtc = ice_dcb_get_num_tc(cfg);
break;
case ICE_VSI_CHNL:
+ case ICE_VSI_SF:
vsi->tc_cfg.ena_tc = BIT(ice_get_first_droptc(vsi));
vsi->tc_cfg.numtc = 1;
break;
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index f559e60992fa..be1e65bafe13 100644
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -20,6 +20,8 @@ const char *ice_vsi_type_str(enum ice_vsi_type vsi_type)
return "ICE_VSI_PF";
case ICE_VSI_VF:
return "ICE_VSI_VF";
+ case ICE_VSI_SF:
+ return "ICE_VSI_SF";
case ICE_VSI_CTRL:
return "ICE_VSI_CTRL";
case ICE_VSI_CHNL:
@@ -135,6 +137,7 @@ static void ice_vsi_set_num_desc(struct ice_vsi *vsi)
{
switch (vsi->type) {
case ICE_VSI_PF:
+ case ICE_VSI_SF:
case ICE_VSI_CTRL:
case ICE_VSI_LB:
/* a user could change the values of num_[tr]x_desc using
@@ -201,6 +204,12 @@ static void ice_vsi_set_num_qs(struct ice_vsi *vsi)
max_t(int, vsi->alloc_rxq,
vsi->alloc_txq));
break;
+ case ICE_VSI_SF:
+ vsi->alloc_txq = 1;
+ vsi->alloc_rxq = 1;
+ vsi->num_q_vectors = 1;
+ vsi->irq_dyn_alloc = true;
+ break;
case ICE_VSI_VF:
if (vf->num_req_qs)
vf->num_vf_qs = vf->num_req_qs;
@@ -558,6 +567,7 @@ ice_vsi_alloc_def(struct ice_vsi *vsi, struct ice_channel *ch)
switch (vsi->type) {
case ICE_VSI_PF:
+ case ICE_VSI_SF:
/* Setup default MSIX irq handler for VSI */
vsi->irq_handler = ice_msix_clean_rings;
break;
@@ -886,6 +896,11 @@ static void ice_vsi_set_rss_params(struct ice_vsi *vsi)
max_rss_size);
vsi->rss_lut_type = ICE_LUT_PF;
break;
+ case ICE_VSI_SF:
+ vsi->rss_table_size = ICE_LUT_VSI_SIZE;
+ vsi->rss_size = min_t(u16, num_online_cpus(), max_rss_size);
+ vsi->rss_lut_type = ICE_LUT_VSI;
+ break;
case ICE_VSI_VF:
/* VF VSI will get a small RSS table.
* For VSI_LUT, LUT size should be set to 64 bytes.
@@ -1133,6 +1148,7 @@ static void ice_set_rss_vsi_ctx(struct ice_vsi_ctx *ctxt, struct ice_vsi *vsi)
lut_type = ICE_AQ_VSI_Q_OPT_RSS_LUT_PF;
break;
case ICE_VSI_VF:
+ case ICE_VSI_SF:
/* VF VSI will gets a small RSS table which is a VSI LUT type */
lut_type = ICE_AQ_VSI_Q_OPT_RSS_LUT_VSI;
break;
@@ -1211,6 +1227,7 @@ static int ice_vsi_init(struct ice_vsi *vsi, u32 vsi_flags)
case ICE_VSI_PF:
ctxt->flags = ICE_AQ_VSI_TYPE_PF;
break;
+ case ICE_VSI_SF:
case ICE_VSI_CHNL:
ctxt->flags = ICE_AQ_VSI_TYPE_VMDQ2;
break;
@@ -2092,6 +2109,7 @@ static void ice_set_agg_vsi(struct ice_vsi *vsi)
case ICE_VSI_CHNL:
case ICE_VSI_LB:
case ICE_VSI_PF:
+ case ICE_VSI_SF:
max_agg_nodes = ICE_MAX_PF_AGG_NODES;
agg_node_id_start = ICE_PF_AGG_NODE_ID_START;
agg_node_iter = &pf->pf_agg_node[0];
@@ -2261,6 +2279,7 @@ static int ice_vsi_cfg_def(struct ice_vsi *vsi)
switch (vsi->type) {
case ICE_VSI_CTRL:
+ case ICE_VSI_SF:
case ICE_VSI_PF:
ret = ice_vsi_alloc_q_vectors(vsi);
if (ret)
@@ -2647,7 +2666,8 @@ int ice_ena_vsi(struct ice_vsi *vsi, bool locked)
clear_bit(ICE_VSI_NEEDS_RESTART, vsi->state);
- if (vsi->netdev && vsi->type == ICE_VSI_PF) {
+ if (vsi->netdev && (vsi->type == ICE_VSI_PF ||
+ vsi->type == ICE_VSI_SF)) {
if (netif_running(vsi->netdev)) {
if (!locked)
rtnl_lock();
@@ -2676,7 +2696,8 @@ void ice_dis_vsi(struct ice_vsi *vsi, bool locked)
set_bit(ICE_VSI_NEEDS_RESTART, vsi->state);
- if (vsi->type == ICE_VSI_PF && vsi->netdev) {
+ if (vsi->netdev && (vsi->type == ICE_VSI_PF ||
+ vsi->type == ICE_VSI_SF)) {
if (netif_running(vsi->netdev)) {
if (!locked)
rtnl_lock();
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 3de020020bc4..5986f676062d 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -2968,6 +2968,9 @@ int ice_vsi_determine_xdp_res(struct ice_vsi *vsi)
if (avail < cpus / 2)
return -ENOMEM;
+ if (vsi->type == ICE_VSI_SF)
+ avail = vsi->alloc_txq;
+
vsi->num_xdp_txq = min_t(u16, avail, cpus);
if (vsi->num_xdp_txq < cpus)
@@ -3084,8 +3087,8 @@ static int ice_xdp(struct net_device *dev, struct netdev_bpf *xdp)
struct ice_netdev_priv *np = netdev_priv(dev);
struct ice_vsi *vsi = np->vsi;
- if (vsi->type != ICE_VSI_PF) {
- NL_SET_ERR_MSG_MOD(xdp->extack, "XDP can be loaded only on PF VSI");
+ if (vsi->type != ICE_VSI_PF && vsi->type != ICE_VSI_SF) {
+ NL_SET_ERR_MSG_MOD(xdp->extack, "XDP can be loaded only on PF or SF VSI");
return -EINVAL;
}
diff --git a/drivers/net/ethernet/intel/ice/ice_type.h b/drivers/net/ethernet/intel/ice/ice_type.h
index 96037bef3e78..cf98bf8415c3 100644
--- a/drivers/net/ethernet/intel/ice/ice_type.h
+++ b/drivers/net/ethernet/intel/ice/ice_type.h
@@ -158,6 +158,7 @@ enum ice_vsi_type {
ICE_VSI_CTRL = 3, /* equates to ICE_VSI_PF with 1 queue pair */
ICE_VSI_CHNL = 4,
ICE_VSI_LB = 6,
+ ICE_VSI_SF = 9,
};
struct ice_link_status {
diff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c
index 240a7bec242b..b918cce8dee6 100644
--- a/drivers/net/ethernet/intel/ice/ice_xsk.c
+++ b/drivers/net/ethernet/intel/ice/ice_xsk.c
@@ -298,7 +298,7 @@ ice_xsk_pool_enable(struct ice_vsi *vsi, struct xsk_buff_pool *pool, u16 qid)
{
int err;
- if (vsi->type != ICE_VSI_PF)
+ if (vsi->type != ICE_VSI_PF && vsi->type != ICE_VSI_SF)
return -EINVAL;
if (qid >= vsi->netdev->real_num_rx_queues ||
--
2.42.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next v3 02/15] ice: export ice ndo_ops functions
2024-08-08 17:30 [PATCH net-next v3 00/15][pull request] ice: support devlink subfunction Tony Nguyen
2024-08-08 17:30 ` [PATCH net-next v3 01/15] ice: add new VSI type for subfunctions Tony Nguyen
@ 2024-08-08 17:30 ` Tony Nguyen
2024-08-08 17:30 ` [PATCH net-next v3 03/15] ice: add basic devlink subfunctions support Tony Nguyen
` (12 subsequent siblings)
14 siblings, 0 replies; 26+ messages in thread
From: Tony Nguyen @ 2024-08-08 17:30 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Piotr Raczynski, anthony.l.nguyen, michal.swiatkowski, jiri,
shayd, wojciech.drewek, horms, sridhar.samudrala,
mateusz.polchlopek, kalesh-anakkur.purayil, michal.kubiak,
pio.raczynski, przemyslaw.kitszel, jacob.e.keller,
maciej.fijalkowski, Rafal Romanowski
From: Piotr Raczynski <piotr.raczynski@intel.com>
Make some of the netdevice_ops functions visible from outside for
another VSI type created netdev.
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: Piotr Raczynski <piotr.raczynski@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ice/ice.h | 8 +++++
drivers/net/ethernet/intel/ice/ice_lib.c | 22 ++++++++++++++
drivers/net/ethernet/intel/ice/ice_lib.h | 1 +
drivers/net/ethernet/intel/ice/ice_main.c | 37 ++++-------------------
4 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index caaa10157909..59885228cccf 100644
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -1001,6 +1001,14 @@ void ice_unload(struct ice_pf *pf);
void ice_adv_lnk_speed_maps_init(void);
int ice_init_dev(struct ice_pf *pf);
void ice_deinit_dev(struct ice_pf *pf);
+int ice_change_mtu(struct net_device *netdev, int new_mtu);
+void ice_tx_timeout(struct net_device *netdev, unsigned int txqueue);
+int ice_xdp(struct net_device *dev, struct netdev_bpf *xdp);
+void ice_set_netdev_features(struct net_device *netdev);
+int ice_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid);
+int ice_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid);
+void ice_get_stats64(struct net_device *netdev,
+ struct rtnl_link_stats64 *stats);
/**
* ice_set_rdma_cap - enable RDMA support
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index be1e65bafe13..56bbc3ebf9dc 100644
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -2831,6 +2831,28 @@ void ice_vsi_set_napi_queues(struct ice_vsi *vsi)
ice_q_vector_set_napi_queues(vsi->q_vectors[i]);
}
+/**
+ * ice_napi_add - register NAPI handler for the VSI
+ * @vsi: VSI for which NAPI handler is to be registered
+ *
+ * This function is only called in the driver's load path. Registering the NAPI
+ * handler is done in ice_vsi_alloc_q_vector() for all other cases (i.e. resume,
+ * reset/rebuild, etc.)
+ */
+void ice_napi_add(struct ice_vsi *vsi)
+{
+ int v_idx;
+
+ if (!vsi->netdev)
+ return;
+
+ ice_for_each_q_vector(vsi, v_idx) {
+ netif_napi_add(vsi->netdev, &vsi->q_vectors[v_idx]->napi,
+ ice_napi_poll);
+ __ice_q_vector_set_napi_queues(vsi->q_vectors[v_idx], false);
+ }
+}
+
/**
* ice_vsi_release - Delete a VSI and free its resources
* @vsi: the VSI being removed
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.h b/drivers/net/ethernet/intel/ice/ice_lib.h
index 94ce8964dda6..f9ee461c5c06 100644
--- a/drivers/net/ethernet/intel/ice/ice_lib.h
+++ b/drivers/net/ethernet/intel/ice/ice_lib.h
@@ -53,6 +53,7 @@ void __ice_q_vector_set_napi_queues(struct ice_q_vector *q_vector, bool locked);
void ice_q_vector_set_napi_queues(struct ice_q_vector *q_vector);
void ice_vsi_set_napi_queues(struct ice_vsi *vsi);
+void ice_napi_add(struct ice_vsi *vsi);
int ice_vsi_release(struct ice_vsi *vsi);
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 5986f676062d..d8a89a6152a1 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -3082,7 +3082,7 @@ static int ice_xdp_safe_mode(struct net_device __always_unused *dev,
* @dev: netdevice
* @xdp: XDP command
*/
-static int ice_xdp(struct net_device *dev, struct netdev_bpf *xdp)
+int ice_xdp(struct net_device *dev, struct netdev_bpf *xdp)
{
struct ice_netdev_priv *np = netdev_priv(dev);
struct ice_vsi *vsi = np->vsi;
@@ -3541,28 +3541,6 @@ static int ice_req_irq_msix_misc(struct ice_pf *pf)
return 0;
}
-/**
- * ice_napi_add - register NAPI handler for the VSI
- * @vsi: VSI for which NAPI handler is to be registered
- *
- * This function is only called in the driver's load path. Registering the NAPI
- * handler is done in ice_vsi_alloc_q_vector() for all other cases (i.e. resume,
- * reset/rebuild, etc.)
- */
-static void ice_napi_add(struct ice_vsi *vsi)
-{
- int v_idx;
-
- if (!vsi->netdev)
- return;
-
- ice_for_each_q_vector(vsi, v_idx) {
- netif_napi_add(vsi->netdev, &vsi->q_vectors[v_idx]->napi,
- ice_napi_poll);
- __ice_q_vector_set_napi_queues(vsi->q_vectors[v_idx], false);
- }
-}
-
/**
* ice_set_ops - set netdev and ethtools ops for the given netdev
* @vsi: the VSI associated with the new netdev
@@ -3596,7 +3574,7 @@ static void ice_set_ops(struct ice_vsi *vsi)
* ice_set_netdev_features - set features for the given netdev
* @netdev: netdev instance
*/
-static void ice_set_netdev_features(struct net_device *netdev)
+void ice_set_netdev_features(struct net_device *netdev)
{
struct ice_pf *pf = ice_netdev_to_pf(netdev);
bool is_dvm_ena = ice_is_dvm_ena(&pf->hw);
@@ -3778,8 +3756,7 @@ ice_lb_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi)
*
* net_device_ops implementation for adding VLAN IDs
*/
-static int
-ice_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)
+int ice_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)
{
struct ice_netdev_priv *np = netdev_priv(netdev);
struct ice_vsi_vlan_ops *vlan_ops;
@@ -3841,8 +3818,7 @@ ice_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)
*
* net_device_ops implementation for removing VLAN IDs
*/
-static int
-ice_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)
+int ice_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)
{
struct ice_netdev_priv *np = netdev_priv(netdev);
struct ice_vsi_vlan_ops *vlan_ops;
@@ -7103,7 +7079,6 @@ void ice_update_pf_stats(struct ice_pf *pf)
* @netdev: network interface device structure
* @stats: main device statistics structure
*/
-static
void ice_get_stats64(struct net_device *netdev, struct rtnl_link_stats64 *stats)
{
struct ice_netdev_priv *np = netdev_priv(netdev);
@@ -7774,7 +7749,7 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type)
*
* Returns 0 on success, negative on failure
*/
-static int ice_change_mtu(struct net_device *netdev, int new_mtu)
+int ice_change_mtu(struct net_device *netdev, int new_mtu)
{
struct ice_netdev_priv *np = netdev_priv(netdev);
struct ice_vsi *vsi = np->vsi;
@@ -8198,7 +8173,7 @@ ice_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,
* @netdev: network interface device structure
* @txqueue: Tx queue
*/
-static void ice_tx_timeout(struct net_device *netdev, unsigned int txqueue)
+void ice_tx_timeout(struct net_device *netdev, unsigned int txqueue)
{
struct ice_netdev_priv *np = netdev_priv(netdev);
struct ice_tx_ring *tx_ring = NULL;
--
2.42.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next v3 03/15] ice: add basic devlink subfunctions support
2024-08-08 17:30 [PATCH net-next v3 00/15][pull request] ice: support devlink subfunction Tony Nguyen
2024-08-08 17:30 ` [PATCH net-next v3 01/15] ice: add new VSI type for subfunctions Tony Nguyen
2024-08-08 17:30 ` [PATCH net-next v3 02/15] ice: export ice ndo_ops functions Tony Nguyen
@ 2024-08-08 17:30 ` Tony Nguyen
2024-08-09 11:16 ` Jiri Pirko
2024-08-08 17:30 ` [PATCH net-next v3 04/15] ice: treat subfunction VSI the same as PF VSI Tony Nguyen
` (11 subsequent siblings)
14 siblings, 1 reply; 26+ messages in thread
From: Tony Nguyen @ 2024-08-08 17:30 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Piotr Raczynski, anthony.l.nguyen, michal.swiatkowski, jiri,
shayd, wojciech.drewek, horms, sridhar.samudrala,
mateusz.polchlopek, kalesh-anakkur.purayil, michal.kubiak,
pio.raczynski, przemyslaw.kitszel, jacob.e.keller,
maciej.fijalkowski, Rafal Romanowski
From: Piotr Raczynski <piotr.raczynski@intel.com>
Implement devlink port handlers responsible for ethernet type devlink
subfunctions. Create subfunction devlink port and setup all resources
needed for a subfunction netdev to operate. Configure new VSI for each
new subfunction, initialize and configure interrupts and Tx/Rx resources.
Set correct MAC filters and create new netdev.
For now, subfunction is limited to only one Tx/Rx queue pair.
Only allocate new subfunction VSI with devlink port new command.
Allocate and free subfunction MSIX interrupt vectors using new API
calls with pci_msix_alloc_irq_at and pci_msix_free_irq.
Support both automatic and manual subfunction numbers. If no subfunction
number is provided, use xa_alloc to pick a number automatically. This
will find the first free index and use that as the number. This reduces
burden on users in the simple case where a specific number is not
required. It may also be slightly faster to check that a number exists
since xarray lookup should be faster than a linear scan of the dyn_ports
xarray.
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Co-developed-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Piotr Raczynski <piotr.raczynski@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
.../net/ethernet/intel/ice/devlink/devlink.c | 3 +
.../ethernet/intel/ice/devlink/devlink_port.c | 288 ++++++++++++++++++
.../ethernet/intel/ice/devlink/devlink_port.h | 34 +++
drivers/net/ethernet/intel/ice/ice.h | 4 +
drivers/net/ethernet/intel/ice/ice_lib.c | 5 +-
drivers/net/ethernet/intel/ice/ice_lib.h | 2 +
drivers/net/ethernet/intel/ice/ice_main.c | 7 +
7 files changed, 341 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink.c b/drivers/net/ethernet/intel/ice/devlink/devlink.c
index 810a901d7afd..b7eb1b56f2c6 100644
--- a/drivers/net/ethernet/intel/ice/devlink/devlink.c
+++ b/drivers/net/ethernet/intel/ice/devlink/devlink.c
@@ -6,6 +6,7 @@
#include "ice.h"
#include "ice_lib.h"
#include "devlink.h"
+#include "devlink_port.h"
#include "ice_eswitch.h"
#include "ice_fw_update.h"
#include "ice_dcb_lib.h"
@@ -1277,6 +1278,8 @@ static const struct devlink_ops ice_devlink_ops = {
.rate_leaf_parent_set = ice_devlink_set_parent,
.rate_node_parent_set = ice_devlink_set_parent,
+
+ .port_new = ice_devlink_port_new,
};
static int
diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
index 00fed5a61d62..5d1fe08e4bab 100644
--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
@@ -5,6 +5,9 @@
#include "ice.h"
#include "devlink.h"
+#include "devlink_port.h"
+#include "ice_lib.h"
+#include "ice_fltr.h"
static int ice_active_port_option = -1;
@@ -485,3 +488,288 @@ void ice_devlink_destroy_vf_port(struct ice_vf *vf)
devl_rate_leaf_destroy(&vf->devlink_port);
devl_port_unregister(&vf->devlink_port);
}
+
+/**
+ * ice_dealloc_dynamic_port - Deallocate and remove a dynamic port
+ * @dyn_port: dynamic port instance to deallocate
+ *
+ * Free resources associated with a dynamically added devlink port. Will
+ * deactivate the port if its currently active.
+ */
+static void ice_dealloc_dynamic_port(struct ice_dynamic_port *dyn_port)
+{
+ struct devlink_port *devlink_port = &dyn_port->devlink_port;
+ struct ice_pf *pf = dyn_port->pf;
+
+ xa_erase(&pf->sf_nums, devlink_port->attrs.pci_sf.sf);
+ devl_port_unregister(devlink_port);
+ ice_vsi_free(dyn_port->vsi);
+ xa_erase(&pf->dyn_ports, dyn_port->vsi->idx);
+ kfree(dyn_port);
+}
+
+/**
+ * ice_dealloc_all_dynamic_ports - Deallocate all dynamic devlink ports
+ * @pf: pointer to the pf structure
+ */
+void ice_dealloc_all_dynamic_ports(struct ice_pf *pf)
+{
+ struct ice_dynamic_port *dyn_port;
+ unsigned long index;
+
+ xa_for_each(&pf->dyn_ports, index, dyn_port)
+ ice_dealloc_dynamic_port(dyn_port);
+}
+
+/**
+ * ice_devlink_port_new_check_attr - Check that new port attributes are valid
+ * @pf: pointer to the PF structure
+ * @new_attr: the attributes for the new port
+ * @extack: extack for reporting error messages
+ *
+ * Check that the attributes for the new port are valid before continuing to
+ * allocate the devlink port.
+ *
+ * Return: zero on success or an error code on failure.
+ */
+static int
+ice_devlink_port_new_check_attr(struct ice_pf *pf,
+ const struct devlink_port_new_attrs *new_attr,
+ struct netlink_ext_ack *extack)
+{
+ if (new_attr->flavour != DEVLINK_PORT_FLAVOUR_PCI_SF) {
+ NL_SET_ERR_MSG_MOD(extack, "Flavour other than pcisf is not supported");
+ return -EOPNOTSUPP;
+ }
+
+ if (new_attr->controller_valid) {
+ NL_SET_ERR_MSG_MOD(extack, "Setting controller is not supported");
+ return -EOPNOTSUPP;
+ }
+
+ if (new_attr->port_index_valid) {
+ NL_SET_ERR_MSG_MOD(extack, "Port index is invalid");
+ return -EOPNOTSUPP;
+ }
+
+ if (new_attr->pfnum != pf->hw.bus.func) {
+ NL_SET_ERR_MSG_MOD(extack, "Incorrect pfnum supplied");
+ return -EINVAL;
+ }
+
+ if (!pci_msix_can_alloc_dyn(pf->pdev)) {
+ NL_SET_ERR_MSG_MOD(extack, "Dynamic MSIX-X interrupt allocation is not supported");
+ return -EOPNOTSUPP;
+ }
+
+ return 0;
+}
+
+/**
+ * ice_devlink_port_del - devlink handler for port delete
+ * @devlink: pointer to devlink
+ * @port: devlink port to be deleted
+ * @extack: pointer to extack
+ *
+ * Deletes devlink port and deallocates all resources associated with
+ * created subfunction.
+ *
+ * Return: zero on success or an error code on failure.
+ */
+static int
+ice_devlink_port_del(struct devlink *devlink, struct devlink_port *port,
+ struct netlink_ext_ack *extack)
+{
+ struct ice_dynamic_port *dyn_port;
+
+ dyn_port = ice_devlink_port_to_dyn(port);
+ ice_dealloc_dynamic_port(dyn_port);
+
+ return 0;
+}
+
+static const struct devlink_port_ops ice_devlink_port_sf_ops = {
+ .port_del = ice_devlink_port_del,
+};
+
+/**
+ * ice_reserve_sf_num - Reserve a subfunction number for this port
+ * @pf: pointer to the pf structure
+ * @new_attr: devlink port attributes requested
+ * @extack: extack for reporting error messages
+ * @sfnum: on success, the sf number reserved
+ *
+ * Reserve a subfunction number for this port. Only called for
+ * DEVLINK_PORT_FLAVOUR_PCI_SF ports.
+ *
+ * Return: zero on success or an error code on failure.
+ */
+static int
+ice_reserve_sf_num(struct ice_pf *pf,
+ const struct devlink_port_new_attrs *new_attr,
+ struct netlink_ext_ack *extack, u32 *sfnum)
+{
+ int err;
+
+ /* If user didn't request an explicit number, pick one */
+ if (!new_attr->sfnum_valid)
+ return xa_alloc(&pf->sf_nums, sfnum, NULL, xa_limit_32b,
+ GFP_KERNEL);
+
+ /* Otherwise, check and use the number provided */
+ err = xa_insert(&pf->sf_nums, new_attr->sfnum, NULL, GFP_KERNEL);
+ if (err) {
+ if (err == -EBUSY)
+ NL_SET_ERR_MSG_MOD(extack, "Subfunction with given sfnum already exists");
+ return err;
+ }
+
+ *sfnum = new_attr->sfnum;
+
+ return 0;
+}
+
+/**
+ * ice_devlink_create_sf_port - Register PCI subfunction devlink port
+ * @dyn_port: the dynamic port instance structure for this subfunction
+ *
+ * Register PCI subfunction flavour devlink port for a dynamically added
+ * subfunction port.
+ *
+ * Return: zero on success or an error code on failure.
+ */
+int ice_devlink_create_sf_port(struct ice_dynamic_port *dyn_port)
+{
+ struct devlink_port_attrs attrs = {};
+ struct devlink_port *devlink_port;
+ struct devlink *devlink;
+ struct ice_vsi *vsi;
+ struct ice_pf *pf;
+
+ vsi = dyn_port->vsi;
+ pf = dyn_port->pf;
+
+ devlink_port = &dyn_port->devlink_port;
+
+ attrs.flavour = DEVLINK_PORT_FLAVOUR_PCI_SF;
+ attrs.pci_sf.pf = pf->hw.bus.func;
+ attrs.pci_sf.sf = dyn_port->sfnum;
+
+ devlink_port_attrs_set(devlink_port, &attrs);
+ devlink = priv_to_devlink(pf);
+
+ return devl_port_register_with_ops(devlink, devlink_port, vsi->idx,
+ &ice_devlink_port_sf_ops);
+}
+
+/**
+ * ice_devlink_destroy_sf_port - Destroy the devlink_port for this SF
+ * @dyn_port: the dynamic port instance structure for this subfunction
+ *
+ * Unregisters the devlink_port structure associated with this SF.
+ */
+void ice_devlink_destroy_sf_port(struct ice_dynamic_port *dyn_port)
+{
+ devl_port_unregister(&dyn_port->devlink_port);
+}
+
+/**
+ * ice_alloc_dynamic_port - Allocate new dynamic port
+ * @pf: pointer to the pf structure
+ * @new_attr: devlink port attributes requested
+ * @extack: extack for reporting error messages
+ * @devlink_port: index of newly created devlink port
+ *
+ * Allocate a new dynamic port instance and prepare it for configuration
+ * with devlink.
+ *
+ * Return: zero on success or an error code on failure.
+ */
+static int
+ice_alloc_dynamic_port(struct ice_pf *pf,
+ const struct devlink_port_new_attrs *new_attr,
+ struct netlink_ext_ack *extack,
+ struct devlink_port **devlink_port)
+{
+ struct ice_dynamic_port *dyn_port;
+ struct ice_vsi *vsi;
+ u32 sfnum;
+ int err;
+
+ err = ice_reserve_sf_num(pf, new_attr, extack, &sfnum);
+ if (err)
+ return err;
+
+ dyn_port = kzalloc(sizeof(*dyn_port), GFP_KERNEL);
+ if (!dyn_port) {
+ err = -ENOMEM;
+ goto unroll_reserve_sf_num;
+ }
+
+ vsi = ice_vsi_alloc(pf);
+ if (!vsi) {
+ NL_SET_ERR_MSG_MOD(extack, "Unable to allocate VSI");
+ err = -ENOMEM;
+ goto unroll_dyn_port_alloc;
+ }
+
+ dyn_port->vsi = vsi;
+ dyn_port->pf = pf;
+ dyn_port->sfnum = sfnum;
+ eth_random_addr(dyn_port->hw_addr);
+
+ err = xa_insert(&pf->dyn_ports, vsi->idx, dyn_port, GFP_KERNEL);
+ if (err) {
+ NL_SET_ERR_MSG_MOD(extack, "Port index reservation failed");
+ goto unroll_vsi_alloc;
+ }
+
+ err = ice_devlink_create_sf_port(dyn_port);
+ if (err) {
+ NL_SET_ERR_MSG_MOD(extack, "Port registration failed");
+ goto unroll_xa_insert;
+ }
+
+ *devlink_port = &dyn_port->devlink_port;
+
+ return 0;
+
+unroll_xa_insert:
+ xa_erase(&pf->dyn_ports, vsi->idx);
+unroll_vsi_alloc:
+ ice_vsi_free(vsi);
+unroll_dyn_port_alloc:
+ kfree(dyn_port);
+unroll_reserve_sf_num:
+ xa_erase(&pf->sf_nums, sfnum);
+
+ return err;
+}
+
+/**
+ * ice_devlink_port_new - devlink handler for the new port
+ * @devlink: pointer to devlink
+ * @new_attr: pointer to the port new attributes
+ * @extack: extack for reporting error messages
+ * @devlink_port: pointer to a new port
+ *
+ * Creates new devlink port, checks new port attributes and reject
+ * any unsupported parameters, allocates new subfunction for that port.
+ *
+ * Return: zero on success or an error code on failure.
+ */
+int
+ice_devlink_port_new(struct devlink *devlink,
+ const struct devlink_port_new_attrs *new_attr,
+ struct netlink_ext_ack *extack,
+ struct devlink_port **devlink_port)
+{
+ struct ice_pf *pf = devlink_priv(devlink);
+ int err;
+
+ err = ice_devlink_port_new_check_attr(pf, new_attr, extack);
+ if (err)
+ return err;
+
+ return ice_alloc_dynamic_port(pf, new_attr, extack, devlink_port);
+}
diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
index 9223bcdb6444..08ebf56664a5 100644
--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
@@ -4,9 +4,43 @@
#ifndef _DEVLINK_PORT_H_
#define _DEVLINK_PORT_H_
+#include "../ice.h"
+
+/**
+ * struct ice_dynamic_port - Track dynamically added devlink port instance
+ * @hw_addr: the HW address for this port
+ * @active: true if the port has been activated
+ * @devlink_port: the associated devlink port structure
+ * @pf: pointer to the PF private structure
+ * @vsi: the VSI associated with this port
+ * @sfnum: the subfunction ID
+ *
+ * An instance of a dynamically added devlink port. Each port flavour
+ */
+struct ice_dynamic_port {
+ u8 hw_addr[ETH_ALEN];
+ u8 active: 1;
+ struct devlink_port devlink_port;
+ struct ice_pf *pf;
+ struct ice_vsi *vsi;
+ u32 sfnum;
+};
+
+void ice_dealloc_all_dynamic_ports(struct ice_pf *pf);
+
int ice_devlink_create_pf_port(struct ice_pf *pf);
void ice_devlink_destroy_pf_port(struct ice_pf *pf);
int ice_devlink_create_vf_port(struct ice_vf *vf);
void ice_devlink_destroy_vf_port(struct ice_vf *vf);
+int ice_devlink_create_sf_port(struct ice_dynamic_port *dyn_port);
+void ice_devlink_destroy_sf_port(struct ice_dynamic_port *dyn_port);
+
+#define ice_devlink_port_to_dyn(port) \
+ container_of(port, struct ice_dynamic_port, devlink_port)
+int
+ice_devlink_port_new(struct devlink *devlink,
+ const struct devlink_port_new_attrs *new_attr,
+ struct netlink_ext_ack *extack,
+ struct devlink_port **devlink_port);
#endif /* _DEVLINK_PORT_H_ */
diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index 59885228cccf..d61f8e602cac 100644
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -650,6 +650,9 @@ struct ice_pf {
struct ice_eswitch eswitch;
struct ice_esw_br_port *br_port;
+ struct xarray dyn_ports;
+ struct xarray sf_nums;
+
#define ICE_INVALID_AGG_NODE_ID 0
#define ICE_PF_AGG_NODE_ID_START 1
#define ICE_MAX_PF_AGG_NODES 32
@@ -916,6 +919,7 @@ int ice_vsi_open(struct ice_vsi *vsi);
void ice_set_ethtool_ops(struct net_device *netdev);
void ice_set_ethtool_repr_ops(struct net_device *netdev);
void ice_set_ethtool_safe_mode_ops(struct net_device *netdev);
+void ice_set_ethtool_sf_ops(struct net_device *netdev);
u16 ice_get_avail_txq_count(struct ice_pf *pf);
u16 ice_get_avail_rxq_count(struct ice_pf *pf);
int ice_vsi_recfg_qs(struct ice_vsi *vsi, int new_rx, int new_tx, bool locked);
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index 56bbc3ebf9dc..eabdaf624793 100644
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -7,6 +7,7 @@
#include "ice_lib.h"
#include "ice_fltr.h"
#include "ice_dcb_lib.h"
+#include "ice_type.h"
#include "ice_vsi_vlan_ops.h"
/**
@@ -432,7 +433,7 @@ static int ice_vsi_alloc_ring_stats(struct ice_vsi *vsi)
* This deallocates the VSI's queue resources, removes it from the PF's
* VSI array if necessary, and deallocates the VSI
*/
-static void ice_vsi_free(struct ice_vsi *vsi)
+void ice_vsi_free(struct ice_vsi *vsi)
{
struct ice_pf *pf = NULL;
struct device *dev;
@@ -604,7 +605,7 @@ ice_vsi_alloc_def(struct ice_vsi *vsi, struct ice_channel *ch)
*
* returns a pointer to a VSI on success, NULL on failure.
*/
-static struct ice_vsi *ice_vsi_alloc(struct ice_pf *pf)
+struct ice_vsi *ice_vsi_alloc(struct ice_pf *pf)
{
struct device *dev = ice_pf_to_dev(pf);
struct ice_vsi *vsi = NULL;
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.h b/drivers/net/ethernet/intel/ice/ice_lib.h
index f9ee461c5c06..5de0cc50552c 100644
--- a/drivers/net/ethernet/intel/ice/ice_lib.h
+++ b/drivers/net/ethernet/intel/ice/ice_lib.h
@@ -66,6 +66,8 @@ void ice_dis_vsi(struct ice_vsi *vsi, bool locked);
int ice_vsi_rebuild(struct ice_vsi *vsi, u32 vsi_flags);
int ice_vsi_cfg(struct ice_vsi *vsi);
+struct ice_vsi *ice_vsi_alloc(struct ice_pf *pf);
+void ice_vsi_free(struct ice_vsi *vsi);
bool ice_is_reset_in_progress(unsigned long *state);
int ice_wait_for_reset(struct ice_pf *pf, unsigned long timeout);
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index d8a89a6152a1..7ce025b6efe4 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -3987,6 +3987,9 @@ static void ice_deinit_pf(struct ice_pf *pf)
if (pf->ptp.clock)
ptp_clock_unregister(pf->ptp.clock);
+
+ xa_destroy(&pf->dyn_ports);
+ xa_destroy(&pf->sf_nums);
}
/**
@@ -4080,6 +4083,9 @@ static int ice_init_pf(struct ice_pf *pf)
hash_init(pf->vfs.table);
ice_mbx_init_snapshot(&pf->hw);
+ xa_init(&pf->dyn_ports);
+ xa_init(&pf->sf_nums);
+
return 0;
}
@@ -5422,6 +5428,7 @@ static void ice_remove(struct pci_dev *pdev)
ice_remove_arfs(pf);
devl_lock(priv_to_devlink(pf));
+ ice_dealloc_all_dynamic_ports(pf);
ice_deinit_devlink(pf);
ice_unload(pf);
--
2.42.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH net-next v3 03/15] ice: add basic devlink subfunctions support
2024-08-08 17:30 ` [PATCH net-next v3 03/15] ice: add basic devlink subfunctions support Tony Nguyen
@ 2024-08-09 11:16 ` Jiri Pirko
2024-08-09 11:47 ` Michal Swiatkowski
0 siblings, 1 reply; 26+ messages in thread
From: Jiri Pirko @ 2024-08-09 11:16 UTC (permalink / raw)
To: Tony Nguyen
Cc: davem, kuba, pabeni, edumazet, netdev, Piotr Raczynski,
michal.swiatkowski, jiri, shayd, wojciech.drewek, horms,
sridhar.samudrala, mateusz.polchlopek, kalesh-anakkur.purayil,
michal.kubiak, pio.raczynski, przemyslaw.kitszel, jacob.e.keller,
maciej.fijalkowski, Rafal Romanowski
Thu, Aug 08, 2024 at 07:30:49PM CEST, anthony.l.nguyen@intel.com wrote:
>From: Piotr Raczynski <piotr.raczynski@intel.com>
>
[...]
>+static int
>+ice_devlink_port_new_check_attr(struct ice_pf *pf,
>+ const struct devlink_port_new_attrs *new_attr,
>+ struct netlink_ext_ack *extack)
>+{
>+ if (new_attr->flavour != DEVLINK_PORT_FLAVOUR_PCI_SF) {
>+ NL_SET_ERR_MSG_MOD(extack, "Flavour other than pcisf is not supported");
>+ return -EOPNOTSUPP;
>+ }
>+
>+ if (new_attr->controller_valid) {
>+ NL_SET_ERR_MSG_MOD(extack, "Setting controller is not supported");
>+ return -EOPNOTSUPP;
>+ }
>+
>+ if (new_attr->port_index_valid) {
>+ NL_SET_ERR_MSG_MOD(extack, "Port index is invalid");
Nope, it is actually valid, but your driver does not support that.
Please fix the message.
>+ return -EOPNOTSUPP;
>+ }
>+
>+ if (new_attr->pfnum != pf->hw.bus.func) {
hw.bus.func, hmm. How about if you pass-through the PF to VM, can't the
func be anything? Will this still make sense? I don't think so. If you
get the PF number like this in the rest of the driver, you need to fix
this.
>+ NL_SET_ERR_MSG_MOD(extack, "Incorrect pfnum supplied");
>+ return -EINVAL;
>+ }
>+
>+ if (!pci_msix_can_alloc_dyn(pf->pdev)) {
>+ NL_SET_ERR_MSG_MOD(extack, "Dynamic MSIX-X interrupt allocation is not supported");
>+ return -EOPNOTSUPP;
>+ }
>+
>+ return 0;
>+}
[...]
>+int ice_devlink_create_sf_port(struct ice_dynamic_port *dyn_port)
>+{
>+ struct devlink_port_attrs attrs = {};
>+ struct devlink_port *devlink_port;
>+ struct devlink *devlink;
>+ struct ice_vsi *vsi;
>+ struct ice_pf *pf;
>+
>+ vsi = dyn_port->vsi;
>+ pf = dyn_port->pf;
>+
>+ devlink_port = &dyn_port->devlink_port;
>+
>+ attrs.flavour = DEVLINK_PORT_FLAVOUR_PCI_SF;
>+ attrs.pci_sf.pf = pf->hw.bus.func;
Same here.
>+ attrs.pci_sf.sf = dyn_port->sfnum;
>+
>+ devlink_port_attrs_set(devlink_port, &attrs);
>+ devlink = priv_to_devlink(pf);
>+
>+ return devl_port_register_with_ops(devlink, devlink_port, vsi->idx,
>+ &ice_devlink_port_sf_ops);
>+}
>+
[...]
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH net-next v3 03/15] ice: add basic devlink subfunctions support
2024-08-09 11:16 ` Jiri Pirko
@ 2024-08-09 11:47 ` Michal Swiatkowski
2024-08-10 6:50 ` Jiri Pirko
0 siblings, 1 reply; 26+ messages in thread
From: Michal Swiatkowski @ 2024-08-09 11:47 UTC (permalink / raw)
To: Jiri Pirko
Cc: Tony Nguyen, davem, kuba, pabeni, edumazet, netdev,
Piotr Raczynski, jiri, shayd, wojciech.drewek, horms,
sridhar.samudrala, mateusz.polchlopek, kalesh-anakkur.purayil,
michal.kubiak, pio.raczynski, przemyslaw.kitszel, jacob.e.keller,
maciej.fijalkowski, Rafal Romanowski
On Fri, Aug 09, 2024 at 01:16:28PM +0200, Jiri Pirko wrote:
> Thu, Aug 08, 2024 at 07:30:49PM CEST, anthony.l.nguyen@intel.com wrote:
> >From: Piotr Raczynski <piotr.raczynski@intel.com>
> >
>
> [...]
>
> >+static int
> >+ice_devlink_port_new_check_attr(struct ice_pf *pf,
> >+ const struct devlink_port_new_attrs *new_attr,
> >+ struct netlink_ext_ack *extack)
> >+{
> >+ if (new_attr->flavour != DEVLINK_PORT_FLAVOUR_PCI_SF) {
> >+ NL_SET_ERR_MSG_MOD(extack, "Flavour other than pcisf is not supported");
> >+ return -EOPNOTSUPP;
> >+ }
> >+
> >+ if (new_attr->controller_valid) {
> >+ NL_SET_ERR_MSG_MOD(extack, "Setting controller is not supported");
> >+ return -EOPNOTSUPP;
> >+ }
> >+
> >+ if (new_attr->port_index_valid) {
> >+ NL_SET_ERR_MSG_MOD(extack, "Port index is invalid");
>
> Nope, it is actually valid, but your driver does not support that.
> Please fix the message.
>
Ok
>
> >+ return -EOPNOTSUPP;
> >+ }
> >+
> >+ if (new_attr->pfnum != pf->hw.bus.func) {
>
> hw.bus.func, hmm. How about if you pass-through the PF to VM, can't the
> func be anything? Will this still make sense? I don't think so. If you
> get the PF number like this in the rest of the driver, you need to fix
> this.
>
I can change it to our internal value. I wonder if it will be better. If
I understand correctly, now:
PF0 - xx.xx.0; PF1 - xx.xx.1
I am doing pass-through PF1
PF0 (on host) - xx.xx.0
PF1 (on VM) - xx.xx.0 (there is one PF on VM, so for me it is more
intuitive to have func 0)
after I change:
PF0 - xx.xx.0; PF1 - xx.xx.1
pass-through PF1
PF0 (on host) - xx.xx.0
PF1 (on VM) - xx.xx.0, but user will have to use 1 as pf num
Correct me if I am wrong.
>
>
> >+ NL_SET_ERR_MSG_MOD(extack, "Incorrect pfnum supplied");
> >+ return -EINVAL;
> >+ }
> >+
> >+ if (!pci_msix_can_alloc_dyn(pf->pdev)) {
> >+ NL_SET_ERR_MSG_MOD(extack, "Dynamic MSIX-X interrupt allocation is not supported");
> >+ return -EOPNOTSUPP;
> >+ }
> >+
> >+ return 0;
> >+}
>
> [...]
>
>
> >+int ice_devlink_create_sf_port(struct ice_dynamic_port *dyn_port)
> >+{
> >+ struct devlink_port_attrs attrs = {};
> >+ struct devlink_port *devlink_port;
> >+ struct devlink *devlink;
> >+ struct ice_vsi *vsi;
> >+ struct ice_pf *pf;
> >+
> >+ vsi = dyn_port->vsi;
> >+ pf = dyn_port->pf;
> >+
> >+ devlink_port = &dyn_port->devlink_port;
> >+
> >+ attrs.flavour = DEVLINK_PORT_FLAVOUR_PCI_SF;
> >+ attrs.pci_sf.pf = pf->hw.bus.func;
>
> Same here.
>
>
> >+ attrs.pci_sf.sf = dyn_port->sfnum;
> >+
> >+ devlink_port_attrs_set(devlink_port, &attrs);
> >+ devlink = priv_to_devlink(pf);
> >+
> >+ return devl_port_register_with_ops(devlink, devlink_port, vsi->idx,
> >+ &ice_devlink_port_sf_ops);
> >+}
> >+
>
> [...]
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH net-next v3 03/15] ice: add basic devlink subfunctions support
2024-08-09 11:47 ` Michal Swiatkowski
@ 2024-08-10 6:50 ` Jiri Pirko
2024-08-12 4:24 ` Michal Swiatkowski
0 siblings, 1 reply; 26+ messages in thread
From: Jiri Pirko @ 2024-08-10 6:50 UTC (permalink / raw)
To: Michal Swiatkowski
Cc: Tony Nguyen, davem, kuba, pabeni, edumazet, netdev,
Piotr Raczynski, jiri, shayd, wojciech.drewek, horms,
sridhar.samudrala, mateusz.polchlopek, kalesh-anakkur.purayil,
michal.kubiak, pio.raczynski, przemyslaw.kitszel, jacob.e.keller,
maciej.fijalkowski, Rafal Romanowski
Fri, Aug 09, 2024 at 01:47:38PM CEST, michal.swiatkowski@linux.intel.com wrote:
>On Fri, Aug 09, 2024 at 01:16:28PM +0200, Jiri Pirko wrote:
>> Thu, Aug 08, 2024 at 07:30:49PM CEST, anthony.l.nguyen@intel.com wrote:
>> >From: Piotr Raczynski <piotr.raczynski@intel.com>
>> >
>>
>> [...]
>>
>> >+static int
>> >+ice_devlink_port_new_check_attr(struct ice_pf *pf,
>> >+ const struct devlink_port_new_attrs *new_attr,
>> >+ struct netlink_ext_ack *extack)
>> >+{
>> >+ if (new_attr->flavour != DEVLINK_PORT_FLAVOUR_PCI_SF) {
>> >+ NL_SET_ERR_MSG_MOD(extack, "Flavour other than pcisf is not supported");
>> >+ return -EOPNOTSUPP;
>> >+ }
>> >+
>> >+ if (new_attr->controller_valid) {
>> >+ NL_SET_ERR_MSG_MOD(extack, "Setting controller is not supported");
>> >+ return -EOPNOTSUPP;
>> >+ }
>> >+
>> >+ if (new_attr->port_index_valid) {
>> >+ NL_SET_ERR_MSG_MOD(extack, "Port index is invalid");
>>
>> Nope, it is actually valid, but your driver does not support that.
>> Please fix the message.
>>
>
>Ok
>
>>
>> >+ return -EOPNOTSUPP;
>> >+ }
>> >+
>> >+ if (new_attr->pfnum != pf->hw.bus.func) {
>>
>> hw.bus.func, hmm. How about if you pass-through the PF to VM, can't the
>> func be anything? Will this still make sense? I don't think so. If you
>> get the PF number like this in the rest of the driver, you need to fix
>> this.
>>
>
>I can change it to our internal value. I wonder if it will be better. If
>I understand correctly, now:
>PF0 - xx.xx.0; PF1 - xx.xx.1
>
>I am doing pass-through PF1
>PF0 (on host) - xx.xx.0
>
>PF1 (on VM) - xx.xx.0 (there is one PF on VM, so for me it is more
>intuitive to have func 0)
>
>after I change:
>PF0 - xx.xx.0; PF1 - xx.xx.1
>
>pass-through PF1
>PF0 (on host) - xx.xx.0
>
>PF1 (on VM) - xx.xx.0, but user will have to use 1 as pf num
>
>Correct me if I am wrong.
Did you try this? I mean, you can check that easily with vng:
vng --qemu-opts="-device vfio-pci,host=5e:01.0,addr=01.04"
Then in the VM you see:
0000:00:01.4
Then, by your code, the pf number is 4, isn't it?
What am I missing?
>
>>
>>
>> >+ NL_SET_ERR_MSG_MOD(extack, "Incorrect pfnum supplied");
>> >+ return -EINVAL;
>> >+ }
>> >+
>> >+ if (!pci_msix_can_alloc_dyn(pf->pdev)) {
>> >+ NL_SET_ERR_MSG_MOD(extack, "Dynamic MSIX-X interrupt allocation is not supported");
>> >+ return -EOPNOTSUPP;
>> >+ }
>> >+
>> >+ return 0;
>> >+}
>>
>> [...]
>>
>>
>> >+int ice_devlink_create_sf_port(struct ice_dynamic_port *dyn_port)
>> >+{
>> >+ struct devlink_port_attrs attrs = {};
>> >+ struct devlink_port *devlink_port;
>> >+ struct devlink *devlink;
>> >+ struct ice_vsi *vsi;
>> >+ struct ice_pf *pf;
>> >+
>> >+ vsi = dyn_port->vsi;
>> >+ pf = dyn_port->pf;
>> >+
>> >+ devlink_port = &dyn_port->devlink_port;
>> >+
>> >+ attrs.flavour = DEVLINK_PORT_FLAVOUR_PCI_SF;
>> >+ attrs.pci_sf.pf = pf->hw.bus.func;
>>
>> Same here.
>>
>>
>> >+ attrs.pci_sf.sf = dyn_port->sfnum;
>> >+
>> >+ devlink_port_attrs_set(devlink_port, &attrs);
>> >+ devlink = priv_to_devlink(pf);
>> >+
>> >+ return devl_port_register_with_ops(devlink, devlink_port, vsi->idx,
>> >+ &ice_devlink_port_sf_ops);
>> >+}
>> >+
>>
>> [...]
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH net-next v3 03/15] ice: add basic devlink subfunctions support
2024-08-10 6:50 ` Jiri Pirko
@ 2024-08-12 4:24 ` Michal Swiatkowski
2024-08-12 9:53 ` Jiri Pirko
0 siblings, 1 reply; 26+ messages in thread
From: Michal Swiatkowski @ 2024-08-12 4:24 UTC (permalink / raw)
To: Jiri Pirko
Cc: Tony Nguyen, davem, kuba, pabeni, edumazet, netdev,
Piotr Raczynski, jiri, shayd, wojciech.drewek, horms,
sridhar.samudrala, mateusz.polchlopek, kalesh-anakkur.purayil,
michal.kubiak, pio.raczynski, przemyslaw.kitszel, jacob.e.keller,
maciej.fijalkowski, Rafal Romanowski
On Sat, Aug 10, 2024 at 08:50:38AM +0200, Jiri Pirko wrote:
> Fri, Aug 09, 2024 at 01:47:38PM CEST, michal.swiatkowski@linux.intel.com wrote:
> >On Fri, Aug 09, 2024 at 01:16:28PM +0200, Jiri Pirko wrote:
> >> Thu, Aug 08, 2024 at 07:30:49PM CEST, anthony.l.nguyen@intel.com wrote:
> >> >From: Piotr Raczynski <piotr.raczynski@intel.com>
> >> >
> >>
> >> [...]
> >>
> >> >+static int
> >> >+ice_devlink_port_new_check_attr(struct ice_pf *pf,
> >> >+ const struct devlink_port_new_attrs *new_attr,
> >> >+ struct netlink_ext_ack *extack)
> >> >+{
> >> >+ if (new_attr->flavour != DEVLINK_PORT_FLAVOUR_PCI_SF) {
> >> >+ NL_SET_ERR_MSG_MOD(extack, "Flavour other than pcisf is not supported");
> >> >+ return -EOPNOTSUPP;
> >> >+ }
> >> >+
> >> >+ if (new_attr->controller_valid) {
> >> >+ NL_SET_ERR_MSG_MOD(extack, "Setting controller is not supported");
> >> >+ return -EOPNOTSUPP;
> >> >+ }
> >> >+
> >> >+ if (new_attr->port_index_valid) {
> >> >+ NL_SET_ERR_MSG_MOD(extack, "Port index is invalid");
> >>
> >> Nope, it is actually valid, but your driver does not support that.
> >> Please fix the message.
> >>
> >
> >Ok
> >
> >>
> >> >+ return -EOPNOTSUPP;
> >> >+ }
> >> >+
> >> >+ if (new_attr->pfnum != pf->hw.bus.func) {
> >>
> >> hw.bus.func, hmm. How about if you pass-through the PF to VM, can't the
> >> func be anything? Will this still make sense? I don't think so. If you
> >> get the PF number like this in the rest of the driver, you need to fix
> >> this.
> >>
> >
> >I can change it to our internal value. I wonder if it will be better. If
> >I understand correctly, now:
> >PF0 - xx.xx.0; PF1 - xx.xx.1
> >
> >I am doing pass-through PF1
> >PF0 (on host) - xx.xx.0
> >
> >PF1 (on VM) - xx.xx.0 (there is one PF on VM, so for me it is more
> >intuitive to have func 0)
> >
> >after I change:
> >PF0 - xx.xx.0; PF1 - xx.xx.1
> >
> >pass-through PF1
> >PF0 (on host) - xx.xx.0
> >
> >PF1 (on VM) - xx.xx.0, but user will have to use 1 as pf num
> >
> >Correct me if I am wrong.
>
> Did you try this? I mean, you can check that easily with vng:
> vng --qemu-opts="-device vfio-pci,host=5e:01.0,addr=01.04"
>
> Then in the VM you see:
> 0000:00:01.4
>
> Then, by your code, the pf number is 4, isn't it?
>
> What am I missing?
I didn't know about addr parameter. I will change it to always have the
same number so.
>
>
>
> >
> >>
> >>
> >> >+ NL_SET_ERR_MSG_MOD(extack, "Incorrect pfnum supplied");
> >> >+ return -EINVAL;
> >> >+ }
> >> >+
> >> >+ if (!pci_msix_can_alloc_dyn(pf->pdev)) {
> >> >+ NL_SET_ERR_MSG_MOD(extack, "Dynamic MSIX-X interrupt allocation is not supported");
> >> >+ return -EOPNOTSUPP;
> >> >+ }
> >> >+
> >> >+ return 0;
> >> >+}
> >>
> >> [...]
> >>
> >>
> >> >+int ice_devlink_create_sf_port(struct ice_dynamic_port *dyn_port)
> >> >+{
> >> >+ struct devlink_port_attrs attrs = {};
> >> >+ struct devlink_port *devlink_port;
> >> >+ struct devlink *devlink;
> >> >+ struct ice_vsi *vsi;
> >> >+ struct ice_pf *pf;
> >> >+
> >> >+ vsi = dyn_port->vsi;
> >> >+ pf = dyn_port->pf;
> >> >+
> >> >+ devlink_port = &dyn_port->devlink_port;
> >> >+
> >> >+ attrs.flavour = DEVLINK_PORT_FLAVOUR_PCI_SF;
> >> >+ attrs.pci_sf.pf = pf->hw.bus.func;
> >>
> >> Same here.
> >>
> >>
> >> >+ attrs.pci_sf.sf = dyn_port->sfnum;
> >> >+
> >> >+ devlink_port_attrs_set(devlink_port, &attrs);
> >> >+ devlink = priv_to_devlink(pf);
> >> >+
> >> >+ return devl_port_register_with_ops(devlink, devlink_port, vsi->idx,
> >> >+ &ice_devlink_port_sf_ops);
> >> >+}
> >> >+
> >>
> >> [...]
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH net-next v3 03/15] ice: add basic devlink subfunctions support
2024-08-12 4:24 ` Michal Swiatkowski
@ 2024-08-12 9:53 ` Jiri Pirko
0 siblings, 0 replies; 26+ messages in thread
From: Jiri Pirko @ 2024-08-12 9:53 UTC (permalink / raw)
To: Michal Swiatkowski
Cc: Tony Nguyen, davem, kuba, pabeni, edumazet, netdev,
Piotr Raczynski, jiri, shayd, wojciech.drewek, horms,
sridhar.samudrala, mateusz.polchlopek, kalesh-anakkur.purayil,
michal.kubiak, pio.raczynski, przemyslaw.kitszel, jacob.e.keller,
maciej.fijalkowski, Rafal Romanowski
Mon, Aug 12, 2024 at 06:24:12AM CEST, michal.swiatkowski@linux.intel.com wrote:
>On Sat, Aug 10, 2024 at 08:50:38AM +0200, Jiri Pirko wrote:
>> Fri, Aug 09, 2024 at 01:47:38PM CEST, michal.swiatkowski@linux.intel.com wrote:
>> >On Fri, Aug 09, 2024 at 01:16:28PM +0200, Jiri Pirko wrote:
>> >> Thu, Aug 08, 2024 at 07:30:49PM CEST, anthony.l.nguyen@intel.com wrote:
>> >> >From: Piotr Raczynski <piotr.raczynski@intel.com>
>> >> >
>> >>
>> >> [...]
>> >>
>> >> >+static int
>> >> >+ice_devlink_port_new_check_attr(struct ice_pf *pf,
>> >> >+ const struct devlink_port_new_attrs *new_attr,
>> >> >+ struct netlink_ext_ack *extack)
>> >> >+{
>> >> >+ if (new_attr->flavour != DEVLINK_PORT_FLAVOUR_PCI_SF) {
>> >> >+ NL_SET_ERR_MSG_MOD(extack, "Flavour other than pcisf is not supported");
>> >> >+ return -EOPNOTSUPP;
>> >> >+ }
>> >> >+
>> >> >+ if (new_attr->controller_valid) {
>> >> >+ NL_SET_ERR_MSG_MOD(extack, "Setting controller is not supported");
>> >> >+ return -EOPNOTSUPP;
>> >> >+ }
>> >> >+
>> >> >+ if (new_attr->port_index_valid) {
>> >> >+ NL_SET_ERR_MSG_MOD(extack, "Port index is invalid");
>> >>
>> >> Nope, it is actually valid, but your driver does not support that.
>> >> Please fix the message.
>> >>
>> >
>> >Ok
>> >
>> >>
>> >> >+ return -EOPNOTSUPP;
>> >> >+ }
>> >> >+
>> >> >+ if (new_attr->pfnum != pf->hw.bus.func) {
>> >>
>> >> hw.bus.func, hmm. How about if you pass-through the PF to VM, can't the
>> >> func be anything? Will this still make sense? I don't think so. If you
>> >> get the PF number like this in the rest of the driver, you need to fix
>> >> this.
>> >>
>> >
>> >I can change it to our internal value. I wonder if it will be better. If
>> >I understand correctly, now:
>> >PF0 - xx.xx.0; PF1 - xx.xx.1
>> >
>> >I am doing pass-through PF1
>> >PF0 (on host) - xx.xx.0
>> >
>> >PF1 (on VM) - xx.xx.0 (there is one PF on VM, so for me it is more
>> >intuitive to have func 0)
>> >
>> >after I change:
>> >PF0 - xx.xx.0; PF1 - xx.xx.1
>> >
>> >pass-through PF1
>> >PF0 (on host) - xx.xx.0
>> >
>> >PF1 (on VM) - xx.xx.0, but user will have to use 1 as pf num
>> >
>> >Correct me if I am wrong.
>>
>> Did you try this? I mean, you can check that easily with vng:
>> vng --qemu-opts="-device vfio-pci,host=5e:01.0,addr=01.04"
>>
>> Then in the VM you see:
>> 0000:00:01.4
>>
>> Then, by your code, the pf number is 4, isn't it?
>>
>> What am I missing?
>
>I didn't know about addr parameter. I will change it to always have the
>same number so.
Please make sure this is fixed in other ice places:
$ git grep "bus.func" drivers/net/ethernet/intel/ice/
drivers/net/ethernet/intel/ice/devlink/devlink_port.c: attrs.phys.port_number = pf->hw.bus.func;
drivers/net/ethernet/intel/ice/devlink/devlink_port.c: attrs.pci_vf.pf = pf->hw.bus.func;
drivers/net/ethernet/intel/ice/ice_debugfs.c: if (pf->hw.bus.func)
drivers/net/ethernet/intel/ice/ice_fwlog.c: if (hw->bus.func)
drivers/net/ethernet/intel/ice/ice_fwlog.c: if (hw->bus.func)
drivers/net/ethernet/intel/ice/ice_main.c: hw->bus.func = PCI_FUNC(pdev->devfn);
Calls for a -net/stable fix IMO.
Also, check other intel drivers as well. I see this is a pattern.
Thanks!
>
>>
>>
>>
>> >
>> >>
>> >>
>> >> >+ NL_SET_ERR_MSG_MOD(extack, "Incorrect pfnum supplied");
>> >> >+ return -EINVAL;
>> >> >+ }
>> >> >+
>> >> >+ if (!pci_msix_can_alloc_dyn(pf->pdev)) {
>> >> >+ NL_SET_ERR_MSG_MOD(extack, "Dynamic MSIX-X interrupt allocation is not supported");
>> >> >+ return -EOPNOTSUPP;
>> >> >+ }
>> >> >+
>> >> >+ return 0;
>> >> >+}
>> >>
>> >> [...]
>> >>
>> >>
>> >> >+int ice_devlink_create_sf_port(struct ice_dynamic_port *dyn_port)
>> >> >+{
>> >> >+ struct devlink_port_attrs attrs = {};
>> >> >+ struct devlink_port *devlink_port;
>> >> >+ struct devlink *devlink;
>> >> >+ struct ice_vsi *vsi;
>> >> >+ struct ice_pf *pf;
>> >> >+
>> >> >+ vsi = dyn_port->vsi;
>> >> >+ pf = dyn_port->pf;
>> >> >+
>> >> >+ devlink_port = &dyn_port->devlink_port;
>> >> >+
>> >> >+ attrs.flavour = DEVLINK_PORT_FLAVOUR_PCI_SF;
>> >> >+ attrs.pci_sf.pf = pf->hw.bus.func;
>> >>
>> >> Same here.
>> >>
>> >>
>> >> >+ attrs.pci_sf.sf = dyn_port->sfnum;
>> >> >+
>> >> >+ devlink_port_attrs_set(devlink_port, &attrs);
>> >> >+ devlink = priv_to_devlink(pf);
>> >> >+
>> >> >+ return devl_port_register_with_ops(devlink, devlink_port, vsi->idx,
>> >> >+ &ice_devlink_port_sf_ops);
>> >> >+}
>> >> >+
>> >>
>> >> [...]
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH net-next v3 04/15] ice: treat subfunction VSI the same as PF VSI
2024-08-08 17:30 [PATCH net-next v3 00/15][pull request] ice: support devlink subfunction Tony Nguyen
` (2 preceding siblings ...)
2024-08-08 17:30 ` [PATCH net-next v3 03/15] ice: add basic devlink subfunctions support Tony Nguyen
@ 2024-08-08 17:30 ` Tony Nguyen
2024-08-08 17:30 ` [PATCH net-next v3 05/15] ice: allocate devlink for subfunction Tony Nguyen
` (10 subsequent siblings)
14 siblings, 0 replies; 26+ messages in thread
From: Tony Nguyen @ 2024-08-08 17:30 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Michal Swiatkowski, anthony.l.nguyen, jiri, shayd,
wojciech.drewek, horms, sridhar.samudrala, mateusz.polchlopek,
kalesh-anakkur.purayil, michal.kubiak, pio.raczynski,
przemyslaw.kitszel, jacob.e.keller, maciej.fijalkowski,
Rafal Romanowski
From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
When subfunction VSI is open the same code as for PF VSI should be
executed. Also when up is complete. Reflect that in code by adding
subfunction VSI to consideration.
In case of stopping, PF doesn't have additional tasks, so the same
is with subfunction VSI.
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ice/ice_main.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 7ce025b6efe4..e10f10a21c95 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -6728,7 +6728,8 @@ static int ice_up_complete(struct ice_vsi *vsi)
if (vsi->port_info &&
(vsi->port_info->phy.link_info.link_info & ICE_AQ_LINK_UP) &&
- vsi->netdev && vsi->type == ICE_VSI_PF) {
+ ((vsi->netdev && (vsi->type == ICE_VSI_PF ||
+ vsi->type == ICE_VSI_SF)))) {
ice_print_link_msg(vsi, true);
netif_tx_start_all_queues(vsi->netdev);
netif_carrier_on(vsi->netdev);
@@ -7426,7 +7427,7 @@ int ice_vsi_open(struct ice_vsi *vsi)
ice_vsi_cfg_netdev_tc(vsi, vsi->tc_cfg.ena_tc);
- if (vsi->type == ICE_VSI_PF) {
+ if (vsi->type == ICE_VSI_PF || vsi->type == ICE_VSI_SF) {
/* Notify the stack of the actual queue counts. */
err = netif_set_real_num_tx_queues(vsi->netdev, vsi->num_txq);
if (err)
--
2.42.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next v3 05/15] ice: allocate devlink for subfunction
2024-08-08 17:30 [PATCH net-next v3 00/15][pull request] ice: support devlink subfunction Tony Nguyen
` (3 preceding siblings ...)
2024-08-08 17:30 ` [PATCH net-next v3 04/15] ice: treat subfunction VSI the same as PF VSI Tony Nguyen
@ 2024-08-08 17:30 ` Tony Nguyen
2024-08-09 11:17 ` Jiri Pirko
2024-08-08 17:30 ` [PATCH net-next v3 06/15] ice: base subfunction aux driver Tony Nguyen
` (9 subsequent siblings)
14 siblings, 1 reply; 26+ messages in thread
From: Tony Nguyen @ 2024-08-08 17:30 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Piotr Raczynski, anthony.l.nguyen, michal.swiatkowski, jiri,
shayd, wojciech.drewek, horms, sridhar.samudrala,
mateusz.polchlopek, kalesh-anakkur.purayil, michal.kubiak,
pio.raczynski, przemyslaw.kitszel, jacob.e.keller,
maciej.fijalkowski, Rafal Romanowski
From: Piotr Raczynski <piotr.raczynski@intel.com>
Allocate devlink for subfunction instance.
Create header file for subfunction device. Define subfunction device
structure there as it is needed for devlink allocation.
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: Piotr Raczynski <piotr.raczynski@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
.../net/ethernet/intel/ice/devlink/devlink.c | 31 +++++++++++++++++++
.../net/ethernet/intel/ice/devlink/devlink.h | 1 +
drivers/net/ethernet/intel/ice/ice_sf_eth.h | 15 +++++++++
3 files changed, 47 insertions(+)
create mode 100644 drivers/net/ethernet/intel/ice/ice_sf_eth.h
diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink.c b/drivers/net/ethernet/intel/ice/devlink/devlink.c
index b7eb1b56f2c6..445538959459 100644
--- a/drivers/net/ethernet/intel/ice/devlink/devlink.c
+++ b/drivers/net/ethernet/intel/ice/devlink/devlink.c
@@ -10,6 +10,7 @@
#include "ice_eswitch.h"
#include "ice_fw_update.h"
#include "ice_dcb_lib.h"
+#include "ice_sf_eth.h"
/* context for devlink info version reporting */
struct ice_info_ctx {
@@ -1282,6 +1283,8 @@ static const struct devlink_ops ice_devlink_ops = {
.port_new = ice_devlink_port_new,
};
+static const struct devlink_ops ice_sf_devlink_ops;
+
static int
ice_devlink_enable_roce_get(struct devlink *devlink, u32 id,
struct devlink_param_gset_ctx *ctx)
@@ -1564,6 +1567,34 @@ struct ice_pf *ice_allocate_pf(struct device *dev)
return devlink_priv(devlink);
}
+/**
+ * ice_allocate_sf - Allocate devlink and return SF structure pointer
+ * @dev: the device to allocate for
+ * @pf: pointer to the PF structure
+ *
+ * Allocate a devlink instance for SF.
+ *
+ * Return: ice_sf_priv pointer to allocated memory or ERR_PTR in case of error
+ */
+struct ice_sf_priv *ice_allocate_sf(struct device *dev, struct ice_pf *pf)
+{
+ struct devlink *devlink;
+ int err;
+
+ devlink = devlink_alloc(&ice_sf_devlink_ops, sizeof(struct ice_sf_priv),
+ dev);
+ if (!devlink)
+ return ERR_PTR(-ENOMEM);
+
+ err = devl_nested_devlink_set(priv_to_devlink(pf), devlink);
+ if (err) {
+ devlink_free(devlink);
+ return ERR_PTR(err);
+ }
+
+ return devlink_priv(devlink);
+}
+
/**
* ice_devlink_register - Register devlink interface for this PF
* @pf: the PF to register the devlink for.
diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink.h b/drivers/net/ethernet/intel/ice/devlink/devlink.h
index d291c0e2e17b..1af3b0763fbb 100644
--- a/drivers/net/ethernet/intel/ice/devlink/devlink.h
+++ b/drivers/net/ethernet/intel/ice/devlink/devlink.h
@@ -5,6 +5,7 @@
#define _ICE_DEVLINK_H_
struct ice_pf *ice_allocate_pf(struct device *dev);
+struct ice_sf_priv *ice_allocate_sf(struct device *dev, struct ice_pf *pf);
void ice_devlink_register(struct ice_pf *pf);
void ice_devlink_unregister(struct ice_pf *pf);
diff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.h b/drivers/net/ethernet/intel/ice/ice_sf_eth.h
new file mode 100644
index 000000000000..267da33a0135
--- /dev/null
+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2024, Intel Corporation. */
+
+#ifndef _ICE_SF_ETH_H_
+#define _ICE_SF_ETH_H_
+
+#include <linux/auxiliary_bus.h>
+#include "ice.h"
+
+struct ice_sf_priv {
+ struct ice_sf_dev *dev;
+ struct devlink_port devlink_port;
+};
+
+#endif /* _ICE_SF_ETH_H_ */
--
2.42.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH net-next v3 05/15] ice: allocate devlink for subfunction
2024-08-08 17:30 ` [PATCH net-next v3 05/15] ice: allocate devlink for subfunction Tony Nguyen
@ 2024-08-09 11:17 ` Jiri Pirko
0 siblings, 0 replies; 26+ messages in thread
From: Jiri Pirko @ 2024-08-09 11:17 UTC (permalink / raw)
To: Tony Nguyen
Cc: davem, kuba, pabeni, edumazet, netdev, Piotr Raczynski,
michal.swiatkowski, jiri, shayd, wojciech.drewek, horms,
sridhar.samudrala, mateusz.polchlopek, kalesh-anakkur.purayil,
michal.kubiak, pio.raczynski, przemyslaw.kitszel, jacob.e.keller,
maciej.fijalkowski, Rafal Romanowski
Thu, Aug 08, 2024 at 07:30:51PM CEST, anthony.l.nguyen@intel.com wrote:
>From: Piotr Raczynski <piotr.raczynski@intel.com>
>
>Allocate devlink for subfunction instance.
>
>Create header file for subfunction device. Define subfunction device
>structure there as it is needed for devlink allocation.
>
>Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
>Signed-off-by: Piotr Raczynski <piotr.raczynski@intel.com>
>Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
>Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
>Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH net-next v3 06/15] ice: base subfunction aux driver
2024-08-08 17:30 [PATCH net-next v3 00/15][pull request] ice: support devlink subfunction Tony Nguyen
` (4 preceding siblings ...)
2024-08-08 17:30 ` [PATCH net-next v3 05/15] ice: allocate devlink for subfunction Tony Nguyen
@ 2024-08-08 17:30 ` Tony Nguyen
2024-08-09 11:23 ` Jiri Pirko
2024-08-08 17:30 ` [PATCH net-next v3 07/15] ice: implement netdev for subfunction Tony Nguyen
` (8 subsequent siblings)
14 siblings, 1 reply; 26+ messages in thread
From: Tony Nguyen @ 2024-08-08 17:30 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Piotr Raczynski, anthony.l.nguyen, michal.swiatkowski, jiri,
shayd, wojciech.drewek, horms, sridhar.samudrala,
mateusz.polchlopek, kalesh-anakkur.purayil, michal.kubiak,
pio.raczynski, przemyslaw.kitszel, jacob.e.keller,
maciej.fijalkowski, Rafal Romanowski
From: Piotr Raczynski <piotr.raczynski@intel.com>
Implement subfunction driver. It is probe when subfunction port is
activated.
VSI is already created. During the probe VSI is being configured.
MAC unicast and broadcast filter is added to allow traffic to pass.
Store subfunction pointer in VSI struct. The same is done for VF
pointer. Make union of subfunction and VF pointer as only one of them
can be set with one VSI.
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Piotr Raczynski <piotr.raczynski@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ice/Makefile | 1 +
.../ethernet/intel/ice/devlink/devlink_port.c | 41 ++++++
.../ethernet/intel/ice/devlink/devlink_port.h | 3 +
drivers/net/ethernet/intel/ice/ice.h | 7 +-
drivers/net/ethernet/intel/ice/ice_main.c | 10 ++
drivers/net/ethernet/intel/ice/ice_sf_eth.c | 139 ++++++++++++++++++
drivers/net/ethernet/intel/ice/ice_sf_eth.h | 15 ++
7 files changed, 215 insertions(+), 1 deletion(-)
create mode 100644 drivers/net/ethernet/intel/ice/ice_sf_eth.c
diff --git a/drivers/net/ethernet/intel/ice/Makefile b/drivers/net/ethernet/intel/ice/Makefile
index 03500e28ac99..4d987f5dcdc1 100644
--- a/drivers/net/ethernet/intel/ice/Makefile
+++ b/drivers/net/ethernet/intel/ice/Makefile
@@ -31,6 +31,7 @@ ice-y := ice_main.o \
ice_idc.o \
devlink/devlink.o \
devlink/devlink_port.o \
+ ice_sf_eth.o \
ice_ddp.o \
ice_fw_update.o \
ice_lag.o \
diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
index 5d1fe08e4bab..f06baabd0112 100644
--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
@@ -489,6 +489,47 @@ void ice_devlink_destroy_vf_port(struct ice_vf *vf)
devl_port_unregister(&vf->devlink_port);
}
+/**
+ * ice_devlink_create_sf_dev_port - Register virtual port for a subfunction
+ * @sf_dev: the subfunction device to create a devlink port for
+ *
+ * Register virtual flavour devlink port for the subfunction auxiliary device
+ * created after activating a dynamically added devlink port.
+ *
+ * Return: zero on success or an error code on failure.
+ */
+int ice_devlink_create_sf_dev_port(struct ice_sf_dev *sf_dev)
+{
+ struct devlink_port_attrs attrs = {};
+ struct ice_dynamic_port *dyn_port;
+ struct devlink_port *devlink_port;
+ struct devlink *devlink;
+ struct ice_vsi *vsi;
+
+ dyn_port = sf_dev->dyn_port;
+ vsi = dyn_port->vsi;
+
+ devlink_port = &sf_dev->priv->devlink_port;
+
+ attrs.flavour = DEVLINK_PORT_FLAVOUR_VIRTUAL;
+
+ devlink_port_attrs_set(devlink_port, &attrs);
+ devlink = priv_to_devlink(sf_dev->priv);
+
+ return devl_port_register(devlink, devlink_port, vsi->idx);
+}
+
+/**
+ * ice_devlink_destroy_sf_dev_port - Destroy virtual port for a subfunction
+ * @sf_dev: the subfunction device to create a devlink port for
+ *
+ * Unregisters the virtual port associated with this subfunction.
+ */
+void ice_devlink_destroy_sf_dev_port(struct ice_sf_dev *sf_dev)
+{
+ devl_port_unregister(&sf_dev->priv->devlink_port);
+}
+
/**
* ice_dealloc_dynamic_port - Deallocate and remove a dynamic port
* @dyn_port: dynamic port instance to deallocate
diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
index 08ebf56664a5..97b21b58c300 100644
--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
@@ -5,6 +5,7 @@
#define _DEVLINK_PORT_H_
#include "../ice.h"
+#include "../ice_sf_eth.h"
/**
* struct ice_dynamic_port - Track dynamically added devlink port instance
@@ -34,6 +35,8 @@ int ice_devlink_create_vf_port(struct ice_vf *vf);
void ice_devlink_destroy_vf_port(struct ice_vf *vf);
int ice_devlink_create_sf_port(struct ice_dynamic_port *dyn_port);
void ice_devlink_destroy_sf_port(struct ice_dynamic_port *dyn_port);
+int ice_devlink_create_sf_dev_port(struct ice_sf_dev *sf_dev);
+void ice_devlink_destroy_sf_dev_port(struct ice_sf_dev *sf_dev);
#define ice_devlink_port_to_dyn(port) \
container_of(port, struct ice_dynamic_port, devlink_port)
diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index d61f8e602cac..0046684004ff 100644
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -449,7 +449,12 @@ struct ice_vsi {
struct_group_tagged(ice_vsi_cfg_params, params,
struct ice_port_info *port_info; /* back pointer to port_info */
struct ice_channel *ch; /* VSI's channel structure, may be NULL */
- struct ice_vf *vf; /* VF associated with this VSI, may be NULL */
+ union {
+ /* VF associated with this VSI, may be NULL */
+ struct ice_vf *vf;
+ /* SF associated with this VSI, may be NULL */
+ struct ice_dynamic_port *sf;
+ };
u32 flags; /* VSI flags used for rebuild and configuration */
enum ice_vsi_type type; /* the type of the VSI */
);
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index e10f10a21c95..bdd88617ec9b 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -15,6 +15,7 @@
#include "ice_dcb_nl.h"
#include "devlink/devlink.h"
#include "devlink/devlink_port.h"
+#include "ice_sf_eth.h"
#include "ice_hwmon.h"
/* Including ice_trace.h with CREATE_TRACE_POINTS defined will generate the
* ice tracepoint functions. This must be done exactly once across the
@@ -5908,8 +5909,16 @@ static int __init ice_module_init(void)
goto err_dest_lag_wq;
}
+ status = ice_sf_driver_register();
+ if (status) {
+ pr_err("Failed to register SF driver, err %d\n", status);
+ goto err_sf_driver;
+ }
+
return 0;
+err_sf_driver:
+ pci_unregister_driver(&ice_driver);
err_dest_lag_wq:
destroy_workqueue(ice_lag_wq);
ice_debugfs_exit();
@@ -5927,6 +5936,7 @@ module_init(ice_module_init);
*/
static void __exit ice_module_exit(void)
{
+ ice_sf_driver_unregister();
pci_unregister_driver(&ice_driver);
ice_debugfs_exit();
destroy_workqueue(ice_wq);
diff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.c b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
new file mode 100644
index 000000000000..abe495c2d033
--- /dev/null
+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
@@ -0,0 +1,139 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2024, Intel Corporation. */
+#include "ice.h"
+#include "ice_lib.h"
+#include "ice_fltr.h"
+#include "ice_sf_eth.h"
+#include "devlink/devlink_port.h"
+#include "devlink/devlink.h"
+
+/**
+ * ice_sf_dev_probe - subfunction driver probe function
+ * @adev: pointer to the auxiliary device
+ * @id: pointer to the auxiliary_device id
+ *
+ * Configure VSI and netdev resources for the subfunction device.
+ *
+ * Return: zero on success or an error code on failure.
+ */
+static int ice_sf_dev_probe(struct auxiliary_device *adev,
+ const struct auxiliary_device_id *id)
+{
+ struct ice_sf_dev *sf_dev = ice_adev_to_sf_dev(adev);
+ struct ice_dynamic_port *dyn_port = sf_dev->dyn_port;
+ struct ice_vsi *vsi = dyn_port->vsi;
+ struct ice_pf *pf = dyn_port->pf;
+ struct device *dev = &adev->dev;
+ struct ice_sf_priv *priv;
+ struct devlink *devlink;
+ int err;
+
+ vsi->type = ICE_VSI_SF;
+ vsi->port_info = pf->hw.port_info;
+ vsi->flags = ICE_VSI_FLAG_INIT;
+
+ priv = ice_allocate_sf(&adev->dev, pf);
+ if (!priv) {
+ dev_err(dev, "Subfunction devlink alloc failed");
+ return -ENOMEM;
+ }
+
+ priv->dev = sf_dev;
+ sf_dev->priv = priv;
+ devlink = priv_to_devlink(priv);
+
+ devl_lock(devlink);
+
+ err = ice_vsi_cfg(vsi);
+ if (err) {
+ dev_err(dev, "Subfunction vsi config failed");
+ goto err_free_devlink;
+ }
+ vsi->sf = dyn_port;
+
+ err = ice_devlink_create_sf_dev_port(sf_dev);
+ if (err) {
+ dev_err(dev, "Cannot add ice virtual devlink port for subfunction");
+ goto err_vsi_decfg;
+ }
+
+ err = devl_port_fn_devlink_set(&dyn_port->devlink_port, devlink);
+ if (err) {
+ dev_err(dev, "Can't link devlink instance to SF devlink port");
+ goto err_devlink_destroy;
+ }
+
+ ice_napi_add(vsi);
+ devl_unlock(devlink);
+
+ devlink_register(devlink);
+
+ return 0;
+
+err_devlink_destroy:
+ ice_devlink_destroy_sf_dev_port(sf_dev);
+err_vsi_decfg:
+ ice_vsi_decfg(vsi);
+err_free_devlink:
+ devl_unlock(devlink);
+ devlink_free(devlink);
+ return err;
+}
+
+/**
+ * ice_sf_dev_remove - subfunction driver remove function
+ * @adev: pointer to the auxiliary device
+ *
+ * Deinitalize VSI and netdev resources for the subfunction device.
+ */
+static void ice_sf_dev_remove(struct auxiliary_device *adev)
+{
+ struct ice_sf_dev *sf_dev = ice_adev_to_sf_dev(adev);
+ struct ice_dynamic_port *dyn_port = sf_dev->dyn_port;
+ struct ice_vsi *vsi = dyn_port->vsi;
+ struct devlink *devlink;
+
+ devlink = priv_to_devlink(sf_dev->priv);
+ devl_lock(devlink);
+
+ ice_vsi_close(vsi);
+
+ ice_devlink_destroy_sf_dev_port(sf_dev);
+ devl_unregister(devlink);
+ devl_unlock(devlink);
+ devlink_free(devlink);
+ ice_vsi_decfg(vsi);
+}
+
+static const struct auxiliary_device_id ice_sf_dev_id_table[] = {
+ { .name = "ice.sf", },
+ { },
+};
+
+MODULE_DEVICE_TABLE(auxiliary, ice_sf_dev_id_table);
+
+static struct auxiliary_driver ice_sf_driver = {
+ .name = "sf",
+ .probe = ice_sf_dev_probe,
+ .remove = ice_sf_dev_remove,
+ .id_table = ice_sf_dev_id_table
+};
+
+/**
+ * ice_sf_driver_register - Register new auxiliary subfunction driver
+ *
+ * Return: zero on success or an error code on failure.
+ */
+int ice_sf_driver_register(void)
+{
+ return auxiliary_driver_register(&ice_sf_driver);
+}
+
+/**
+ * ice_sf_driver_unregister - Unregister new auxiliary subfunction driver
+ *
+ */
+void ice_sf_driver_unregister(void)
+{
+ auxiliary_driver_unregister(&ice_sf_driver);
+}
diff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.h b/drivers/net/ethernet/intel/ice/ice_sf_eth.h
index 267da33a0135..e972c50f96c9 100644
--- a/drivers/net/ethernet/intel/ice/ice_sf_eth.h
+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.h
@@ -7,9 +7,24 @@
#include <linux/auxiliary_bus.h>
#include "ice.h"
+struct ice_sf_dev {
+ struct auxiliary_device adev;
+ struct ice_dynamic_port *dyn_port;
+ struct ice_sf_priv *priv;
+};
+
struct ice_sf_priv {
struct ice_sf_dev *dev;
struct devlink_port devlink_port;
};
+static inline struct
+ice_sf_dev *ice_adev_to_sf_dev(struct auxiliary_device *adev)
+{
+ return container_of(adev, struct ice_sf_dev, adev);
+}
+
+int ice_sf_driver_register(void);
+void ice_sf_driver_unregister(void);
+
#endif /* _ICE_SF_ETH_H_ */
--
2.42.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH net-next v3 06/15] ice: base subfunction aux driver
2024-08-08 17:30 ` [PATCH net-next v3 06/15] ice: base subfunction aux driver Tony Nguyen
@ 2024-08-09 11:23 ` Jiri Pirko
2024-08-09 11:49 ` Michal Swiatkowski
0 siblings, 1 reply; 26+ messages in thread
From: Jiri Pirko @ 2024-08-09 11:23 UTC (permalink / raw)
To: Tony Nguyen
Cc: davem, kuba, pabeni, edumazet, netdev, Piotr Raczynski,
michal.swiatkowski, jiri, shayd, wojciech.drewek, horms,
sridhar.samudrala, mateusz.polchlopek, kalesh-anakkur.purayil,
michal.kubiak, pio.raczynski, przemyslaw.kitszel, jacob.e.keller,
maciej.fijalkowski, Rafal Romanowski
Thu, Aug 08, 2024 at 07:30:52PM CEST, anthony.l.nguyen@intel.com wrote:
>From: Piotr Raczynski <piotr.raczynski@intel.com>
>
>Implement subfunction driver. It is probe when subfunction port is
>activated.
>
>VSI is already created. During the probe VSI is being configured.
>MAC unicast and broadcast filter is added to allow traffic to pass.
>
>Store subfunction pointer in VSI struct. The same is done for VF
>pointer. Make union of subfunction and VF pointer as only one of them
>can be set with one VSI.
>
>Reviewed-by: Simon Horman <horms@kernel.org>
>Reviewed-by: Jiri Pirko <jiri@nvidia.com>
>Signed-off-by: Piotr Raczynski <piotr.raczynski@intel.com>
>Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
>Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
>Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
>---
> drivers/net/ethernet/intel/ice/Makefile | 1 +
> .../ethernet/intel/ice/devlink/devlink_port.c | 41 ++++++
> .../ethernet/intel/ice/devlink/devlink_port.h | 3 +
> drivers/net/ethernet/intel/ice/ice.h | 7 +-
> drivers/net/ethernet/intel/ice/ice_main.c | 10 ++
> drivers/net/ethernet/intel/ice/ice_sf_eth.c | 139 ++++++++++++++++++
> drivers/net/ethernet/intel/ice/ice_sf_eth.h | 15 ++
> 7 files changed, 215 insertions(+), 1 deletion(-)
> create mode 100644 drivers/net/ethernet/intel/ice/ice_sf_eth.c
>
>diff --git a/drivers/net/ethernet/intel/ice/Makefile b/drivers/net/ethernet/intel/ice/Makefile
>index 03500e28ac99..4d987f5dcdc1 100644
>--- a/drivers/net/ethernet/intel/ice/Makefile
>+++ b/drivers/net/ethernet/intel/ice/Makefile
>@@ -31,6 +31,7 @@ ice-y := ice_main.o \
> ice_idc.o \
> devlink/devlink.o \
> devlink/devlink_port.o \
>+ ice_sf_eth.o \
> ice_ddp.o \
> ice_fw_update.o \
> ice_lag.o \
>diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
>index 5d1fe08e4bab..f06baabd0112 100644
>--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
>+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
>@@ -489,6 +489,47 @@ void ice_devlink_destroy_vf_port(struct ice_vf *vf)
> devl_port_unregister(&vf->devlink_port);
> }
>
>+/**
>+ * ice_devlink_create_sf_dev_port - Register virtual port for a subfunction
>+ * @sf_dev: the subfunction device to create a devlink port for
>+ *
>+ * Register virtual flavour devlink port for the subfunction auxiliary device
>+ * created after activating a dynamically added devlink port.
>+ *
>+ * Return: zero on success or an error code on failure.
>+ */
>+int ice_devlink_create_sf_dev_port(struct ice_sf_dev *sf_dev)
>+{
>+ struct devlink_port_attrs attrs = {};
>+ struct ice_dynamic_port *dyn_port;
>+ struct devlink_port *devlink_port;
>+ struct devlink *devlink;
>+ struct ice_vsi *vsi;
>+
>+ dyn_port = sf_dev->dyn_port;
>+ vsi = dyn_port->vsi;
>+
>+ devlink_port = &sf_dev->priv->devlink_port;
>+
>+ attrs.flavour = DEVLINK_PORT_FLAVOUR_VIRTUAL;
>+
>+ devlink_port_attrs_set(devlink_port, &attrs);
>+ devlink = priv_to_devlink(sf_dev->priv);
>+
>+ return devl_port_register(devlink, devlink_port, vsi->idx);
>+}
>+
>+/**
>+ * ice_devlink_destroy_sf_dev_port - Destroy virtual port for a subfunction
>+ * @sf_dev: the subfunction device to create a devlink port for
>+ *
>+ * Unregisters the virtual port associated with this subfunction.
>+ */
>+void ice_devlink_destroy_sf_dev_port(struct ice_sf_dev *sf_dev)
>+{
>+ devl_port_unregister(&sf_dev->priv->devlink_port);
>+}
>+
> /**
> * ice_dealloc_dynamic_port - Deallocate and remove a dynamic port
> * @dyn_port: dynamic port instance to deallocate
>diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
>index 08ebf56664a5..97b21b58c300 100644
>--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
>+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
>@@ -5,6 +5,7 @@
> #define _DEVLINK_PORT_H_
>
> #include "../ice.h"
>+#include "../ice_sf_eth.h"
>
> /**
> * struct ice_dynamic_port - Track dynamically added devlink port instance
>@@ -34,6 +35,8 @@ int ice_devlink_create_vf_port(struct ice_vf *vf);
> void ice_devlink_destroy_vf_port(struct ice_vf *vf);
> int ice_devlink_create_sf_port(struct ice_dynamic_port *dyn_port);
> void ice_devlink_destroy_sf_port(struct ice_dynamic_port *dyn_port);
>+int ice_devlink_create_sf_dev_port(struct ice_sf_dev *sf_dev);
>+void ice_devlink_destroy_sf_dev_port(struct ice_sf_dev *sf_dev);
>
> #define ice_devlink_port_to_dyn(port) \
> container_of(port, struct ice_dynamic_port, devlink_port)
>diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
>index d61f8e602cac..0046684004ff 100644
>--- a/drivers/net/ethernet/intel/ice/ice.h
>+++ b/drivers/net/ethernet/intel/ice/ice.h
>@@ -449,7 +449,12 @@ struct ice_vsi {
> struct_group_tagged(ice_vsi_cfg_params, params,
> struct ice_port_info *port_info; /* back pointer to port_info */
> struct ice_channel *ch; /* VSI's channel structure, may be NULL */
>- struct ice_vf *vf; /* VF associated with this VSI, may be NULL */
>+ union {
>+ /* VF associated with this VSI, may be NULL */
>+ struct ice_vf *vf;
>+ /* SF associated with this VSI, may be NULL */
>+ struct ice_dynamic_port *sf;
>+ };
> u32 flags; /* VSI flags used for rebuild and configuration */
> enum ice_vsi_type type; /* the type of the VSI */
> );
>diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
>index e10f10a21c95..bdd88617ec9b 100644
>--- a/drivers/net/ethernet/intel/ice/ice_main.c
>+++ b/drivers/net/ethernet/intel/ice/ice_main.c
>@@ -15,6 +15,7 @@
> #include "ice_dcb_nl.h"
> #include "devlink/devlink.h"
> #include "devlink/devlink_port.h"
>+#include "ice_sf_eth.h"
> #include "ice_hwmon.h"
> /* Including ice_trace.h with CREATE_TRACE_POINTS defined will generate the
> * ice tracepoint functions. This must be done exactly once across the
>@@ -5908,8 +5909,16 @@ static int __init ice_module_init(void)
> goto err_dest_lag_wq;
> }
>
>+ status = ice_sf_driver_register();
>+ if (status) {
>+ pr_err("Failed to register SF driver, err %d\n", status);
>+ goto err_sf_driver;
>+ }
>+
> return 0;
>
>+err_sf_driver:
>+ pci_unregister_driver(&ice_driver);
> err_dest_lag_wq:
> destroy_workqueue(ice_lag_wq);
> ice_debugfs_exit();
>@@ -5927,6 +5936,7 @@ module_init(ice_module_init);
> */
> static void __exit ice_module_exit(void)
> {
>+ ice_sf_driver_unregister();
> pci_unregister_driver(&ice_driver);
> ice_debugfs_exit();
> destroy_workqueue(ice_wq);
>diff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.c b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
>new file mode 100644
>index 000000000000..abe495c2d033
>--- /dev/null
>+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
>@@ -0,0 +1,139 @@
>+// SPDX-License-Identifier: GPL-2.0
>+/* Copyright (c) 2024, Intel Corporation. */
>+#include "ice.h"
>+#include "ice_lib.h"
>+#include "ice_fltr.h"
>+#include "ice_sf_eth.h"
>+#include "devlink/devlink_port.h"
>+#include "devlink/devlink.h"
>+
>+/**
>+ * ice_sf_dev_probe - subfunction driver probe function
>+ * @adev: pointer to the auxiliary device
>+ * @id: pointer to the auxiliary_device id
>+ *
>+ * Configure VSI and netdev resources for the subfunction device.
>+ *
>+ * Return: zero on success or an error code on failure.
>+ */
>+static int ice_sf_dev_probe(struct auxiliary_device *adev,
>+ const struct auxiliary_device_id *id)
>+{
>+ struct ice_sf_dev *sf_dev = ice_adev_to_sf_dev(adev);
>+ struct ice_dynamic_port *dyn_port = sf_dev->dyn_port;
>+ struct ice_vsi *vsi = dyn_port->vsi;
>+ struct ice_pf *pf = dyn_port->pf;
>+ struct device *dev = &adev->dev;
>+ struct ice_sf_priv *priv;
>+ struct devlink *devlink;
>+ int err;
>+
>+ vsi->type = ICE_VSI_SF;
>+ vsi->port_info = pf->hw.port_info;
>+ vsi->flags = ICE_VSI_FLAG_INIT;
>+
>+ priv = ice_allocate_sf(&adev->dev, pf);
>+ if (!priv) {
>+ dev_err(dev, "Subfunction devlink alloc failed");
>+ return -ENOMEM;
>+ }
>+
>+ priv->dev = sf_dev;
>+ sf_dev->priv = priv;
>+ devlink = priv_to_devlink(priv);
>+
>+ devl_lock(devlink);
>+
>+ err = ice_vsi_cfg(vsi);
>+ if (err) {
>+ dev_err(dev, "Subfunction vsi config failed");
>+ goto err_free_devlink;
>+ }
>+ vsi->sf = dyn_port;
>+
>+ err = ice_devlink_create_sf_dev_port(sf_dev);
>+ if (err) {
>+ dev_err(dev, "Cannot add ice virtual devlink port for subfunction");
>+ goto err_vsi_decfg;
>+ }
>+
>+ err = devl_port_fn_devlink_set(&dyn_port->devlink_port, devlink);
>+ if (err) {
>+ dev_err(dev, "Can't link devlink instance to SF devlink port");
>+ goto err_devlink_destroy;
>+ }
>+
>+ ice_napi_add(vsi);
>+ devl_unlock(devlink);
>+
>+ devlink_register(devlink);
Use devl_register() and do it before you call devl_unlock() :)
>+
>+ return 0;
>+
>+err_devlink_destroy:
>+ ice_devlink_destroy_sf_dev_port(sf_dev);
>+err_vsi_decfg:
>+ ice_vsi_decfg(vsi);
>+err_free_devlink:
>+ devl_unlock(devlink);
>+ devlink_free(devlink);
>+ return err;
>+}
>+
>+/**
>+ * ice_sf_dev_remove - subfunction driver remove function
>+ * @adev: pointer to the auxiliary device
>+ *
>+ * Deinitalize VSI and netdev resources for the subfunction device.
>+ */
>+static void ice_sf_dev_remove(struct auxiliary_device *adev)
>+{
>+ struct ice_sf_dev *sf_dev = ice_adev_to_sf_dev(adev);
>+ struct ice_dynamic_port *dyn_port = sf_dev->dyn_port;
>+ struct ice_vsi *vsi = dyn_port->vsi;
>+ struct devlink *devlink;
>+
>+ devlink = priv_to_devlink(sf_dev->priv);
>+ devl_lock(devlink);
>+
>+ ice_vsi_close(vsi);
>+
>+ ice_devlink_destroy_sf_dev_port(sf_dev);
>+ devl_unregister(devlink);
Interesting, you call devl_unregister() here...
>+ devl_unlock(devlink);
>+ devlink_free(devlink);
>+ ice_vsi_decfg(vsi);
>+}
>+
>+static const struct auxiliary_device_id ice_sf_dev_id_table[] = {
>+ { .name = "ice.sf", },
>+ { },
>+};
>+
>+MODULE_DEVICE_TABLE(auxiliary, ice_sf_dev_id_table);
>+
>+static struct auxiliary_driver ice_sf_driver = {
>+ .name = "sf",
>+ .probe = ice_sf_dev_probe,
>+ .remove = ice_sf_dev_remove,
>+ .id_table = ice_sf_dev_id_table
>+};
>+
>+/**
>+ * ice_sf_driver_register - Register new auxiliary subfunction driver
>+ *
>+ * Return: zero on success or an error code on failure.
>+ */
>+int ice_sf_driver_register(void)
>+{
>+ return auxiliary_driver_register(&ice_sf_driver);
>+}
>+
>+/**
>+ * ice_sf_driver_unregister - Unregister new auxiliary subfunction driver
>+ *
>+ */
>+void ice_sf_driver_unregister(void)
>+{
>+ auxiliary_driver_unregister(&ice_sf_driver);
>+}
>diff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.h b/drivers/net/ethernet/intel/ice/ice_sf_eth.h
>index 267da33a0135..e972c50f96c9 100644
>--- a/drivers/net/ethernet/intel/ice/ice_sf_eth.h
>+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.h
>@@ -7,9 +7,24 @@
> #include <linux/auxiliary_bus.h>
> #include "ice.h"
>
>+struct ice_sf_dev {
>+ struct auxiliary_device adev;
>+ struct ice_dynamic_port *dyn_port;
>+ struct ice_sf_priv *priv;
>+};
>+
> struct ice_sf_priv {
> struct ice_sf_dev *dev;
> struct devlink_port devlink_port;
> };
>
>+static inline struct
>+ice_sf_dev *ice_adev_to_sf_dev(struct auxiliary_device *adev)
>+{
>+ return container_of(adev, struct ice_sf_dev, adev);
>+}
>+
>+int ice_sf_driver_register(void);
>+void ice_sf_driver_unregister(void);
>+
> #endif /* _ICE_SF_ETH_H_ */
>--
>2.42.0
>
>
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH net-next v3 06/15] ice: base subfunction aux driver
2024-08-09 11:23 ` Jiri Pirko
@ 2024-08-09 11:49 ` Michal Swiatkowski
0 siblings, 0 replies; 26+ messages in thread
From: Michal Swiatkowski @ 2024-08-09 11:49 UTC (permalink / raw)
To: Jiri Pirko
Cc: Tony Nguyen, davem, kuba, pabeni, edumazet, netdev,
Piotr Raczynski, jiri, shayd, wojciech.drewek, horms,
sridhar.samudrala, mateusz.polchlopek, kalesh-anakkur.purayil,
michal.kubiak, pio.raczynski, przemyslaw.kitszel, jacob.e.keller,
maciej.fijalkowski, Rafal Romanowski
On Fri, Aug 09, 2024 at 01:23:12PM +0200, Jiri Pirko wrote:
> Thu, Aug 08, 2024 at 07:30:52PM CEST, anthony.l.nguyen@intel.com wrote:
> >From: Piotr Raczynski <piotr.raczynski@intel.com>
> >
> >Implement subfunction driver. It is probe when subfunction port is
> >activated.
> >
> >VSI is already created. During the probe VSI is being configured.
> >MAC unicast and broadcast filter is added to allow traffic to pass.
> >
> >Store subfunction pointer in VSI struct. The same is done for VF
> >pointer. Make union of subfunction and VF pointer as only one of them
> >can be set with one VSI.
> >
> >Reviewed-by: Simon Horman <horms@kernel.org>
> >Reviewed-by: Jiri Pirko <jiri@nvidia.com>
> >Signed-off-by: Piotr Raczynski <piotr.raczynski@intel.com>
> >Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
> >Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
> >Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
> >---
> > drivers/net/ethernet/intel/ice/Makefile | 1 +
> > .../ethernet/intel/ice/devlink/devlink_port.c | 41 ++++++
> > .../ethernet/intel/ice/devlink/devlink_port.h | 3 +
> > drivers/net/ethernet/intel/ice/ice.h | 7 +-
> > drivers/net/ethernet/intel/ice/ice_main.c | 10 ++
> > drivers/net/ethernet/intel/ice/ice_sf_eth.c | 139 ++++++++++++++++++
> > drivers/net/ethernet/intel/ice/ice_sf_eth.h | 15 ++
> > 7 files changed, 215 insertions(+), 1 deletion(-)
> > create mode 100644 drivers/net/ethernet/intel/ice/ice_sf_eth.c
> >
> >diff --git a/drivers/net/ethernet/intel/ice/Makefile b/drivers/net/ethernet/intel/ice/Makefile
> >index 03500e28ac99..4d987f5dcdc1 100644
> >--- a/drivers/net/ethernet/intel/ice/Makefile
> >+++ b/drivers/net/ethernet/intel/ice/Makefile
> >@@ -31,6 +31,7 @@ ice-y := ice_main.o \
> > ice_idc.o \
> > devlink/devlink.o \
> > devlink/devlink_port.o \
> >+ ice_sf_eth.o \
> > ice_ddp.o \
> > ice_fw_update.o \
> > ice_lag.o \
> >diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
> >index 5d1fe08e4bab..f06baabd0112 100644
> >--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
> >+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
> >@@ -489,6 +489,47 @@ void ice_devlink_destroy_vf_port(struct ice_vf *vf)
> > devl_port_unregister(&vf->devlink_port);
> > }
> >
> >+/**
> >+ * ice_devlink_create_sf_dev_port - Register virtual port for a subfunction
> >+ * @sf_dev: the subfunction device to create a devlink port for
> >+ *
> >+ * Register virtual flavour devlink port for the subfunction auxiliary device
> >+ * created after activating a dynamically added devlink port.
> >+ *
> >+ * Return: zero on success or an error code on failure.
> >+ */
> >+int ice_devlink_create_sf_dev_port(struct ice_sf_dev *sf_dev)
> >+{
> >+ struct devlink_port_attrs attrs = {};
> >+ struct ice_dynamic_port *dyn_port;
> >+ struct devlink_port *devlink_port;
> >+ struct devlink *devlink;
> >+ struct ice_vsi *vsi;
> >+
> >+ dyn_port = sf_dev->dyn_port;
> >+ vsi = dyn_port->vsi;
> >+
> >+ devlink_port = &sf_dev->priv->devlink_port;
> >+
> >+ attrs.flavour = DEVLINK_PORT_FLAVOUR_VIRTUAL;
> >+
> >+ devlink_port_attrs_set(devlink_port, &attrs);
> >+ devlink = priv_to_devlink(sf_dev->priv);
> >+
> >+ return devl_port_register(devlink, devlink_port, vsi->idx);
> >+}
> >+
> >+/**
> >+ * ice_devlink_destroy_sf_dev_port - Destroy virtual port for a subfunction
> >+ * @sf_dev: the subfunction device to create a devlink port for
> >+ *
> >+ * Unregisters the virtual port associated with this subfunction.
> >+ */
> >+void ice_devlink_destroy_sf_dev_port(struct ice_sf_dev *sf_dev)
> >+{
> >+ devl_port_unregister(&sf_dev->priv->devlink_port);
> >+}
> >+
> > /**
> > * ice_dealloc_dynamic_port - Deallocate and remove a dynamic port
> > * @dyn_port: dynamic port instance to deallocate
> >diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
> >index 08ebf56664a5..97b21b58c300 100644
> >--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
> >+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
> >@@ -5,6 +5,7 @@
> > #define _DEVLINK_PORT_H_
> >
> > #include "../ice.h"
> >+#include "../ice_sf_eth.h"
> >
> > /**
> > * struct ice_dynamic_port - Track dynamically added devlink port instance
> >@@ -34,6 +35,8 @@ int ice_devlink_create_vf_port(struct ice_vf *vf);
> > void ice_devlink_destroy_vf_port(struct ice_vf *vf);
> > int ice_devlink_create_sf_port(struct ice_dynamic_port *dyn_port);
> > void ice_devlink_destroy_sf_port(struct ice_dynamic_port *dyn_port);
> >+int ice_devlink_create_sf_dev_port(struct ice_sf_dev *sf_dev);
> >+void ice_devlink_destroy_sf_dev_port(struct ice_sf_dev *sf_dev);
> >
> > #define ice_devlink_port_to_dyn(port) \
> > container_of(port, struct ice_dynamic_port, devlink_port)
> >diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
> >index d61f8e602cac..0046684004ff 100644
> >--- a/drivers/net/ethernet/intel/ice/ice.h
> >+++ b/drivers/net/ethernet/intel/ice/ice.h
> >@@ -449,7 +449,12 @@ struct ice_vsi {
> > struct_group_tagged(ice_vsi_cfg_params, params,
> > struct ice_port_info *port_info; /* back pointer to port_info */
> > struct ice_channel *ch; /* VSI's channel structure, may be NULL */
> >- struct ice_vf *vf; /* VF associated with this VSI, may be NULL */
> >+ union {
> >+ /* VF associated with this VSI, may be NULL */
> >+ struct ice_vf *vf;
> >+ /* SF associated with this VSI, may be NULL */
> >+ struct ice_dynamic_port *sf;
> >+ };
> > u32 flags; /* VSI flags used for rebuild and configuration */
> > enum ice_vsi_type type; /* the type of the VSI */
> > );
> >diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
> >index e10f10a21c95..bdd88617ec9b 100644
> >--- a/drivers/net/ethernet/intel/ice/ice_main.c
> >+++ b/drivers/net/ethernet/intel/ice/ice_main.c
> >@@ -15,6 +15,7 @@
> > #include "ice_dcb_nl.h"
> > #include "devlink/devlink.h"
> > #include "devlink/devlink_port.h"
> >+#include "ice_sf_eth.h"
> > #include "ice_hwmon.h"
> > /* Including ice_trace.h with CREATE_TRACE_POINTS defined will generate the
> > * ice tracepoint functions. This must be done exactly once across the
> >@@ -5908,8 +5909,16 @@ static int __init ice_module_init(void)
> > goto err_dest_lag_wq;
> > }
> >
> >+ status = ice_sf_driver_register();
> >+ if (status) {
> >+ pr_err("Failed to register SF driver, err %d\n", status);
> >+ goto err_sf_driver;
> >+ }
> >+
> > return 0;
> >
> >+err_sf_driver:
> >+ pci_unregister_driver(&ice_driver);
> > err_dest_lag_wq:
> > destroy_workqueue(ice_lag_wq);
> > ice_debugfs_exit();
> >@@ -5927,6 +5936,7 @@ module_init(ice_module_init);
> > */
> > static void __exit ice_module_exit(void)
> > {
> >+ ice_sf_driver_unregister();
> > pci_unregister_driver(&ice_driver);
> > ice_debugfs_exit();
> > destroy_workqueue(ice_wq);
> >diff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.c b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
> >new file mode 100644
> >index 000000000000..abe495c2d033
> >--- /dev/null
> >+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
> >@@ -0,0 +1,139 @@
> >+// SPDX-License-Identifier: GPL-2.0
> >+/* Copyright (c) 2024, Intel Corporation. */
> >+#include "ice.h"
> >+#include "ice_lib.h"
> >+#include "ice_fltr.h"
> >+#include "ice_sf_eth.h"
> >+#include "devlink/devlink_port.h"
> >+#include "devlink/devlink.h"
> >+
> >+/**
> >+ * ice_sf_dev_probe - subfunction driver probe function
> >+ * @adev: pointer to the auxiliary device
> >+ * @id: pointer to the auxiliary_device id
> >+ *
> >+ * Configure VSI and netdev resources for the subfunction device.
> >+ *
> >+ * Return: zero on success or an error code on failure.
> >+ */
> >+static int ice_sf_dev_probe(struct auxiliary_device *adev,
> >+ const struct auxiliary_device_id *id)
> >+{
> >+ struct ice_sf_dev *sf_dev = ice_adev_to_sf_dev(adev);
> >+ struct ice_dynamic_port *dyn_port = sf_dev->dyn_port;
> >+ struct ice_vsi *vsi = dyn_port->vsi;
> >+ struct ice_pf *pf = dyn_port->pf;
> >+ struct device *dev = &adev->dev;
> >+ struct ice_sf_priv *priv;
> >+ struct devlink *devlink;
> >+ int err;
> >+
> >+ vsi->type = ICE_VSI_SF;
> >+ vsi->port_info = pf->hw.port_info;
> >+ vsi->flags = ICE_VSI_FLAG_INIT;
> >+
> >+ priv = ice_allocate_sf(&adev->dev, pf);
> >+ if (!priv) {
> >+ dev_err(dev, "Subfunction devlink alloc failed");
> >+ return -ENOMEM;
> >+ }
> >+
> >+ priv->dev = sf_dev;
> >+ sf_dev->priv = priv;
> >+ devlink = priv_to_devlink(priv);
> >+
> >+ devl_lock(devlink);
> >+
> >+ err = ice_vsi_cfg(vsi);
> >+ if (err) {
> >+ dev_err(dev, "Subfunction vsi config failed");
> >+ goto err_free_devlink;
> >+ }
> >+ vsi->sf = dyn_port;
> >+
> >+ err = ice_devlink_create_sf_dev_port(sf_dev);
> >+ if (err) {
> >+ dev_err(dev, "Cannot add ice virtual devlink port for subfunction");
> >+ goto err_vsi_decfg;
> >+ }
> >+
> >+ err = devl_port_fn_devlink_set(&dyn_port->devlink_port, devlink);
> >+ if (err) {
> >+ dev_err(dev, "Can't link devlink instance to SF devlink port");
> >+ goto err_devlink_destroy;
> >+ }
> >+
> >+ ice_napi_add(vsi);
> >+ devl_unlock(devlink);
> >+
> >+ devlink_register(devlink);
>
> Use devl_register() and do it before you call devl_unlock() :)
>
Ok, I will
> >+
> >+ return 0;
> >+
> >+err_devlink_destroy:
> >+ ice_devlink_destroy_sf_dev_port(sf_dev);
> >+err_vsi_decfg:
> >+ ice_vsi_decfg(vsi);
> >+err_free_devlink:
> >+ devl_unlock(devlink);
> >+ devlink_free(devlink);
> >+ return err;
> >+}
> >+
> >+/**
> >+ * ice_sf_dev_remove - subfunction driver remove function
> >+ * @adev: pointer to the auxiliary device
> >+ *
> >+ * Deinitalize VSI and netdev resources for the subfunction device.
> >+ */
> >+static void ice_sf_dev_remove(struct auxiliary_device *adev)
> >+{
> >+ struct ice_sf_dev *sf_dev = ice_adev_to_sf_dev(adev);
> >+ struct ice_dynamic_port *dyn_port = sf_dev->dyn_port;
> >+ struct ice_vsi *vsi = dyn_port->vsi;
> >+ struct devlink *devlink;
> >+
> >+ devlink = priv_to_devlink(sf_dev->priv);
> >+ devl_lock(devlink);
> >+
> >+ ice_vsi_close(vsi);
> >+
> >+ ice_devlink_destroy_sf_dev_port(sf_dev);
> >+ devl_unregister(devlink);
>
> Interesting, you call devl_unregister() here...
I forgot to move and use devl_register in probe.
>
>
> >+ devl_unlock(devlink);
> >+ devlink_free(devlink);
> >+ ice_vsi_decfg(vsi);
> >+}
> >+
> >+static const struct auxiliary_device_id ice_sf_dev_id_table[] = {
> >+ { .name = "ice.sf", },
> >+ { },
> >+};
> >+
> >+MODULE_DEVICE_TABLE(auxiliary, ice_sf_dev_id_table);
> >+
> >+static struct auxiliary_driver ice_sf_driver = {
> >+ .name = "sf",
> >+ .probe = ice_sf_dev_probe,
> >+ .remove = ice_sf_dev_remove,
> >+ .id_table = ice_sf_dev_id_table
> >+};
> >+
> >+/**
> >+ * ice_sf_driver_register - Register new auxiliary subfunction driver
> >+ *
> >+ * Return: zero on success or an error code on failure.
> >+ */
> >+int ice_sf_driver_register(void)
> >+{
> >+ return auxiliary_driver_register(&ice_sf_driver);
> >+}
> >+
> >+/**
> >+ * ice_sf_driver_unregister - Unregister new auxiliary subfunction driver
> >+ *
> >+ */
> >+void ice_sf_driver_unregister(void)
> >+{
> >+ auxiliary_driver_unregister(&ice_sf_driver);
> >+}
> >diff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.h b/drivers/net/ethernet/intel/ice/ice_sf_eth.h
> >index 267da33a0135..e972c50f96c9 100644
> >--- a/drivers/net/ethernet/intel/ice/ice_sf_eth.h
> >+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.h
> >@@ -7,9 +7,24 @@
> > #include <linux/auxiliary_bus.h>
> > #include "ice.h"
> >
> >+struct ice_sf_dev {
> >+ struct auxiliary_device adev;
> >+ struct ice_dynamic_port *dyn_port;
> >+ struct ice_sf_priv *priv;
> >+};
> >+
> > struct ice_sf_priv {
> > struct ice_sf_dev *dev;
> > struct devlink_port devlink_port;
> > };
> >
> >+static inline struct
> >+ice_sf_dev *ice_adev_to_sf_dev(struct auxiliary_device *adev)
> >+{
> >+ return container_of(adev, struct ice_sf_dev, adev);
> >+}
> >+
> >+int ice_sf_driver_register(void);
> >+void ice_sf_driver_unregister(void);
> >+
> > #endif /* _ICE_SF_ETH_H_ */
> >--
> >2.42.0
> >
> >
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH net-next v3 07/15] ice: implement netdev for subfunction
2024-08-08 17:30 [PATCH net-next v3 00/15][pull request] ice: support devlink subfunction Tony Nguyen
` (5 preceding siblings ...)
2024-08-08 17:30 ` [PATCH net-next v3 06/15] ice: base subfunction aux driver Tony Nguyen
@ 2024-08-08 17:30 ` Tony Nguyen
2024-08-08 17:30 ` [PATCH net-next v3 08/15] ice: make representor code generic Tony Nguyen
` (7 subsequent siblings)
14 siblings, 0 replies; 26+ messages in thread
From: Tony Nguyen @ 2024-08-08 17:30 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Piotr Raczynski, anthony.l.nguyen, michal.swiatkowski, jiri,
shayd, wojciech.drewek, horms, sridhar.samudrala,
mateusz.polchlopek, kalesh-anakkur.purayil, michal.kubiak,
pio.raczynski, przemyslaw.kitszel, jacob.e.keller,
maciej.fijalkowski, Rafal Romanowski
From: Piotr Raczynski <piotr.raczynski@intel.com>
Configure netdevice for subfunction usecase. Mostly it is reusing ops
from the PF netdevice.
SF netdev is linked to devlink port registered after SF activation.
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Piotr Raczynski <piotr.raczynski@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ice/ice_sf_eth.c | 86 ++++++++++++++++++++-
1 file changed, 85 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.c b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
index abe495c2d033..b1b4bdc8f710 100644
--- a/drivers/net/ethernet/intel/ice/ice_sf_eth.c
+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
@@ -2,11 +2,86 @@
/* Copyright (c) 2024, Intel Corporation. */
#include "ice.h"
#include "ice_lib.h"
+#include "ice_txrx.h"
#include "ice_fltr.h"
#include "ice_sf_eth.h"
#include "devlink/devlink_port.h"
#include "devlink/devlink.h"
+static const struct net_device_ops ice_sf_netdev_ops = {
+ .ndo_open = ice_open,
+ .ndo_stop = ice_stop,
+ .ndo_start_xmit = ice_start_xmit,
+ .ndo_vlan_rx_add_vid = ice_vlan_rx_add_vid,
+ .ndo_vlan_rx_kill_vid = ice_vlan_rx_kill_vid,
+ .ndo_change_mtu = ice_change_mtu,
+ .ndo_get_stats64 = ice_get_stats64,
+ .ndo_tx_timeout = ice_tx_timeout,
+ .ndo_bpf = ice_xdp,
+ .ndo_xdp_xmit = ice_xdp_xmit,
+ .ndo_xsk_wakeup = ice_xsk_wakeup,
+};
+
+/**
+ * ice_sf_cfg_netdev - Allocate, configure and register a netdev
+ * @dyn_port: subfunction associated with configured netdev
+ * @devlink_port: subfunction devlink port to be linked with netdev
+ *
+ * Return: 0 on success, negative value on failure
+ */
+static int ice_sf_cfg_netdev(struct ice_dynamic_port *dyn_port,
+ struct devlink_port *devlink_port)
+{
+ struct ice_vsi *vsi = dyn_port->vsi;
+ struct ice_netdev_priv *np;
+ struct net_device *netdev;
+ int err;
+
+ netdev = alloc_etherdev_mqs(sizeof(*np), vsi->alloc_txq,
+ vsi->alloc_rxq);
+ if (!netdev)
+ return -ENOMEM;
+
+ SET_NETDEV_DEV(netdev, &vsi->back->pdev->dev);
+ set_bit(ICE_VSI_NETDEV_ALLOCD, vsi->state);
+ vsi->netdev = netdev;
+ np = netdev_priv(netdev);
+ np->vsi = vsi;
+
+ ice_set_netdev_features(netdev);
+
+ netdev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT |
+ NETDEV_XDP_ACT_XSK_ZEROCOPY |
+ NETDEV_XDP_ACT_RX_SG;
+ netdev->xdp_zc_max_segs = ICE_MAX_BUF_TXD;
+
+ eth_hw_addr_set(netdev, dyn_port->hw_addr);
+ ether_addr_copy(netdev->perm_addr, dyn_port->hw_addr);
+ netdev->netdev_ops = &ice_sf_netdev_ops;
+ SET_NETDEV_DEVLINK_PORT(netdev, devlink_port);
+
+ err = register_netdev(netdev);
+ if (err) {
+ free_netdev(netdev);
+ vsi->netdev = NULL;
+ return -ENOMEM;
+ }
+ set_bit(ICE_VSI_NETDEV_REGISTERED, vsi->state);
+ netif_carrier_off(netdev);
+ netif_tx_stop_all_queues(netdev);
+
+ return 0;
+}
+
+static void ice_sf_decfg_netdev(struct ice_vsi *vsi)
+{
+ unregister_netdev(vsi->netdev);
+ clear_bit(ICE_VSI_NETDEV_REGISTERED, vsi->state);
+ free_netdev(vsi->netdev);
+ vsi->netdev = NULL;
+ clear_bit(ICE_VSI_NETDEV_ALLOCD, vsi->state);
+}
+
/**
* ice_sf_dev_probe - subfunction driver probe function
* @adev: pointer to the auxiliary device
@@ -57,10 +132,16 @@ static int ice_sf_dev_probe(struct auxiliary_device *adev,
goto err_vsi_decfg;
}
+ err = ice_sf_cfg_netdev(dyn_port, &sf_dev->priv->devlink_port);
+ if (err) {
+ dev_err(dev, "Subfunction netdev config failed");
+ goto err_devlink_destroy;
+ }
+
err = devl_port_fn_devlink_set(&dyn_port->devlink_port, devlink);
if (err) {
dev_err(dev, "Can't link devlink instance to SF devlink port");
- goto err_devlink_destroy;
+ goto err_netdev_decfg;
}
ice_napi_add(vsi);
@@ -70,6 +151,8 @@ static int ice_sf_dev_probe(struct auxiliary_device *adev,
return 0;
+err_netdev_decfg:
+ ice_sf_decfg_netdev(vsi);
err_devlink_destroy:
ice_devlink_destroy_sf_dev_port(sf_dev);
err_vsi_decfg:
@@ -98,6 +181,7 @@ static void ice_sf_dev_remove(struct auxiliary_device *adev)
ice_vsi_close(vsi);
+ ice_sf_decfg_netdev(vsi);
ice_devlink_destroy_sf_dev_port(sf_dev);
devl_unregister(devlink);
devl_unlock(devlink);
--
2.42.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next v3 08/15] ice: make representor code generic
2024-08-08 17:30 [PATCH net-next v3 00/15][pull request] ice: support devlink subfunction Tony Nguyen
` (6 preceding siblings ...)
2024-08-08 17:30 ` [PATCH net-next v3 07/15] ice: implement netdev for subfunction Tony Nguyen
@ 2024-08-08 17:30 ` Tony Nguyen
2024-08-08 17:30 ` [PATCH net-next v3 09/15] ice: create port representor for SF Tony Nguyen
` (6 subsequent siblings)
14 siblings, 0 replies; 26+ messages in thread
From: Tony Nguyen @ 2024-08-08 17:30 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Michal Swiatkowski, anthony.l.nguyen, jiri, shayd,
wojciech.drewek, horms, sridhar.samudrala, mateusz.polchlopek,
kalesh-anakkur.purayil, michal.kubiak, pio.raczynski,
przemyslaw.kitszel, jacob.e.keller, maciej.fijalkowski,
Rafal Romanowski
From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Keep the same flow of port representor creation, but instead of general
attach function create helpers for specific representor type.
Store function pointer for add and remove representor.
Type of port representor can be also known based on VSI type, but it
is more clean to have it directly saved in port representor structure.
Add devlink lock for whole port representor creation and destruction.
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
.../ethernet/intel/ice/devlink/devlink_port.h | 2 +
drivers/net/ethernet/intel/ice/ice_eswitch.c | 72 ++++++++++-----
drivers/net/ethernet/intel/ice/ice_eswitch.h | 11 +--
drivers/net/ethernet/intel/ice/ice_repr.c | 88 +++++++++----------
drivers/net/ethernet/intel/ice/ice_repr.h | 16 +++-
drivers/net/ethernet/intel/ice/ice_sriov.c | 4 +-
drivers/net/ethernet/intel/ice/ice_vf_lib.c | 4 +-
7 files changed, 121 insertions(+), 76 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
index 97b21b58c300..479d2b976745 100644
--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
@@ -14,6 +14,7 @@
* @devlink_port: the associated devlink port structure
* @pf: pointer to the PF private structure
* @vsi: the VSI associated with this port
+ * @repr_id: the representor ID
* @sfnum: the subfunction ID
*
* An instance of a dynamically added devlink port. Each port flavour
@@ -24,6 +25,7 @@ struct ice_dynamic_port {
struct devlink_port devlink_port;
struct ice_pf *pf;
struct ice_vsi *vsi;
+ unsigned long repr_id;
u32 sfnum;
};
diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch.c b/drivers/net/ethernet/intel/ice/ice_eswitch.c
index 3cfa071e3718..00d49477bdcb 100644
--- a/drivers/net/ethernet/intel/ice/ice_eswitch.c
+++ b/drivers/net/ethernet/intel/ice/ice_eswitch.c
@@ -452,11 +452,9 @@ static void ice_eswitch_start_reprs(struct ice_pf *pf)
ice_eswitch_start_all_tx_queues(pf);
}
-int
-ice_eswitch_attach(struct ice_pf *pf, struct ice_vf *vf)
+static int
+ice_eswitch_attach(struct ice_pf *pf, struct ice_repr *repr, unsigned long *id)
{
- struct devlink *devlink = priv_to_devlink(pf);
- struct ice_repr *repr;
int err;
if (pf->eswitch_mode == DEVLINK_ESWITCH_MODE_LEGACY)
@@ -470,13 +468,9 @@ ice_eswitch_attach(struct ice_pf *pf, struct ice_vf *vf)
ice_eswitch_stop_reprs(pf);
- devl_lock(devlink);
- repr = ice_repr_add_vf(vf);
- devl_unlock(devlink);
- if (IS_ERR(repr)) {
- err = PTR_ERR(repr);
+ err = repr->ops.add(repr);
+ if (err)
goto err_create_repr;
- }
err = ice_eswitch_setup_repr(pf, repr);
if (err)
@@ -486,7 +480,7 @@ ice_eswitch_attach(struct ice_pf *pf, struct ice_vf *vf)
if (err)
goto err_xa_alloc;
- vf->repr_id = repr->id;
+ *id = repr->id;
ice_eswitch_start_reprs(pf);
@@ -495,9 +489,7 @@ ice_eswitch_attach(struct ice_pf *pf, struct ice_vf *vf)
err_xa_alloc:
ice_eswitch_release_repr(pf, repr);
err_setup_repr:
- devl_lock(devlink);
- ice_repr_rem_vf(repr);
- devl_unlock(devlink);
+ repr->ops.rem(repr);
err_create_repr:
if (xa_empty(&pf->eswitch.reprs))
ice_eswitch_disable_switchdev(pf);
@@ -506,14 +498,35 @@ ice_eswitch_attach(struct ice_pf *pf, struct ice_vf *vf)
return err;
}
-void ice_eswitch_detach(struct ice_pf *pf, struct ice_vf *vf)
+/**
+ * ice_eswitch_attach_vf - attach VF to a eswitch
+ * @pf: pointer to PF structure
+ * @vf: pointer to VF structure to be attached
+ *
+ * During attaching port representor for VF is created.
+ *
+ * Return: zero on success or an error code on failure.
+ */
+int ice_eswitch_attach_vf(struct ice_pf *pf, struct ice_vf *vf)
{
- struct ice_repr *repr = xa_load(&pf->eswitch.reprs, vf->repr_id);
+ struct ice_repr *repr = ice_repr_create_vf(vf);
struct devlink *devlink = priv_to_devlink(pf);
+ int err;
- if (!repr)
- return;
+ if (IS_ERR(repr))
+ return PTR_ERR(repr);
+ devl_lock(devlink);
+ err = ice_eswitch_attach(pf, repr, &vf->repr_id);
+ if (err)
+ ice_repr_destroy(repr);
+ devl_unlock(devlink);
+
+ return err;
+}
+
+static void ice_eswitch_detach(struct ice_pf *pf, struct ice_repr *repr)
+{
ice_eswitch_stop_reprs(pf);
xa_erase(&pf->eswitch.reprs, repr->id);
@@ -521,10 +534,12 @@ void ice_eswitch_detach(struct ice_pf *pf, struct ice_vf *vf)
ice_eswitch_disable_switchdev(pf);
ice_eswitch_release_repr(pf, repr);
- devl_lock(devlink);
- ice_repr_rem_vf(repr);
+ repr->ops.rem(repr);
+ ice_repr_destroy(repr);
if (xa_empty(&pf->eswitch.reprs)) {
+ struct devlink *devlink = priv_to_devlink(pf);
+
/* since all port representors are destroyed, there is
* no point in keeping the nodes
*/
@@ -533,6 +548,23 @@ void ice_eswitch_detach(struct ice_pf *pf, struct ice_vf *vf)
} else {
ice_eswitch_start_reprs(pf);
}
+}
+
+/**
+ * ice_eswitch_detach_vf - detach VF from a eswitch
+ * @pf: pointer to PF structure
+ * @vf: pointer to VF structure to be detached
+ */
+void ice_eswitch_detach_vf(struct ice_pf *pf, struct ice_vf *vf)
+{
+ struct ice_repr *repr = xa_load(&pf->eswitch.reprs, vf->repr_id);
+ struct devlink *devlink = priv_to_devlink(pf);
+
+ if (!repr)
+ return;
+
+ devl_lock(devlink);
+ ice_eswitch_detach(pf, repr);
devl_unlock(devlink);
}
diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch.h b/drivers/net/ethernet/intel/ice/ice_eswitch.h
index 78fd39a6935d..d1699954a7ad 100644
--- a/drivers/net/ethernet/intel/ice/ice_eswitch.h
+++ b/drivers/net/ethernet/intel/ice/ice_eswitch.h
@@ -5,11 +5,11 @@
#define _ICE_ESWITCH_H_
#include <net/devlink.h>
+#include "devlink/devlink_port.h"
#ifdef CONFIG_ICE_SWITCHDEV
-void ice_eswitch_detach(struct ice_pf *pf, struct ice_vf *vf);
-int
-ice_eswitch_attach(struct ice_pf *pf, struct ice_vf *vf);
+void ice_eswitch_detach_vf(struct ice_pf *pf, struct ice_vf *vf);
+int ice_eswitch_attach_vf(struct ice_pf *pf, struct ice_vf *vf);
int ice_eswitch_mode_get(struct devlink *devlink, u16 *mode);
int
@@ -31,10 +31,11 @@ struct net_device *ice_eswitch_get_target(struct ice_rx_ring *rx_ring,
int ice_eswitch_cfg_vsi(struct ice_vsi *vsi, const u8 *mac);
void ice_eswitch_decfg_vsi(struct ice_vsi *vsi, const u8 *mac);
#else /* CONFIG_ICE_SWITCHDEV */
-static inline void ice_eswitch_detach(struct ice_pf *pf, struct ice_vf *vf) { }
+static inline void
+ice_eswitch_detach_vf(struct ice_pf *pf, struct ice_vf *vf) { }
static inline int
-ice_eswitch_attach(struct ice_pf *pf, struct ice_vf *vf)
+ice_eswitch_attach_vf(struct ice_pf *pf, struct ice_vf *vf)
{
return -EOPNOTSUPP;
}
diff --git a/drivers/net/ethernet/intel/ice/ice_repr.c b/drivers/net/ethernet/intel/ice/ice_repr.c
index bdda3401e343..5d71f623b1e0 100644
--- a/drivers/net/ethernet/intel/ice/ice_repr.c
+++ b/drivers/net/ethernet/intel/ice/ice_repr.c
@@ -283,34 +283,23 @@ ice_repr_reg_netdev(struct net_device *netdev)
return register_netdev(netdev);
}
-static void ice_repr_remove_node(struct devlink_port *devlink_port)
-{
- devl_rate_leaf_destroy(devlink_port);
-}
-
/**
- * ice_repr_rem - remove representor from VF
+ * ice_repr_destroy - remove representor from VF
* @repr: pointer to representor structure
*/
-static void ice_repr_rem(struct ice_repr *repr)
+void ice_repr_destroy(struct ice_repr *repr)
{
free_percpu(repr->stats);
free_netdev(repr->netdev);
kfree(repr);
}
-/**
- * ice_repr_rem_vf - remove representor from VF
- * @repr: pointer to representor structure
- */
-void ice_repr_rem_vf(struct ice_repr *repr)
+static void ice_repr_rem_vf(struct ice_repr *repr)
{
- ice_repr_remove_node(&repr->vf->devlink_port);
ice_eswitch_decfg_vsi(repr->src_vsi, repr->parent_mac);
unregister_netdev(repr->netdev);
ice_devlink_destroy_vf_port(repr->vf);
ice_virtchnl_set_dflt_ops(repr->vf);
- ice_repr_rem(repr);
}
static void ice_repr_set_tx_topology(struct ice_pf *pf)
@@ -327,13 +316,10 @@ static void ice_repr_set_tx_topology(struct ice_pf *pf)
}
/**
- * ice_repr_add - add representor for generic VSI
- * @pf: pointer to PF structure
+ * ice_repr_create - add representor for generic VSI
* @src_vsi: pointer to VSI structure of device to represent
- * @parent_mac: device MAC address
*/
-static struct ice_repr *
-ice_repr_add(struct ice_pf *pf, struct ice_vsi *src_vsi, const u8 *parent_mac)
+static struct ice_repr *ice_repr_create(struct ice_vsi *src_vsi)
{
struct ice_netdev_priv *np;
struct ice_repr *repr;
@@ -360,7 +346,10 @@ ice_repr_add(struct ice_pf *pf, struct ice_vsi *src_vsi, const u8 *parent_mac)
np = netdev_priv(repr->netdev);
np->repr = repr;
- ether_addr_copy(repr->parent_mac, parent_mac);
+ repr->netdev->min_mtu = ETH_MIN_MTU;
+ repr->netdev->max_mtu = ICE_MAX_MTU;
+
+ SET_NETDEV_DEV(repr->netdev, ice_pf_to_dev(src_vsi->back));
return repr;
@@ -371,32 +360,15 @@ ice_repr_add(struct ice_pf *pf, struct ice_vsi *src_vsi, const u8 *parent_mac)
return ERR_PTR(err);
}
-struct ice_repr *ice_repr_add_vf(struct ice_vf *vf)
+static int ice_repr_add_vf(struct ice_repr *repr)
{
- struct ice_repr *repr;
- struct ice_vsi *vsi;
+ struct ice_vf *vf = repr->vf;
int err;
- vsi = ice_get_vf_vsi(vf);
- if (!vsi)
- return ERR_PTR(-ENOENT);
-
err = ice_devlink_create_vf_port(vf);
if (err)
- return ERR_PTR(err);
-
- repr = ice_repr_add(vf->pf, vsi, vf->hw_lan_addr);
- if (IS_ERR(repr)) {
- err = PTR_ERR(repr);
- goto err_repr_add;
- }
-
- repr->vf = vf;
+ return err;
- repr->netdev->min_mtu = ETH_MIN_MTU;
- repr->netdev->max_mtu = ICE_MAX_MTU;
-
- SET_NETDEV_DEV(repr->netdev, ice_pf_to_dev(vf->pf));
SET_NETDEV_DEVLINK_PORT(repr->netdev, &vf->devlink_port);
err = ice_repr_reg_netdev(repr->netdev);
if (err)
@@ -409,15 +381,43 @@ struct ice_repr *ice_repr_add_vf(struct ice_vf *vf)
ice_virtchnl_set_repr_ops(vf);
ice_repr_set_tx_topology(vf->pf);
- return repr;
+ return 0;
err_cfg_vsi:
unregister_netdev(repr->netdev);
err_netdev:
- ice_repr_rem(repr);
-err_repr_add:
ice_devlink_destroy_vf_port(vf);
- return ERR_PTR(err);
+ return err;
+}
+
+/**
+ * ice_repr_create_vf - add representor for VF VSI
+ * @vf: VF to create port representor on
+ *
+ * Set correct representor type for VF and functions pointer.
+ *
+ * Return: created port representor on success, error otherwise
+ */
+struct ice_repr *ice_repr_create_vf(struct ice_vf *vf)
+{
+ struct ice_vsi *vsi = ice_get_vf_vsi(vf);
+ struct ice_repr *repr;
+
+ if (!vsi)
+ return ERR_PTR(-EINVAL);
+
+ repr = ice_repr_create(vsi);
+ if (!repr)
+ return ERR_PTR(-ENOMEM);
+
+ repr->type = ICE_REPR_TYPE_VF;
+ repr->vf = vf;
+ repr->ops.add = ice_repr_add_vf;
+ repr->ops.rem = ice_repr_rem_vf;
+
+ ether_addr_copy(repr->parent_mac, vf->hw_lan_addr);
+
+ return repr;
}
struct ice_repr *ice_repr_get(struct ice_pf *pf, u32 id)
diff --git a/drivers/net/ethernet/intel/ice/ice_repr.h b/drivers/net/ethernet/intel/ice/ice_repr.h
index 488661b2900b..c6e77b9c6a32 100644
--- a/drivers/net/ethernet/intel/ice/ice_repr.h
+++ b/drivers/net/ethernet/intel/ice/ice_repr.h
@@ -15,19 +15,29 @@ struct ice_repr_pcpu_stats {
u64 tx_drops;
};
+enum ice_repr_type {
+ ICE_REPR_TYPE_VF,
+};
+
struct ice_repr {
struct ice_vsi *src_vsi;
- struct ice_vf *vf;
struct net_device *netdev;
struct metadata_dst *dst;
struct ice_esw_br_port *br_port;
struct ice_repr_pcpu_stats __percpu *stats;
u32 id;
u8 parent_mac[ETH_ALEN];
+ enum ice_repr_type type;
+ struct ice_vf *vf;
+ struct {
+ int (*add)(struct ice_repr *repr);
+ void (*rem)(struct ice_repr *repr);
+ } ops;
};
-struct ice_repr *ice_repr_add_vf(struct ice_vf *vf);
-void ice_repr_rem_vf(struct ice_repr *repr);
+struct ice_repr *ice_repr_create_vf(struct ice_vf *vf);
+
+void ice_repr_destroy(struct ice_repr *repr);
void ice_repr_start_tx_queues(struct ice_repr *repr);
void ice_repr_stop_tx_queues(struct ice_repr *repr);
diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c
index 55ef33208456..e34fe2516ccc 100644
--- a/drivers/net/ethernet/intel/ice/ice_sriov.c
+++ b/drivers/net/ethernet/intel/ice/ice_sriov.c
@@ -175,7 +175,7 @@ void ice_free_vfs(struct ice_pf *pf)
ice_for_each_vf(pf, bkt, vf) {
mutex_lock(&vf->cfg_lock);
- ice_eswitch_detach(pf, vf);
+ ice_eswitch_detach_vf(pf, vf);
ice_dis_vf_qs(vf);
if (test_bit(ICE_VF_STATE_INIT, vf->vf_states)) {
@@ -598,7 +598,7 @@ static int ice_start_vfs(struct ice_pf *pf)
goto teardown;
}
- retval = ice_eswitch_attach(pf, vf);
+ retval = ice_eswitch_attach_vf(pf, vf);
if (retval) {
dev_err(ice_pf_to_dev(pf), "Failed to attach VF %d to eswitch, error %d",
vf->vf_id, retval);
diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.c b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
index 5635e9da2212..a69e91f88d81 100644
--- a/drivers/net/ethernet/intel/ice/ice_vf_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
@@ -766,7 +766,7 @@ void ice_reset_all_vfs(struct ice_pf *pf)
ice_for_each_vf(pf, bkt, vf) {
mutex_lock(&vf->cfg_lock);
- ice_eswitch_detach(pf, vf);
+ ice_eswitch_detach_vf(pf, vf);
vf->driver_caps = 0;
ice_vc_set_default_allowlist(vf);
@@ -782,7 +782,7 @@ void ice_reset_all_vfs(struct ice_pf *pf)
ice_vf_rebuild_vsi(vf);
ice_vf_post_vsi_rebuild(vf);
- ice_eswitch_attach(pf, vf);
+ ice_eswitch_attach_vf(pf, vf);
mutex_unlock(&vf->cfg_lock);
}
--
2.42.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next v3 09/15] ice: create port representor for SF
2024-08-08 17:30 [PATCH net-next v3 00/15][pull request] ice: support devlink subfunction Tony Nguyen
` (7 preceding siblings ...)
2024-08-08 17:30 ` [PATCH net-next v3 08/15] ice: make representor code generic Tony Nguyen
@ 2024-08-08 17:30 ` Tony Nguyen
2024-08-08 17:30 ` [PATCH net-next v3 10/15] ice: don't set target VSI for subfunction Tony Nguyen
` (5 subsequent siblings)
14 siblings, 0 replies; 26+ messages in thread
From: Tony Nguyen @ 2024-08-08 17:30 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Michal Swiatkowski, anthony.l.nguyen, jiri, shayd,
wojciech.drewek, horms, sridhar.samudrala, mateusz.polchlopek,
kalesh-anakkur.purayil, michal.kubiak, pio.raczynski,
przemyslaw.kitszel, jacob.e.keller, maciej.fijalkowski,
Rafal Romanowski
From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Implement attaching and detaching SF port representor. It is done in the
same way as the VF port representor.
SF port representor is always added or removed with devlink
lock taken.
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
.../ethernet/intel/ice/devlink/devlink_port.c | 6 +--
drivers/net/ethernet/intel/ice/ice_eswitch.c | 39 ++++++++++++++
drivers/net/ethernet/intel/ice/ice_eswitch.h | 11 ++++
drivers/net/ethernet/intel/ice/ice_repr.c | 52 +++++++++++++++++++
drivers/net/ethernet/intel/ice/ice_repr.h | 7 ++-
drivers/net/ethernet/intel/ice/ice_sf_eth.c | 2 +
6 files changed, 113 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
index f06baabd0112..fb3ff68e0666 100644
--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
@@ -543,7 +543,7 @@ static void ice_dealloc_dynamic_port(struct ice_dynamic_port *dyn_port)
struct ice_pf *pf = dyn_port->pf;
xa_erase(&pf->sf_nums, devlink_port->attrs.pci_sf.sf);
- devl_port_unregister(devlink_port);
+ ice_eswitch_detach_sf(pf, dyn_port);
ice_vsi_free(dyn_port->vsi);
xa_erase(&pf->dyn_ports, dyn_port->vsi->idx);
kfree(dyn_port);
@@ -765,9 +765,9 @@ ice_alloc_dynamic_port(struct ice_pf *pf,
goto unroll_vsi_alloc;
}
- err = ice_devlink_create_sf_port(dyn_port);
+ err = ice_eswitch_attach_sf(pf, dyn_port);
if (err) {
- NL_SET_ERR_MSG_MOD(extack, "Port registration failed");
+ NL_SET_ERR_MSG_MOD(extack, "Failed to attach SF to eswitch");
goto unroll_xa_insert;
}
diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch.c b/drivers/net/ethernet/intel/ice/ice_eswitch.c
index 00d49477bdcb..c0b3e70a7ea3 100644
--- a/drivers/net/ethernet/intel/ice/ice_eswitch.c
+++ b/drivers/net/ethernet/intel/ice/ice_eswitch.c
@@ -525,6 +525,30 @@ int ice_eswitch_attach_vf(struct ice_pf *pf, struct ice_vf *vf)
return err;
}
+/**
+ * ice_eswitch_attach_sf - attach SF to a eswitch
+ * @pf: pointer to PF structure
+ * @sf: pointer to SF structure to be attached
+ *
+ * During attaching port representor for SF is created.
+ *
+ * Return: zero on success or an error code on failure.
+ */
+int ice_eswitch_attach_sf(struct ice_pf *pf, struct ice_dynamic_port *sf)
+{
+ struct ice_repr *repr = ice_repr_create_sf(sf);
+ int err;
+
+ if (IS_ERR(repr))
+ return PTR_ERR(repr);
+
+ err = ice_eswitch_attach(pf, repr, &sf->repr_id);
+ if (err)
+ ice_repr_destroy(repr);
+
+ return err;
+}
+
static void ice_eswitch_detach(struct ice_pf *pf, struct ice_repr *repr)
{
ice_eswitch_stop_reprs(pf);
@@ -568,6 +592,21 @@ void ice_eswitch_detach_vf(struct ice_pf *pf, struct ice_vf *vf)
devl_unlock(devlink);
}
+/**
+ * ice_eswitch_detach_sf - detach SF from a eswitch
+ * @pf: pointer to PF structure
+ * @sf: pointer to SF structure to be detached
+ */
+void ice_eswitch_detach_sf(struct ice_pf *pf, struct ice_dynamic_port *sf)
+{
+ struct ice_repr *repr = xa_load(&pf->eswitch.reprs, sf->repr_id);
+
+ if (!repr)
+ return;
+
+ ice_eswitch_detach(pf, repr);
+}
+
/**
* ice_eswitch_get_target - get netdev based on src_vsi from descriptor
* @rx_ring: ring used to receive the packet
diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch.h b/drivers/net/ethernet/intel/ice/ice_eswitch.h
index d1699954a7ad..20ce32dda69c 100644
--- a/drivers/net/ethernet/intel/ice/ice_eswitch.h
+++ b/drivers/net/ethernet/intel/ice/ice_eswitch.h
@@ -9,7 +9,9 @@
#ifdef CONFIG_ICE_SWITCHDEV
void ice_eswitch_detach_vf(struct ice_pf *pf, struct ice_vf *vf);
+void ice_eswitch_detach_sf(struct ice_pf *pf, struct ice_dynamic_port *sf);
int ice_eswitch_attach_vf(struct ice_pf *pf, struct ice_vf *vf);
+int ice_eswitch_attach_sf(struct ice_pf *pf, struct ice_dynamic_port *sf);
int ice_eswitch_mode_get(struct devlink *devlink, u16 *mode);
int
@@ -34,12 +36,21 @@ void ice_eswitch_decfg_vsi(struct ice_vsi *vsi, const u8 *mac);
static inline void
ice_eswitch_detach_vf(struct ice_pf *pf, struct ice_vf *vf) { }
+static inline void
+ice_eswitch_detach_sf(struct ice_pf *pf, struct ice_dynamic_port *sf) { }
+
static inline int
ice_eswitch_attach_vf(struct ice_pf *pf, struct ice_vf *vf)
{
return -EOPNOTSUPP;
}
+static inline int
+ice_eswitch_attach_sf(struct ice_pf *pf, struct ice_dynamic_port *sf)
+{
+ return -EOPNOTSUPP;
+}
+
static inline void ice_eswitch_stop_all_tx_queues(struct ice_pf *pf) { }
static inline void
diff --git a/drivers/net/ethernet/intel/ice/ice_repr.c b/drivers/net/ethernet/intel/ice/ice_repr.c
index 5d71f623b1e0..5ea8b512c421 100644
--- a/drivers/net/ethernet/intel/ice/ice_repr.c
+++ b/drivers/net/ethernet/intel/ice/ice_repr.c
@@ -302,6 +302,12 @@ static void ice_repr_rem_vf(struct ice_repr *repr)
ice_virtchnl_set_dflt_ops(repr->vf);
}
+static void ice_repr_rem_sf(struct ice_repr *repr)
+{
+ unregister_netdev(repr->netdev);
+ ice_devlink_destroy_sf_port(repr->sf);
+}
+
static void ice_repr_set_tx_topology(struct ice_pf *pf)
{
struct devlink *devlink;
@@ -420,6 +426,52 @@ struct ice_repr *ice_repr_create_vf(struct ice_vf *vf)
return repr;
}
+static int ice_repr_add_sf(struct ice_repr *repr)
+{
+ struct ice_dynamic_port *sf = repr->sf;
+ int err;
+
+ err = ice_devlink_create_sf_port(sf);
+ if (err)
+ return err;
+
+ SET_NETDEV_DEVLINK_PORT(repr->netdev, &sf->devlink_port);
+ err = ice_repr_reg_netdev(repr->netdev);
+ if (err)
+ goto err_netdev;
+
+ return 0;
+
+err_netdev:
+ ice_devlink_destroy_sf_port(sf);
+ return err;
+}
+
+/**
+ * ice_repr_create_sf - add representor for SF VSI
+ * @sf: SF to create port representor on
+ *
+ * Set correct representor type for SF and functions pointer.
+ *
+ * Return: created port representor on success, error otherwise
+ */
+struct ice_repr *ice_repr_create_sf(struct ice_dynamic_port *sf)
+{
+ struct ice_repr *repr = ice_repr_create(sf->vsi);
+
+ if (!repr)
+ return ERR_PTR(-ENOMEM);
+
+ repr->type = ICE_REPR_TYPE_SF;
+ repr->sf = sf;
+ repr->ops.add = ice_repr_add_sf;
+ repr->ops.rem = ice_repr_rem_sf;
+
+ ether_addr_copy(repr->parent_mac, sf->hw_addr);
+
+ return repr;
+}
+
struct ice_repr *ice_repr_get(struct ice_pf *pf, u32 id)
{
return xa_load(&pf->eswitch.reprs, id);
diff --git a/drivers/net/ethernet/intel/ice/ice_repr.h b/drivers/net/ethernet/intel/ice/ice_repr.h
index c6e77b9c6a32..ee28632e87b4 100644
--- a/drivers/net/ethernet/intel/ice/ice_repr.h
+++ b/drivers/net/ethernet/intel/ice/ice_repr.h
@@ -17,6 +17,7 @@ struct ice_repr_pcpu_stats {
enum ice_repr_type {
ICE_REPR_TYPE_VF,
+ ICE_REPR_TYPE_SF,
};
struct ice_repr {
@@ -28,7 +29,10 @@ struct ice_repr {
u32 id;
u8 parent_mac[ETH_ALEN];
enum ice_repr_type type;
- struct ice_vf *vf;
+ union {
+ struct ice_vf *vf;
+ struct ice_dynamic_port *sf;
+ };
struct {
int (*add)(struct ice_repr *repr);
void (*rem)(struct ice_repr *repr);
@@ -36,6 +40,7 @@ struct ice_repr {
};
struct ice_repr *ice_repr_create_vf(struct ice_vf *vf);
+struct ice_repr *ice_repr_create_sf(struct ice_dynamic_port *sf);
void ice_repr_destroy(struct ice_repr *repr);
diff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.c b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
index b1b4bdc8f710..9eb8993df25a 100644
--- a/drivers/net/ethernet/intel/ice/ice_sf_eth.c
+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
@@ -126,6 +126,8 @@ static int ice_sf_dev_probe(struct auxiliary_device *adev,
}
vsi->sf = dyn_port;
+ ice_eswitch_update_repr(&dyn_port->repr_id, vsi);
+
err = ice_devlink_create_sf_dev_port(sf_dev);
if (err) {
dev_err(dev, "Cannot add ice virtual devlink port for subfunction");
--
2.42.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next v3 10/15] ice: don't set target VSI for subfunction
2024-08-08 17:30 [PATCH net-next v3 00/15][pull request] ice: support devlink subfunction Tony Nguyen
` (8 preceding siblings ...)
2024-08-08 17:30 ` [PATCH net-next v3 09/15] ice: create port representor for SF Tony Nguyen
@ 2024-08-08 17:30 ` Tony Nguyen
2024-08-08 17:30 ` [PATCH net-next v3 11/15] ice: check if SF is ready in ethtool ops Tony Nguyen
` (4 subsequent siblings)
14 siblings, 0 replies; 26+ messages in thread
From: Tony Nguyen @ 2024-08-08 17:30 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Michal Swiatkowski, anthony.l.nguyen, jiri, shayd,
wojciech.drewek, horms, sridhar.samudrala, mateusz.polchlopek,
kalesh-anakkur.purayil, michal.kubiak, pio.raczynski,
przemyslaw.kitszel, jacob.e.keller, maciej.fijalkowski,
Rafal Romanowski
From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Add check for subfunction before setting target VSI. It is needed for PF
in switchdev mode but not for subfunction (even in switchdev mode).
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ice/ice_txrx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
index 8d25b6981269..d327a397f670 100644
--- a/drivers/net/ethernet/intel/ice/ice_txrx.c
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
@@ -2407,7 +2407,7 @@ ice_xmit_frame_ring(struct sk_buff *skb, struct ice_tx_ring *tx_ring)
ICE_TXD_CTX_QW1_CMD_S);
ice_tstamp(tx_ring, skb, first, &offload);
- if (ice_is_switchdev_running(vsi->back))
+ if (ice_is_switchdev_running(vsi->back) && vsi->type != ICE_VSI_SF)
ice_eswitch_set_target_vsi(skb, &offload);
if (offload.cd_qw1 & ICE_TX_DESC_DTYPE_CTX) {
--
2.42.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next v3 11/15] ice: check if SF is ready in ethtool ops
2024-08-08 17:30 [PATCH net-next v3 00/15][pull request] ice: support devlink subfunction Tony Nguyen
` (9 preceding siblings ...)
2024-08-08 17:30 ` [PATCH net-next v3 10/15] ice: don't set target VSI for subfunction Tony Nguyen
@ 2024-08-08 17:30 ` Tony Nguyen
2024-08-08 17:30 ` [PATCH net-next v3 12/15] ice: implement netdevice ops for SF representor Tony Nguyen
` (3 subsequent siblings)
14 siblings, 0 replies; 26+ messages in thread
From: Tony Nguyen @ 2024-08-08 17:30 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Michal Swiatkowski, anthony.l.nguyen, jiri, shayd,
wojciech.drewek, horms, sridhar.samudrala, mateusz.polchlopek,
kalesh-anakkur.purayil, michal.kubiak, pio.raczynski,
przemyslaw.kitszel, jacob.e.keller, maciej.fijalkowski,
Rafal Romanowski
From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Now there is another type of port representor. Correct checking if
parent device is ready to reflect also new PR type.
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ice/ice_ethtool.c | 7 +++----
drivers/net/ethernet/intel/ice/ice_repr.c | 12 ++++++++++++
drivers/net/ethernet/intel/ice/ice_repr.h | 1 +
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
index 8c990c976132..7b1f7725c0c8 100644
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -4414,7 +4414,7 @@ ice_repr_get_drvinfo(struct net_device *netdev,
{
struct ice_repr *repr = ice_netdev_to_repr(netdev);
- if (ice_check_vf_ready_for_cfg(repr->vf))
+ if (repr->ops.ready(repr))
return;
__ice_get_drvinfo(netdev, drvinfo, repr->src_vsi);
@@ -4426,8 +4426,7 @@ ice_repr_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
struct ice_repr *repr = ice_netdev_to_repr(netdev);
/* for port representors only ETH_SS_STATS is supported */
- if (ice_check_vf_ready_for_cfg(repr->vf) ||
- stringset != ETH_SS_STATS)
+ if (repr->ops.ready(repr) || stringset != ETH_SS_STATS)
return;
__ice_get_strings(netdev, stringset, data, repr->src_vsi);
@@ -4440,7 +4439,7 @@ ice_repr_get_ethtool_stats(struct net_device *netdev,
{
struct ice_repr *repr = ice_netdev_to_repr(netdev);
- if (ice_check_vf_ready_for_cfg(repr->vf))
+ if (repr->ops.ready(repr))
return;
__ice_get_ethtool_stats(netdev, stats, data, repr->src_vsi);
diff --git a/drivers/net/ethernet/intel/ice/ice_repr.c b/drivers/net/ethernet/intel/ice/ice_repr.c
index 5ea8b512c421..229831fe2cd2 100644
--- a/drivers/net/ethernet/intel/ice/ice_repr.c
+++ b/drivers/net/ethernet/intel/ice/ice_repr.c
@@ -283,6 +283,16 @@ ice_repr_reg_netdev(struct net_device *netdev)
return register_netdev(netdev);
}
+static int ice_repr_ready_vf(struct ice_repr *repr)
+{
+ return !ice_check_vf_ready_for_cfg(repr->vf);
+}
+
+static int ice_repr_ready_sf(struct ice_repr *repr)
+{
+ return !repr->sf->active;
+}
+
/**
* ice_repr_destroy - remove representor from VF
* @repr: pointer to representor structure
@@ -420,6 +430,7 @@ struct ice_repr *ice_repr_create_vf(struct ice_vf *vf)
repr->vf = vf;
repr->ops.add = ice_repr_add_vf;
repr->ops.rem = ice_repr_rem_vf;
+ repr->ops.ready = ice_repr_ready_vf;
ether_addr_copy(repr->parent_mac, vf->hw_lan_addr);
@@ -466,6 +477,7 @@ struct ice_repr *ice_repr_create_sf(struct ice_dynamic_port *sf)
repr->sf = sf;
repr->ops.add = ice_repr_add_sf;
repr->ops.rem = ice_repr_rem_sf;
+ repr->ops.ready = ice_repr_ready_sf;
ether_addr_copy(repr->parent_mac, sf->hw_addr);
diff --git a/drivers/net/ethernet/intel/ice/ice_repr.h b/drivers/net/ethernet/intel/ice/ice_repr.h
index ee28632e87b4..35bd93165e1e 100644
--- a/drivers/net/ethernet/intel/ice/ice_repr.h
+++ b/drivers/net/ethernet/intel/ice/ice_repr.h
@@ -36,6 +36,7 @@ struct ice_repr {
struct {
int (*add)(struct ice_repr *repr);
void (*rem)(struct ice_repr *repr);
+ int (*ready)(struct ice_repr *repr);
} ops;
};
--
2.42.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next v3 12/15] ice: implement netdevice ops for SF representor
2024-08-08 17:30 [PATCH net-next v3 00/15][pull request] ice: support devlink subfunction Tony Nguyen
` (10 preceding siblings ...)
2024-08-08 17:30 ` [PATCH net-next v3 11/15] ice: check if SF is ready in ethtool ops Tony Nguyen
@ 2024-08-08 17:30 ` Tony Nguyen
2024-08-08 17:30 ` [PATCH net-next v3 13/15] ice: support subfunction devlink Tx topology Tony Nguyen
` (2 subsequent siblings)
14 siblings, 0 replies; 26+ messages in thread
From: Tony Nguyen @ 2024-08-08 17:30 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Michal Swiatkowski, anthony.l.nguyen, jiri, shayd,
wojciech.drewek, horms, sridhar.samudrala, mateusz.polchlopek,
kalesh-anakkur.purayil, michal.kubiak, pio.raczynski,
przemyslaw.kitszel, jacob.e.keller, maciej.fijalkowski,
Rafal Romanowski
From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Subfunction port representor needs the basic netdevice ops to work
correctly. Create them.
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ice/ice_repr.c | 57 +++++++++++++++++------
1 file changed, 43 insertions(+), 14 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_repr.c b/drivers/net/ethernet/intel/ice/ice_repr.c
index 229831fe2cd2..78abfdf5d47b 100644
--- a/drivers/net/ethernet/intel/ice/ice_repr.c
+++ b/drivers/net/ethernet/intel/ice/ice_repr.c
@@ -59,12 +59,13 @@ static void
ice_repr_get_stats64(struct net_device *netdev, struct rtnl_link_stats64 *stats)
{
struct ice_netdev_priv *np = netdev_priv(netdev);
+ struct ice_repr *repr = np->repr;
struct ice_eth_stats *eth_stats;
struct ice_vsi *vsi;
- if (ice_is_vf_disabled(np->repr->vf))
+ if (repr->ops.ready(repr))
return;
- vsi = np->repr->src_vsi;
+ vsi = repr->src_vsi;
ice_update_vsi_stats(vsi);
eth_stats = &vsi->eth_stats;
@@ -93,7 +94,7 @@ struct ice_repr *ice_netdev_to_repr(const struct net_device *netdev)
}
/**
- * ice_repr_open - Enable port representor's network interface
+ * ice_repr_vf_open - Enable port representor's network interface
* @netdev: network interface device structure
*
* The open entry point is called when a port representor's network
@@ -102,7 +103,7 @@ struct ice_repr *ice_netdev_to_repr(const struct net_device *netdev)
*
* Returns 0 on success
*/
-static int ice_repr_open(struct net_device *netdev)
+static int ice_repr_vf_open(struct net_device *netdev)
{
struct ice_repr *repr = ice_netdev_to_repr(netdev);
struct ice_vf *vf;
@@ -118,8 +119,16 @@ static int ice_repr_open(struct net_device *netdev)
return 0;
}
+static int ice_repr_sf_open(struct net_device *netdev)
+{
+ netif_carrier_on(netdev);
+ netif_tx_start_all_queues(netdev);
+
+ return 0;
+}
+
/**
- * ice_repr_stop - Disable port representor's network interface
+ * ice_repr_vf_stop - Disable port representor's network interface
* @netdev: network interface device structure
*
* The stop entry point is called when a port representor's network
@@ -128,7 +137,7 @@ static int ice_repr_open(struct net_device *netdev)
*
* Returns 0 on success
*/
-static int ice_repr_stop(struct net_device *netdev)
+static int ice_repr_vf_stop(struct net_device *netdev)
{
struct ice_repr *repr = ice_netdev_to_repr(netdev);
struct ice_vf *vf;
@@ -144,6 +153,14 @@ static int ice_repr_stop(struct net_device *netdev)
return 0;
}
+static int ice_repr_sf_stop(struct net_device *netdev)
+{
+ netif_carrier_off(netdev);
+ netif_tx_stop_all_queues(netdev);
+
+ return 0;
+}
+
/**
* ice_repr_sp_stats64 - get slow path stats for port representor
* @dev: network interface device structure
@@ -245,10 +262,20 @@ ice_repr_setup_tc(struct net_device *netdev, enum tc_setup_type type,
}
}
-static const struct net_device_ops ice_repr_netdev_ops = {
+static const struct net_device_ops ice_repr_vf_netdev_ops = {
+ .ndo_get_stats64 = ice_repr_get_stats64,
+ .ndo_open = ice_repr_vf_open,
+ .ndo_stop = ice_repr_vf_stop,
+ .ndo_start_xmit = ice_eswitch_port_start_xmit,
+ .ndo_setup_tc = ice_repr_setup_tc,
+ .ndo_has_offload_stats = ice_repr_ndo_has_offload_stats,
+ .ndo_get_offload_stats = ice_repr_ndo_get_offload_stats,
+};
+
+static const struct net_device_ops ice_repr_sf_netdev_ops = {
.ndo_get_stats64 = ice_repr_get_stats64,
- .ndo_open = ice_repr_open,
- .ndo_stop = ice_repr_stop,
+ .ndo_open = ice_repr_sf_open,
+ .ndo_stop = ice_repr_sf_stop,
.ndo_start_xmit = ice_eswitch_port_start_xmit,
.ndo_setup_tc = ice_repr_setup_tc,
.ndo_has_offload_stats = ice_repr_ndo_has_offload_stats,
@@ -261,18 +288,20 @@ static const struct net_device_ops ice_repr_netdev_ops = {
*/
bool ice_is_port_repr_netdev(const struct net_device *netdev)
{
- return netdev && (netdev->netdev_ops == &ice_repr_netdev_ops);
+ return netdev && (netdev->netdev_ops == &ice_repr_vf_netdev_ops ||
+ netdev->netdev_ops == &ice_repr_sf_netdev_ops);
}
/**
* ice_repr_reg_netdev - register port representor netdev
* @netdev: pointer to port representor netdev
+ * @ops: new ops for netdev
*/
static int
-ice_repr_reg_netdev(struct net_device *netdev)
+ice_repr_reg_netdev(struct net_device *netdev, const struct net_device_ops *ops)
{
eth_hw_addr_random(netdev);
- netdev->netdev_ops = &ice_repr_netdev_ops;
+ netdev->netdev_ops = ops;
ice_set_ethtool_repr_ops(netdev);
netdev->hw_features |= NETIF_F_HW_TC;
@@ -386,7 +415,7 @@ static int ice_repr_add_vf(struct ice_repr *repr)
return err;
SET_NETDEV_DEVLINK_PORT(repr->netdev, &vf->devlink_port);
- err = ice_repr_reg_netdev(repr->netdev);
+ err = ice_repr_reg_netdev(repr->netdev, &ice_repr_vf_netdev_ops);
if (err)
goto err_netdev;
@@ -447,7 +476,7 @@ static int ice_repr_add_sf(struct ice_repr *repr)
return err;
SET_NETDEV_DEVLINK_PORT(repr->netdev, &sf->devlink_port);
- err = ice_repr_reg_netdev(repr->netdev);
+ err = ice_repr_reg_netdev(repr->netdev, &ice_repr_sf_netdev_ops);
if (err)
goto err_netdev;
--
2.42.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next v3 13/15] ice: support subfunction devlink Tx topology
2024-08-08 17:30 [PATCH net-next v3 00/15][pull request] ice: support devlink subfunction Tony Nguyen
` (11 preceding siblings ...)
2024-08-08 17:30 ` [PATCH net-next v3 12/15] ice: implement netdevice ops for SF representor Tony Nguyen
@ 2024-08-08 17:30 ` Tony Nguyen
2024-08-08 17:31 ` [PATCH net-next v3 14/15] ice: basic support for VLAN in subfunctions Tony Nguyen
2024-08-08 17:31 ` [PATCH net-next v3 15/15] ice: allow to activate and deactivate subfunction Tony Nguyen
14 siblings, 0 replies; 26+ messages in thread
From: Tony Nguyen @ 2024-08-08 17:30 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Michal Swiatkowski, anthony.l.nguyen, jiri, shayd,
wojciech.drewek, horms, sridhar.samudrala, mateusz.polchlopek,
kalesh-anakkur.purayil, michal.kubiak, pio.raczynski,
przemyslaw.kitszel, jacob.e.keller, maciej.fijalkowski,
Rafal Romanowski
From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Flow for creating Tx topology is the same as for VF port representors,
but the devlink port is stored in different place (sf->devlink_port).
When creating VF devlink lock isn't taken, when creating subfunction it
is. Setting Tx topology function needs to take this lock, check if it
was taken before to not do it twice.
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ice/devlink/devlink.c | 12 ++++++++++++
.../net/ethernet/intel/ice/devlink/devlink_port.c | 1 +
drivers/net/ethernet/intel/ice/ice_repr.c | 12 +++++++-----
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink.c b/drivers/net/ethernet/intel/ice/devlink/devlink.c
index 445538959459..415445cefdb2 100644
--- a/drivers/net/ethernet/intel/ice/devlink/devlink.c
+++ b/drivers/net/ethernet/intel/ice/devlink/devlink.c
@@ -746,6 +746,7 @@ static void ice_traverse_tx_tree(struct devlink *devlink, struct ice_sched_node
struct ice_sched_node *tc_node, struct ice_pf *pf)
{
struct devlink_rate *rate_node = NULL;
+ struct ice_dynamic_port *sf;
struct ice_vf *vf;
int i;
@@ -757,6 +758,7 @@ static void ice_traverse_tx_tree(struct devlink *devlink, struct ice_sched_node
/* create root node */
rate_node = devl_rate_node_create(devlink, node, node->name, NULL);
} else if (node->vsi_handle &&
+ pf->vsi[node->vsi_handle]->type == ICE_VSI_VF &&
pf->vsi[node->vsi_handle]->vf) {
vf = pf->vsi[node->vsi_handle]->vf;
if (!vf->devlink_port.devlink_rate)
@@ -765,6 +767,16 @@ static void ice_traverse_tx_tree(struct devlink *devlink, struct ice_sched_node
*/
devl_rate_leaf_create(&vf->devlink_port, node,
node->parent->rate_node);
+ } else if (node->vsi_handle &&
+ pf->vsi[node->vsi_handle]->type == ICE_VSI_SF &&
+ pf->vsi[node->vsi_handle]->sf) {
+ sf = pf->vsi[node->vsi_handle]->sf;
+ if (!sf->devlink_port.devlink_rate)
+ /* leaf nodes doesn't have children
+ * so we don't set rate_node
+ */
+ devl_rate_leaf_create(&sf->devlink_port, node,
+ node->parent->rate_node);
} else if (node->info.data.elem_type != ICE_AQC_ELEM_TYPE_LEAF &&
node->parent->rate_node) {
rate_node = devl_rate_node_create(devlink, node, node->name,
diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
index fb3ff68e0666..4cfd90581d92 100644
--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
@@ -711,6 +711,7 @@ int ice_devlink_create_sf_port(struct ice_dynamic_port *dyn_port)
*/
void ice_devlink_destroy_sf_port(struct ice_dynamic_port *dyn_port)
{
+ devl_rate_leaf_destroy(&dyn_port->devlink_port);
devl_port_unregister(&dyn_port->devlink_port);
}
diff --git a/drivers/net/ethernet/intel/ice/ice_repr.c b/drivers/net/ethernet/intel/ice/ice_repr.c
index 78abfdf5d47b..00d4a9125dfa 100644
--- a/drivers/net/ethernet/intel/ice/ice_repr.c
+++ b/drivers/net/ethernet/intel/ice/ice_repr.c
@@ -347,16 +347,13 @@ static void ice_repr_rem_sf(struct ice_repr *repr)
ice_devlink_destroy_sf_port(repr->sf);
}
-static void ice_repr_set_tx_topology(struct ice_pf *pf)
+static void ice_repr_set_tx_topology(struct ice_pf *pf, struct devlink *devlink)
{
- struct devlink *devlink;
-
/* only export if ADQ and DCB disabled and eswitch enabled*/
if (ice_is_adq_active(pf) || ice_is_dcb_active(pf) ||
!ice_is_switchdev_running(pf))
return;
- devlink = priv_to_devlink(pf);
ice_devlink_rate_init_tx_topology(devlink, ice_get_main_vsi(pf));
}
@@ -408,6 +405,7 @@ static struct ice_repr *ice_repr_create(struct ice_vsi *src_vsi)
static int ice_repr_add_vf(struct ice_repr *repr)
{
struct ice_vf *vf = repr->vf;
+ struct devlink *devlink;
int err;
err = ice_devlink_create_vf_port(vf);
@@ -424,7 +422,9 @@ static int ice_repr_add_vf(struct ice_repr *repr)
goto err_cfg_vsi;
ice_virtchnl_set_repr_ops(vf);
- ice_repr_set_tx_topology(vf->pf);
+
+ devlink = priv_to_devlink(vf->pf);
+ ice_repr_set_tx_topology(vf->pf, devlink);
return 0;
@@ -480,6 +480,8 @@ static int ice_repr_add_sf(struct ice_repr *repr)
if (err)
goto err_netdev;
+ ice_repr_set_tx_topology(sf->vsi->back, priv_to_devlink(sf->vsi->back));
+
return 0;
err_netdev:
--
2.42.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next v3 14/15] ice: basic support for VLAN in subfunctions
2024-08-08 17:30 [PATCH net-next v3 00/15][pull request] ice: support devlink subfunction Tony Nguyen
` (12 preceding siblings ...)
2024-08-08 17:30 ` [PATCH net-next v3 13/15] ice: support subfunction devlink Tx topology Tony Nguyen
@ 2024-08-08 17:31 ` Tony Nguyen
2024-08-08 17:31 ` [PATCH net-next v3 15/15] ice: allow to activate and deactivate subfunction Tony Nguyen
14 siblings, 0 replies; 26+ messages in thread
From: Tony Nguyen @ 2024-08-08 17:31 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Michal Swiatkowski, anthony.l.nguyen, jiri, shayd,
wojciech.drewek, horms, sridhar.samudrala, mateusz.polchlopek,
kalesh-anakkur.purayil, michal.kubiak, pio.raczynski,
przemyslaw.kitszel, jacob.e.keller, maciej.fijalkowski,
Rafal Romanowski
From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Implement add / delete vlan for subfunction type VSI.
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ice/Makefile | 1 +
.../ethernet/intel/ice/ice_sf_vsi_vlan_ops.c | 21 +++++++++++++++++++
.../ethernet/intel/ice/ice_sf_vsi_vlan_ops.h | 13 ++++++++++++
.../net/ethernet/intel/ice/ice_vsi_vlan_ops.c | 4 ++++
4 files changed, 39 insertions(+)
create mode 100644 drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.c
create mode 100644 drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.h
diff --git a/drivers/net/ethernet/intel/ice/Makefile b/drivers/net/ethernet/intel/ice/Makefile
index 4d987f5dcdc1..f5ff5fba0c3a 100644
--- a/drivers/net/ethernet/intel/ice/Makefile
+++ b/drivers/net/ethernet/intel/ice/Makefile
@@ -32,6 +32,7 @@ ice-y := ice_main.o \
devlink/devlink.o \
devlink/devlink_port.o \
ice_sf_eth.o \
+ ice_sf_vsi_vlan_ops.o \
ice_ddp.o \
ice_fw_update.o \
ice_lag.o \
diff --git a/drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.c b/drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.c
new file mode 100644
index 000000000000..3d7e96721cf9
--- /dev/null
+++ b/drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.c
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2023, Intel Corporation. */
+
+#include "ice_vsi_vlan_ops.h"
+#include "ice_vsi_vlan_lib.h"
+#include "ice_vlan_mode.h"
+#include "ice.h"
+#include "ice_sf_vsi_vlan_ops.h"
+
+void ice_sf_vsi_init_vlan_ops(struct ice_vsi *vsi)
+{
+ struct ice_vsi_vlan_ops *vlan_ops;
+
+ if (ice_is_dvm_ena(&vsi->back->hw))
+ vlan_ops = &vsi->outer_vlan_ops;
+ else
+ vlan_ops = &vsi->inner_vlan_ops;
+
+ vlan_ops->add_vlan = ice_vsi_add_vlan;
+ vlan_ops->del_vlan = ice_vsi_del_vlan;
+}
diff --git a/drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.h b/drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.h
new file mode 100644
index 000000000000..8c44eafceea0
--- /dev/null
+++ b/drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2023, Intel Corporation. */
+
+#ifndef _ICE_SF_VSI_VLAN_OPS_H_
+#define _ICE_SF_VSI_VLAN_OPS_H_
+
+#include "ice_vsi_vlan_ops.h"
+
+struct ice_vsi;
+
+void ice_sf_vsi_init_vlan_ops(struct ice_vsi *vsi);
+
+#endif /* _ICE_SF_VSI_VLAN_OPS_H_ */
diff --git a/drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c b/drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c
index 7aae7fdcfcdb..8c7a9b41fb63 100644
--- a/drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c
+++ b/drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c
@@ -3,6 +3,7 @@
#include "ice_pf_vsi_vlan_ops.h"
#include "ice_vf_vsi_vlan_ops.h"
+#include "ice_sf_vsi_vlan_ops.h"
#include "ice_lib.h"
#include "ice.h"
@@ -77,6 +78,9 @@ void ice_vsi_init_vlan_ops(struct ice_vsi *vsi)
case ICE_VSI_VF:
ice_vf_vsi_init_vlan_ops(vsi);
break;
+ case ICE_VSI_SF:
+ ice_sf_vsi_init_vlan_ops(vsi);
+ break;
default:
dev_dbg(ice_pf_to_dev(vsi->back), "%s does not support VLAN operations\n",
ice_vsi_type_str(vsi->type));
--
2.42.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH net-next v3 15/15] ice: allow to activate and deactivate subfunction
2024-08-08 17:30 [PATCH net-next v3 00/15][pull request] ice: support devlink subfunction Tony Nguyen
` (13 preceding siblings ...)
2024-08-08 17:31 ` [PATCH net-next v3 14/15] ice: basic support for VLAN in subfunctions Tony Nguyen
@ 2024-08-08 17:31 ` Tony Nguyen
2024-08-09 11:26 ` Jiri Pirko
14 siblings, 1 reply; 26+ messages in thread
From: Tony Nguyen @ 2024-08-08 17:31 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Piotr Raczynski, anthony.l.nguyen, michal.swiatkowski, jiri,
shayd, wojciech.drewek, horms, sridhar.samudrala,
mateusz.polchlopek, kalesh-anakkur.purayil, michal.kubiak,
pio.raczynski, przemyslaw.kitszel, jacob.e.keller,
maciej.fijalkowski, Rafal Romanowski
From: Piotr Raczynski <piotr.raczynski@intel.com>
Use previously implemented SF aux driver. It is probe during SF
activation and remove after deactivation.
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Piotr Raczynski <piotr.raczynski@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
.../ethernet/intel/ice/devlink/devlink_port.c | 176 ++++++++++++++++++
.../ethernet/intel/ice/devlink/devlink_port.h | 7 +
drivers/net/ethernet/intel/ice/ice_sf_eth.c | 103 ++++++++++
drivers/net/ethernet/intel/ice/ice_sf_eth.h | 3 +
4 files changed, 289 insertions(+)
diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
index 4cfd90581d92..675a2b60892b 100644
--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
@@ -530,6 +530,48 @@ void ice_devlink_destroy_sf_dev_port(struct ice_sf_dev *sf_dev)
devl_port_unregister(&sf_dev->priv->devlink_port);
}
+/**
+ * ice_activate_dynamic_port - Activate a dynamic port
+ * @dyn_port: dynamic port instance to activate
+ * @extack: extack for reporting error messages
+ *
+ * Activate the dynamic port based on its flavour.
+ *
+ * Return: zero on success or an error code on failure.
+ */
+static int
+ice_activate_dynamic_port(struct ice_dynamic_port *dyn_port,
+ struct netlink_ext_ack *extack)
+{
+ int err;
+
+ if (dyn_port->active)
+ return 0;
+
+ err = ice_sf_eth_activate(dyn_port, extack);
+ if (err)
+ return err;
+
+ dyn_port->active = true;
+
+ return 0;
+}
+
+/**
+ * ice_deactivate_dynamic_port - Deactivate a dynamic port
+ * @dyn_port: dynamic port instance to deactivate
+ *
+ * Undo activation of a dynamic port.
+ */
+static void ice_deactivate_dynamic_port(struct ice_dynamic_port *dyn_port)
+{
+ if (!dyn_port->active)
+ return;
+
+ ice_sf_eth_deactivate(dyn_port);
+ dyn_port->active = false;
+}
+
/**
* ice_dealloc_dynamic_port - Deallocate and remove a dynamic port
* @dyn_port: dynamic port instance to deallocate
@@ -542,6 +584,8 @@ static void ice_dealloc_dynamic_port(struct ice_dynamic_port *dyn_port)
struct devlink_port *devlink_port = &dyn_port->devlink_port;
struct ice_pf *pf = dyn_port->pf;
+ ice_deactivate_dynamic_port(dyn_port);
+
xa_erase(&pf->sf_nums, devlink_port->attrs.pci_sf.sf);
ice_eswitch_detach_sf(pf, dyn_port);
ice_vsi_free(dyn_port->vsi);
@@ -629,8 +673,140 @@ ice_devlink_port_del(struct devlink *devlink, struct devlink_port *port,
return 0;
}
+/**
+ * ice_devlink_port_fn_hw_addr_set - devlink handler for mac address set
+ * @port: pointer to devlink port
+ * @hw_addr: hw address to set
+ * @hw_addr_len: hw address length
+ * @extack: extack for reporting error messages
+ *
+ * Sets mac address for the port, verifies arguments and copies address
+ * to the subfunction structure.
+ *
+ * Return: zero on success or an error code on failure.
+ */
+static int
+ice_devlink_port_fn_hw_addr_set(struct devlink_port *port, const u8 *hw_addr,
+ int hw_addr_len,
+ struct netlink_ext_ack *extack)
+{
+ struct ice_dynamic_port *dyn_port;
+
+ dyn_port = ice_devlink_port_to_dyn(port);
+
+ if (dyn_port->attached) {
+ NL_SET_ERR_MSG_MOD(extack,
+ "Ethernet address can be change only in detached state");
+ return -EBUSY;
+ }
+
+ if (hw_addr_len != ETH_ALEN || !is_valid_ether_addr(hw_addr)) {
+ NL_SET_ERR_MSG_MOD(extack, "Invalid ethernet address");
+ return -EADDRNOTAVAIL;
+ }
+
+ ether_addr_copy(dyn_port->hw_addr, hw_addr);
+
+ return 0;
+}
+
+/**
+ * ice_devlink_port_fn_hw_addr_get - devlink handler for mac address get
+ * @port: pointer to devlink port
+ * @hw_addr: hw address to set
+ * @hw_addr_len: hw address length
+ * @extack: extack for reporting error messages
+ *
+ * Returns mac address for the port.
+ *
+ * Return: zero on success or an error code on failure.
+ */
+static int
+ice_devlink_port_fn_hw_addr_get(struct devlink_port *port, u8 *hw_addr,
+ int *hw_addr_len,
+ struct netlink_ext_ack *extack)
+{
+ struct ice_dynamic_port *dyn_port;
+
+ dyn_port = ice_devlink_port_to_dyn(port);
+
+ ether_addr_copy(hw_addr, dyn_port->hw_addr);
+ *hw_addr_len = ETH_ALEN;
+
+ return 0;
+}
+
+/**
+ * ice_devlink_port_fn_state_set - devlink handler for port state set
+ * @port: pointer to devlink port
+ * @state: state to set
+ * @extack: extack for reporting error messages
+ *
+ * Activates or deactivates the port.
+ *
+ * Return: zero on success or an error code on failure.
+ */
+static int
+ice_devlink_port_fn_state_set(struct devlink_port *port,
+ enum devlink_port_fn_state state,
+ struct netlink_ext_ack *extack)
+{
+ struct ice_dynamic_port *dyn_port;
+
+ dyn_port = ice_devlink_port_to_dyn(port);
+
+ switch (state) {
+ case DEVLINK_PORT_FN_STATE_ACTIVE:
+ return ice_activate_dynamic_port(dyn_port, extack);
+
+ case DEVLINK_PORT_FN_STATE_INACTIVE:
+ ice_deactivate_dynamic_port(dyn_port);
+ break;
+ }
+
+ return 0;
+}
+
+/**
+ * ice_devlink_port_fn_state_get - devlink handler for port state get
+ * @port: pointer to devlink port
+ * @state: admin configured state of the port
+ * @opstate: current port operational state
+ * @extack: extack for reporting error messages
+ *
+ * Gets port state.
+ *
+ * Return: zero on success or an error code on failure.
+ */
+static int
+ice_devlink_port_fn_state_get(struct devlink_port *port,
+ enum devlink_port_fn_state *state,
+ enum devlink_port_fn_opstate *opstate,
+ struct netlink_ext_ack *extack)
+{
+ struct ice_dynamic_port *dyn_port;
+
+ dyn_port = ice_devlink_port_to_dyn(port);
+
+ if (dyn_port->active)
+ *state = DEVLINK_PORT_FN_STATE_ACTIVE;
+ else
+ *state = DEVLINK_PORT_FN_STATE_INACTIVE;
+
+ if (dyn_port->attached)
+ *opstate = DEVLINK_PORT_FN_OPSTATE_ATTACHED;
+ else
+ *opstate = DEVLINK_PORT_FN_OPSTATE_DETACHED;
+
+ return 0;
+}
+
static const struct devlink_port_ops ice_devlink_port_sf_ops = {
.port_del = ice_devlink_port_del,
+ .port_fn_hw_addr_get = ice_devlink_port_fn_hw_addr_get,
+ .port_fn_hw_addr_set = ice_devlink_port_fn_hw_addr_set,
+ .port_fn_state_get = ice_devlink_port_fn_state_get,
+ .port_fn_state_set = ice_devlink_port_fn_state_set,
};
/**
diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
index 479d2b976745..d60efc340945 100644
--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
@@ -11,22 +11,29 @@
* struct ice_dynamic_port - Track dynamically added devlink port instance
* @hw_addr: the HW address for this port
* @active: true if the port has been activated
+ * @attached: true it the prot is attached
* @devlink_port: the associated devlink port structure
* @pf: pointer to the PF private structure
* @vsi: the VSI associated with this port
* @repr_id: the representor ID
* @sfnum: the subfunction ID
+ * @sf_dev: pointer to the subfunction device
*
* An instance of a dynamically added devlink port. Each port flavour
*/
struct ice_dynamic_port {
u8 hw_addr[ETH_ALEN];
u8 active: 1;
+ u8 attached: 1;
struct devlink_port devlink_port;
struct ice_pf *pf;
struct ice_vsi *vsi;
unsigned long repr_id;
u32 sfnum;
+ /* Flavour-specific implementation data */
+ union {
+ struct ice_sf_dev *sf_dev;
+ };
};
void ice_dealloc_all_dynamic_ports(struct ice_pf *pf);
diff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.c b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
index 9eb8993df25a..27a5baee7880 100644
--- a/drivers/net/ethernet/intel/ice/ice_sf_eth.c
+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
@@ -150,6 +150,7 @@ static int ice_sf_dev_probe(struct auxiliary_device *adev,
devl_unlock(devlink);
devlink_register(devlink);
+ dyn_port->attached = true;
return 0;
@@ -189,6 +190,8 @@ static void ice_sf_dev_remove(struct auxiliary_device *adev)
devl_unlock(devlink);
devlink_free(devlink);
ice_vsi_decfg(vsi);
+
+ dyn_port->attached = false;
}
static const struct auxiliary_device_id ice_sf_dev_id_table[] = {
@@ -205,6 +208,8 @@ static struct auxiliary_driver ice_sf_driver = {
.id_table = ice_sf_dev_id_table
};
+static DEFINE_XARRAY_ALLOC1(ice_sf_aux_id);
+
/**
* ice_sf_driver_register - Register new auxiliary subfunction driver
*
@@ -223,3 +228,101 @@ void ice_sf_driver_unregister(void)
{
auxiliary_driver_unregister(&ice_sf_driver);
}
+
+/**
+ * ice_sf_dev_release - Release device associated with auxiliary device
+ * @device: pointer to the device
+ *
+ * Since most of the code for subfunction deactivation is handled in
+ * the remove handler, here just free tracking resources.
+ */
+static void ice_sf_dev_release(struct device *device)
+{
+ struct auxiliary_device *adev = to_auxiliary_dev(device);
+ struct ice_sf_dev *sf_dev = ice_adev_to_sf_dev(adev);
+
+ xa_erase(&ice_sf_aux_id, adev->id);
+ kfree(sf_dev);
+}
+
+/**
+ * ice_sf_eth_activate - Activate Ethernet subfunction port
+ * @dyn_port: the dynamic port instance for this subfunction
+ * @extack: extack for reporting error messages
+ *
+ * Activate the dynamic port as an Ethernet subfunction. Setup the netdev
+ * resources associated and initialize the auxiliary device.
+ *
+ * Return: zero on success or an error code on failure.
+ */
+int
+ice_sf_eth_activate(struct ice_dynamic_port *dyn_port,
+ struct netlink_ext_ack *extack)
+{
+ struct ice_pf *pf = dyn_port->pf;
+ struct ice_sf_dev *sf_dev;
+ struct pci_dev *pdev;
+ int err;
+ u32 id;
+
+ err = xa_alloc(&ice_sf_aux_id, &id, NULL, xa_limit_32b,
+ GFP_KERNEL);
+ if (err) {
+ NL_SET_ERR_MSG_MOD(extack, "Could not allocate SF ID");
+ return err;
+ }
+
+ sf_dev = kzalloc(sizeof(*sf_dev), GFP_KERNEL);
+ if (!sf_dev) {
+ err = -ENOMEM;
+ NL_SET_ERR_MSG_MOD(extack, "Could not allocate SF memory");
+ goto xa_erase;
+ }
+ pdev = pf->pdev;
+
+ sf_dev->dyn_port = dyn_port;
+ sf_dev->adev.id = id;
+ sf_dev->adev.name = "sf";
+ sf_dev->adev.dev.release = ice_sf_dev_release;
+ sf_dev->adev.dev.parent = &pdev->dev;
+
+ err = auxiliary_device_init(&sf_dev->adev);
+ if (err) {
+ NL_SET_ERR_MSG_MOD(extack, "Failed to initialize SF device");
+ goto sf_dev_free;
+ }
+
+ err = auxiliary_device_add(&sf_dev->adev);
+ if (err) {
+ NL_SET_ERR_MSG_MOD(extack, "Failed to add SF device");
+ goto aux_dev_uninit;
+ }
+
+ dyn_port->sf_dev = sf_dev;
+
+ return 0;
+
+aux_dev_uninit:
+ auxiliary_device_uninit(&sf_dev->adev);
+sf_dev_free:
+ kfree(sf_dev);
+xa_erase:
+ xa_erase(&ice_sf_aux_id, id);
+
+ return err;
+}
+
+/**
+ * ice_sf_eth_deactivate - Deactivate Ethernet subfunction port
+ * @dyn_port: the dynamic port instance for this subfunction
+ *
+ * Deactivate the Ethernet subfunction, removing its auxiliary device and the
+ * associated resources.
+ */
+void ice_sf_eth_deactivate(struct ice_dynamic_port *dyn_port)
+{
+ struct ice_sf_dev *sf_dev = dyn_port->sf_dev;
+
+ auxiliary_device_delete(&sf_dev->adev);
+ auxiliary_device_uninit(&sf_dev->adev);
+}
diff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.h b/drivers/net/ethernet/intel/ice/ice_sf_eth.h
index e972c50f96c9..c558cad0a183 100644
--- a/drivers/net/ethernet/intel/ice/ice_sf_eth.h
+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.h
@@ -27,4 +27,7 @@ ice_sf_dev *ice_adev_to_sf_dev(struct auxiliary_device *adev)
int ice_sf_driver_register(void);
void ice_sf_driver_unregister(void);
+int ice_sf_eth_activate(struct ice_dynamic_port *dyn_port,
+ struct netlink_ext_ack *extack);
+void ice_sf_eth_deactivate(struct ice_dynamic_port *dyn_port);
#endif /* _ICE_SF_ETH_H_ */
--
2.42.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH net-next v3 15/15] ice: allow to activate and deactivate subfunction
2024-08-08 17:31 ` [PATCH net-next v3 15/15] ice: allow to activate and deactivate subfunction Tony Nguyen
@ 2024-08-09 11:26 ` Jiri Pirko
2024-08-09 11:49 ` Michal Swiatkowski
0 siblings, 1 reply; 26+ messages in thread
From: Jiri Pirko @ 2024-08-09 11:26 UTC (permalink / raw)
To: Tony Nguyen
Cc: davem, kuba, pabeni, edumazet, netdev, Piotr Raczynski,
michal.swiatkowski, jiri, shayd, wojciech.drewek, horms,
sridhar.samudrala, mateusz.polchlopek, kalesh-anakkur.purayil,
michal.kubiak, pio.raczynski, przemyslaw.kitszel, jacob.e.keller,
maciej.fijalkowski, Rafal Romanowski
Thu, Aug 08, 2024 at 07:31:01PM CEST, anthony.l.nguyen@intel.com wrote:
>From: Piotr Raczynski <piotr.raczynski@intel.com>
>
>Use previously implemented SF aux driver. It is probe during SF
>activation and remove after deactivation.
>
>Reviewed-by: Simon Horman <horms@kernel.org>
>Signed-off-by: Piotr Raczynski <piotr.raczynski@intel.com>
>Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
>Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
>Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
>---
> .../ethernet/intel/ice/devlink/devlink_port.c | 176 ++++++++++++++++++
> .../ethernet/intel/ice/devlink/devlink_port.h | 7 +
> drivers/net/ethernet/intel/ice/ice_sf_eth.c | 103 ++++++++++
> drivers/net/ethernet/intel/ice/ice_sf_eth.h | 3 +
> 4 files changed, 289 insertions(+)
>
>diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
>index 4cfd90581d92..675a2b60892b 100644
>--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
>+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
>@@ -530,6 +530,48 @@ void ice_devlink_destroy_sf_dev_port(struct ice_sf_dev *sf_dev)
> devl_port_unregister(&sf_dev->priv->devlink_port);
> }
>
>+/**
>+ * ice_activate_dynamic_port - Activate a dynamic port
>+ * @dyn_port: dynamic port instance to activate
>+ * @extack: extack for reporting error messages
>+ *
>+ * Activate the dynamic port based on its flavour.
>+ *
>+ * Return: zero on success or an error code on failure.
>+ */
>+static int
>+ice_activate_dynamic_port(struct ice_dynamic_port *dyn_port,
>+ struct netlink_ext_ack *extack)
>+{
>+ int err;
>+
>+ if (dyn_port->active)
>+ return 0;
>+
>+ err = ice_sf_eth_activate(dyn_port, extack);
>+ if (err)
>+ return err;
>+
>+ dyn_port->active = true;
>+
>+ return 0;
>+}
>+
>+/**
>+ * ice_deactivate_dynamic_port - Deactivate a dynamic port
>+ * @dyn_port: dynamic port instance to deactivate
>+ *
>+ * Undo activation of a dynamic port.
>+ */
>+static void ice_deactivate_dynamic_port(struct ice_dynamic_port *dyn_port)
>+{
>+ if (!dyn_port->active)
>+ return;
>+
>+ ice_sf_eth_deactivate(dyn_port);
>+ dyn_port->active = false;
>+}
>+
> /**
> * ice_dealloc_dynamic_port - Deallocate and remove a dynamic port
> * @dyn_port: dynamic port instance to deallocate
>@@ -542,6 +584,8 @@ static void ice_dealloc_dynamic_port(struct ice_dynamic_port *dyn_port)
> struct devlink_port *devlink_port = &dyn_port->devlink_port;
> struct ice_pf *pf = dyn_port->pf;
>
>+ ice_deactivate_dynamic_port(dyn_port);
>+
> xa_erase(&pf->sf_nums, devlink_port->attrs.pci_sf.sf);
> ice_eswitch_detach_sf(pf, dyn_port);
> ice_vsi_free(dyn_port->vsi);
>@@ -629,8 +673,140 @@ ice_devlink_port_del(struct devlink *devlink, struct devlink_port *port,
> return 0;
> }
>
>+/**
>+ * ice_devlink_port_fn_hw_addr_set - devlink handler for mac address set
>+ * @port: pointer to devlink port
>+ * @hw_addr: hw address to set
>+ * @hw_addr_len: hw address length
>+ * @extack: extack for reporting error messages
>+ *
>+ * Sets mac address for the port, verifies arguments and copies address
>+ * to the subfunction structure.
>+ *
>+ * Return: zero on success or an error code on failure.
>+ */
>+static int
>+ice_devlink_port_fn_hw_addr_set(struct devlink_port *port, const u8 *hw_addr,
Interesting. The patch subject and description talks about "activation"
yet you also set/get hw address here. Either split to 2 patches of
adjust the patch subject and desctiption.
>+ int hw_addr_len,
>+ struct netlink_ext_ack *extack)
>+{
>+ struct ice_dynamic_port *dyn_port;
>+
>+ dyn_port = ice_devlink_port_to_dyn(port);
>+
>+ if (dyn_port->attached) {
>+ NL_SET_ERR_MSG_MOD(extack,
>+ "Ethernet address can be change only in detached state");
>+ return -EBUSY;
>+ }
>+
>+ if (hw_addr_len != ETH_ALEN || !is_valid_ether_addr(hw_addr)) {
>+ NL_SET_ERR_MSG_MOD(extack, "Invalid ethernet address");
>+ return -EADDRNOTAVAIL;
>+ }
>+
>+ ether_addr_copy(dyn_port->hw_addr, hw_addr);
>+
>+ return 0;
>+}
>+
>+/**
>+ * ice_devlink_port_fn_hw_addr_get - devlink handler for mac address get
>+ * @port: pointer to devlink port
>+ * @hw_addr: hw address to set
>+ * @hw_addr_len: hw address length
>+ * @extack: extack for reporting error messages
>+ *
>+ * Returns mac address for the port.
>+ *
>+ * Return: zero on success or an error code on failure.
>+ */
>+static int
>+ice_devlink_port_fn_hw_addr_get(struct devlink_port *port, u8 *hw_addr,
>+ int *hw_addr_len,
>+ struct netlink_ext_ack *extack)
>+{
>+ struct ice_dynamic_port *dyn_port;
>+
>+ dyn_port = ice_devlink_port_to_dyn(port);
>+
>+ ether_addr_copy(hw_addr, dyn_port->hw_addr);
>+ *hw_addr_len = ETH_ALEN;
>+
>+ return 0;
>+}
>+
>+/**
>+ * ice_devlink_port_fn_state_set - devlink handler for port state set
>+ * @port: pointer to devlink port
>+ * @state: state to set
>+ * @extack: extack for reporting error messages
>+ *
>+ * Activates or deactivates the port.
>+ *
>+ * Return: zero on success or an error code on failure.
>+ */
>+static int
>+ice_devlink_port_fn_state_set(struct devlink_port *port,
>+ enum devlink_port_fn_state state,
>+ struct netlink_ext_ack *extack)
>+{
>+ struct ice_dynamic_port *dyn_port;
>+
>+ dyn_port = ice_devlink_port_to_dyn(port);
>+
>+ switch (state) {
>+ case DEVLINK_PORT_FN_STATE_ACTIVE:
>+ return ice_activate_dynamic_port(dyn_port, extack);
>+
>+ case DEVLINK_PORT_FN_STATE_INACTIVE:
>+ ice_deactivate_dynamic_port(dyn_port);
>+ break;
>+ }
>+
>+ return 0;
>+}
>+
>+/**
>+ * ice_devlink_port_fn_state_get - devlink handler for port state get
>+ * @port: pointer to devlink port
>+ * @state: admin configured state of the port
>+ * @opstate: current port operational state
>+ * @extack: extack for reporting error messages
>+ *
>+ * Gets port state.
>+ *
>+ * Return: zero on success or an error code on failure.
>+ */
>+static int
>+ice_devlink_port_fn_state_get(struct devlink_port *port,
>+ enum devlink_port_fn_state *state,
>+ enum devlink_port_fn_opstate *opstate,
>+ struct netlink_ext_ack *extack)
>+{
>+ struct ice_dynamic_port *dyn_port;
>+
>+ dyn_port = ice_devlink_port_to_dyn(port);
>+
>+ if (dyn_port->active)
>+ *state = DEVLINK_PORT_FN_STATE_ACTIVE;
>+ else
>+ *state = DEVLINK_PORT_FN_STATE_INACTIVE;
>+
>+ if (dyn_port->attached)
>+ *opstate = DEVLINK_PORT_FN_OPSTATE_ATTACHED;
>+ else
>+ *opstate = DEVLINK_PORT_FN_OPSTATE_DETACHED;
>+
>+ return 0;
>+}
>+
> static const struct devlink_port_ops ice_devlink_port_sf_ops = {
> .port_del = ice_devlink_port_del,
>+ .port_fn_hw_addr_get = ice_devlink_port_fn_hw_addr_get,
>+ .port_fn_hw_addr_set = ice_devlink_port_fn_hw_addr_set,
>+ .port_fn_state_get = ice_devlink_port_fn_state_get,
>+ .port_fn_state_set = ice_devlink_port_fn_state_set,
> };
>
> /**
>diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
>index 479d2b976745..d60efc340945 100644
>--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
>+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
>@@ -11,22 +11,29 @@
> * struct ice_dynamic_port - Track dynamically added devlink port instance
> * @hw_addr: the HW address for this port
> * @active: true if the port has been activated
>+ * @attached: true it the prot is attached
> * @devlink_port: the associated devlink port structure
> * @pf: pointer to the PF private structure
> * @vsi: the VSI associated with this port
> * @repr_id: the representor ID
> * @sfnum: the subfunction ID
>+ * @sf_dev: pointer to the subfunction device
> *
> * An instance of a dynamically added devlink port. Each port flavour
> */
> struct ice_dynamic_port {
> u8 hw_addr[ETH_ALEN];
> u8 active: 1;
>+ u8 attached: 1;
> struct devlink_port devlink_port;
> struct ice_pf *pf;
> struct ice_vsi *vsi;
> unsigned long repr_id;
> u32 sfnum;
>+ /* Flavour-specific implementation data */
>+ union {
>+ struct ice_sf_dev *sf_dev;
>+ };
> };
>
> void ice_dealloc_all_dynamic_ports(struct ice_pf *pf);
>diff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.c b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
>index 9eb8993df25a..27a5baee7880 100644
>--- a/drivers/net/ethernet/intel/ice/ice_sf_eth.c
>+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
>@@ -150,6 +150,7 @@ static int ice_sf_dev_probe(struct auxiliary_device *adev,
> devl_unlock(devlink);
>
> devlink_register(devlink);
>+ dyn_port->attached = true;
>
> return 0;
>
>@@ -189,6 +190,8 @@ static void ice_sf_dev_remove(struct auxiliary_device *adev)
> devl_unlock(devlink);
> devlink_free(devlink);
> ice_vsi_decfg(vsi);
>+
>+ dyn_port->attached = false;
> }
>
> static const struct auxiliary_device_id ice_sf_dev_id_table[] = {
>@@ -205,6 +208,8 @@ static struct auxiliary_driver ice_sf_driver = {
> .id_table = ice_sf_dev_id_table
> };
>
>+static DEFINE_XARRAY_ALLOC1(ice_sf_aux_id);
>+
> /**
> * ice_sf_driver_register - Register new auxiliary subfunction driver
> *
>@@ -223,3 +228,101 @@ void ice_sf_driver_unregister(void)
> {
> auxiliary_driver_unregister(&ice_sf_driver);
> }
>+
>+/**
>+ * ice_sf_dev_release - Release device associated with auxiliary device
>+ * @device: pointer to the device
>+ *
>+ * Since most of the code for subfunction deactivation is handled in
>+ * the remove handler, here just free tracking resources.
>+ */
>+static void ice_sf_dev_release(struct device *device)
>+{
>+ struct auxiliary_device *adev = to_auxiliary_dev(device);
>+ struct ice_sf_dev *sf_dev = ice_adev_to_sf_dev(adev);
>+
>+ xa_erase(&ice_sf_aux_id, adev->id);
>+ kfree(sf_dev);
>+}
>+
>+/**
>+ * ice_sf_eth_activate - Activate Ethernet subfunction port
>+ * @dyn_port: the dynamic port instance for this subfunction
>+ * @extack: extack for reporting error messages
>+ *
>+ * Activate the dynamic port as an Ethernet subfunction. Setup the netdev
>+ * resources associated and initialize the auxiliary device.
>+ *
>+ * Return: zero on success or an error code on failure.
>+ */
>+int
>+ice_sf_eth_activate(struct ice_dynamic_port *dyn_port,
>+ struct netlink_ext_ack *extack)
>+{
>+ struct ice_pf *pf = dyn_port->pf;
>+ struct ice_sf_dev *sf_dev;
>+ struct pci_dev *pdev;
>+ int err;
>+ u32 id;
>+
>+ err = xa_alloc(&ice_sf_aux_id, &id, NULL, xa_limit_32b,
>+ GFP_KERNEL);
>+ if (err) {
>+ NL_SET_ERR_MSG_MOD(extack, "Could not allocate SF ID");
>+ return err;
>+ }
>+
>+ sf_dev = kzalloc(sizeof(*sf_dev), GFP_KERNEL);
>+ if (!sf_dev) {
>+ err = -ENOMEM;
>+ NL_SET_ERR_MSG_MOD(extack, "Could not allocate SF memory");
>+ goto xa_erase;
>+ }
>+ pdev = pf->pdev;
>+
>+ sf_dev->dyn_port = dyn_port;
>+ sf_dev->adev.id = id;
>+ sf_dev->adev.name = "sf";
>+ sf_dev->adev.dev.release = ice_sf_dev_release;
>+ sf_dev->adev.dev.parent = &pdev->dev;
>+
>+ err = auxiliary_device_init(&sf_dev->adev);
>+ if (err) {
>+ NL_SET_ERR_MSG_MOD(extack, "Failed to initialize SF device");
>+ goto sf_dev_free;
>+ }
>+
>+ err = auxiliary_device_add(&sf_dev->adev);
>+ if (err) {
>+ NL_SET_ERR_MSG_MOD(extack, "Failed to add SF device");
>+ goto aux_dev_uninit;
>+ }
>+
>+ dyn_port->sf_dev = sf_dev;
>+
>+ return 0;
>+
>+aux_dev_uninit:
>+ auxiliary_device_uninit(&sf_dev->adev);
>+sf_dev_free:
>+ kfree(sf_dev);
>+xa_erase:
>+ xa_erase(&ice_sf_aux_id, id);
>+
>+ return err;
>+}
>+
>+/**
>+ * ice_sf_eth_deactivate - Deactivate Ethernet subfunction port
>+ * @dyn_port: the dynamic port instance for this subfunction
>+ *
>+ * Deactivate the Ethernet subfunction, removing its auxiliary device and the
>+ * associated resources.
>+ */
>+void ice_sf_eth_deactivate(struct ice_dynamic_port *dyn_port)
>+{
>+ struct ice_sf_dev *sf_dev = dyn_port->sf_dev;
>+
>+ auxiliary_device_delete(&sf_dev->adev);
>+ auxiliary_device_uninit(&sf_dev->adev);
>+}
>diff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.h b/drivers/net/ethernet/intel/ice/ice_sf_eth.h
>index e972c50f96c9..c558cad0a183 100644
>--- a/drivers/net/ethernet/intel/ice/ice_sf_eth.h
>+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.h
>@@ -27,4 +27,7 @@ ice_sf_dev *ice_adev_to_sf_dev(struct auxiliary_device *adev)
> int ice_sf_driver_register(void);
> void ice_sf_driver_unregister(void);
>
>+int ice_sf_eth_activate(struct ice_dynamic_port *dyn_port,
>+ struct netlink_ext_ack *extack);
>+void ice_sf_eth_deactivate(struct ice_dynamic_port *dyn_port);
> #endif /* _ICE_SF_ETH_H_ */
>--
>2.42.0
>
>
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH net-next v3 15/15] ice: allow to activate and deactivate subfunction
2024-08-09 11:26 ` Jiri Pirko
@ 2024-08-09 11:49 ` Michal Swiatkowski
0 siblings, 0 replies; 26+ messages in thread
From: Michal Swiatkowski @ 2024-08-09 11:49 UTC (permalink / raw)
To: Jiri Pirko
Cc: Tony Nguyen, davem, kuba, pabeni, edumazet, netdev,
Piotr Raczynski, jiri, shayd, wojciech.drewek, horms,
sridhar.samudrala, mateusz.polchlopek, kalesh-anakkur.purayil,
michal.kubiak, pio.raczynski, przemyslaw.kitszel, jacob.e.keller,
maciej.fijalkowski, Rafal Romanowski
On Fri, Aug 09, 2024 at 01:26:44PM +0200, Jiri Pirko wrote:
> Thu, Aug 08, 2024 at 07:31:01PM CEST, anthony.l.nguyen@intel.com wrote:
> >From: Piotr Raczynski <piotr.raczynski@intel.com>
> >
> >Use previously implemented SF aux driver. It is probe during SF
> >activation and remove after deactivation.
> >
> >Reviewed-by: Simon Horman <horms@kernel.org>
> >Signed-off-by: Piotr Raczynski <piotr.raczynski@intel.com>
> >Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
> >Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
> >Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
> >---
> > .../ethernet/intel/ice/devlink/devlink_port.c | 176 ++++++++++++++++++
> > .../ethernet/intel/ice/devlink/devlink_port.h | 7 +
> > drivers/net/ethernet/intel/ice/ice_sf_eth.c | 103 ++++++++++
> > drivers/net/ethernet/intel/ice/ice_sf_eth.h | 3 +
> > 4 files changed, 289 insertions(+)
> >
> >diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
> >index 4cfd90581d92..675a2b60892b 100644
> >--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
> >+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
> >@@ -530,6 +530,48 @@ void ice_devlink_destroy_sf_dev_port(struct ice_sf_dev *sf_dev)
> > devl_port_unregister(&sf_dev->priv->devlink_port);
> > }
> >
> >+/**
> >+ * ice_activate_dynamic_port - Activate a dynamic port
> >+ * @dyn_port: dynamic port instance to activate
> >+ * @extack: extack for reporting error messages
> >+ *
> >+ * Activate the dynamic port based on its flavour.
> >+ *
> >+ * Return: zero on success or an error code on failure.
> >+ */
> >+static int
> >+ice_activate_dynamic_port(struct ice_dynamic_port *dyn_port,
> >+ struct netlink_ext_ack *extack)
> >+{
> >+ int err;
> >+
> >+ if (dyn_port->active)
> >+ return 0;
> >+
> >+ err = ice_sf_eth_activate(dyn_port, extack);
> >+ if (err)
> >+ return err;
> >+
> >+ dyn_port->active = true;
> >+
> >+ return 0;
> >+}
> >+
> >+/**
> >+ * ice_deactivate_dynamic_port - Deactivate a dynamic port
> >+ * @dyn_port: dynamic port instance to deactivate
> >+ *
> >+ * Undo activation of a dynamic port.
> >+ */
> >+static void ice_deactivate_dynamic_port(struct ice_dynamic_port *dyn_port)
> >+{
> >+ if (!dyn_port->active)
> >+ return;
> >+
> >+ ice_sf_eth_deactivate(dyn_port);
> >+ dyn_port->active = false;
> >+}
> >+
> > /**
> > * ice_dealloc_dynamic_port - Deallocate and remove a dynamic port
> > * @dyn_port: dynamic port instance to deallocate
> >@@ -542,6 +584,8 @@ static void ice_dealloc_dynamic_port(struct ice_dynamic_port *dyn_port)
> > struct devlink_port *devlink_port = &dyn_port->devlink_port;
> > struct ice_pf *pf = dyn_port->pf;
> >
> >+ ice_deactivate_dynamic_port(dyn_port);
> >+
> > xa_erase(&pf->sf_nums, devlink_port->attrs.pci_sf.sf);
> > ice_eswitch_detach_sf(pf, dyn_port);
> > ice_vsi_free(dyn_port->vsi);
> >@@ -629,8 +673,140 @@ ice_devlink_port_del(struct devlink *devlink, struct devlink_port *port,
> > return 0;
> > }
> >
> >+/**
> >+ * ice_devlink_port_fn_hw_addr_set - devlink handler for mac address set
> >+ * @port: pointer to devlink port
> >+ * @hw_addr: hw address to set
> >+ * @hw_addr_len: hw address length
> >+ * @extack: extack for reporting error messages
> >+ *
> >+ * Sets mac address for the port, verifies arguments and copies address
> >+ * to the subfunction structure.
> >+ *
> >+ * Return: zero on success or an error code on failure.
> >+ */
> >+static int
> >+ice_devlink_port_fn_hw_addr_set(struct devlink_port *port, const u8 *hw_addr,
>
> Interesting. The patch subject and description talks about "activation"
> yet you also set/get hw address here. Either split to 2 patches of
> adjust the patch subject and desctiption.
>
I will adjust.
>
>
>
> >+ int hw_addr_len,
> >+ struct netlink_ext_ack *extack)
> >+{
> >+ struct ice_dynamic_port *dyn_port;
> >+
> >+ dyn_port = ice_devlink_port_to_dyn(port);
> >+
> >+ if (dyn_port->attached) {
> >+ NL_SET_ERR_MSG_MOD(extack,
> >+ "Ethernet address can be change only in detached state");
> >+ return -EBUSY;
> >+ }
> >+
> >+ if (hw_addr_len != ETH_ALEN || !is_valid_ether_addr(hw_addr)) {
> >+ NL_SET_ERR_MSG_MOD(extack, "Invalid ethernet address");
> >+ return -EADDRNOTAVAIL;
> >+ }
> >+
> >+ ether_addr_copy(dyn_port->hw_addr, hw_addr);
> >+
> >+ return 0;
> >+}
> >+
> >+/**
> >+ * ice_devlink_port_fn_hw_addr_get - devlink handler for mac address get
> >+ * @port: pointer to devlink port
> >+ * @hw_addr: hw address to set
> >+ * @hw_addr_len: hw address length
> >+ * @extack: extack for reporting error messages
> >+ *
> >+ * Returns mac address for the port.
> >+ *
> >+ * Return: zero on success or an error code on failure.
> >+ */
> >+static int
> >+ice_devlink_port_fn_hw_addr_get(struct devlink_port *port, u8 *hw_addr,
> >+ int *hw_addr_len,
> >+ struct netlink_ext_ack *extack)
> >+{
> >+ struct ice_dynamic_port *dyn_port;
> >+
> >+ dyn_port = ice_devlink_port_to_dyn(port);
> >+
> >+ ether_addr_copy(hw_addr, dyn_port->hw_addr);
> >+ *hw_addr_len = ETH_ALEN;
> >+
> >+ return 0;
> >+}
> >+
> >+/**
> >+ * ice_devlink_port_fn_state_set - devlink handler for port state set
> >+ * @port: pointer to devlink port
> >+ * @state: state to set
> >+ * @extack: extack for reporting error messages
> >+ *
> >+ * Activates or deactivates the port.
> >+ *
> >+ * Return: zero on success or an error code on failure.
> >+ */
> >+static int
> >+ice_devlink_port_fn_state_set(struct devlink_port *port,
> >+ enum devlink_port_fn_state state,
> >+ struct netlink_ext_ack *extack)
> >+{
> >+ struct ice_dynamic_port *dyn_port;
> >+
> >+ dyn_port = ice_devlink_port_to_dyn(port);
> >+
> >+ switch (state) {
> >+ case DEVLINK_PORT_FN_STATE_ACTIVE:
> >+ return ice_activate_dynamic_port(dyn_port, extack);
> >+
> >+ case DEVLINK_PORT_FN_STATE_INACTIVE:
> >+ ice_deactivate_dynamic_port(dyn_port);
> >+ break;
> >+ }
> >+
> >+ return 0;
> >+}
> >+
> >+/**
> >+ * ice_devlink_port_fn_state_get - devlink handler for port state get
> >+ * @port: pointer to devlink port
> >+ * @state: admin configured state of the port
> >+ * @opstate: current port operational state
> >+ * @extack: extack for reporting error messages
> >+ *
> >+ * Gets port state.
> >+ *
> >+ * Return: zero on success or an error code on failure.
> >+ */
> >+static int
> >+ice_devlink_port_fn_state_get(struct devlink_port *port,
> >+ enum devlink_port_fn_state *state,
> >+ enum devlink_port_fn_opstate *opstate,
> >+ struct netlink_ext_ack *extack)
> >+{
> >+ struct ice_dynamic_port *dyn_port;
> >+
> >+ dyn_port = ice_devlink_port_to_dyn(port);
> >+
> >+ if (dyn_port->active)
> >+ *state = DEVLINK_PORT_FN_STATE_ACTIVE;
> >+ else
> >+ *state = DEVLINK_PORT_FN_STATE_INACTIVE;
> >+
> >+ if (dyn_port->attached)
> >+ *opstate = DEVLINK_PORT_FN_OPSTATE_ATTACHED;
> >+ else
> >+ *opstate = DEVLINK_PORT_FN_OPSTATE_DETACHED;
> >+
> >+ return 0;
> >+}
> >+
> > static const struct devlink_port_ops ice_devlink_port_sf_ops = {
> > .port_del = ice_devlink_port_del,
> >+ .port_fn_hw_addr_get = ice_devlink_port_fn_hw_addr_get,
> >+ .port_fn_hw_addr_set = ice_devlink_port_fn_hw_addr_set,
> >+ .port_fn_state_get = ice_devlink_port_fn_state_get,
> >+ .port_fn_state_set = ice_devlink_port_fn_state_set,
> > };
> >
> > /**
> >diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
> >index 479d2b976745..d60efc340945 100644
> >--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
> >+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.h
> >@@ -11,22 +11,29 @@
> > * struct ice_dynamic_port - Track dynamically added devlink port instance
> > * @hw_addr: the HW address for this port
> > * @active: true if the port has been activated
> >+ * @attached: true it the prot is attached
> > * @devlink_port: the associated devlink port structure
> > * @pf: pointer to the PF private structure
> > * @vsi: the VSI associated with this port
> > * @repr_id: the representor ID
> > * @sfnum: the subfunction ID
> >+ * @sf_dev: pointer to the subfunction device
> > *
> > * An instance of a dynamically added devlink port. Each port flavour
> > */
> > struct ice_dynamic_port {
> > u8 hw_addr[ETH_ALEN];
> > u8 active: 1;
> >+ u8 attached: 1;
> > struct devlink_port devlink_port;
> > struct ice_pf *pf;
> > struct ice_vsi *vsi;
> > unsigned long repr_id;
> > u32 sfnum;
> >+ /* Flavour-specific implementation data */
> >+ union {
> >+ struct ice_sf_dev *sf_dev;
> >+ };
> > };
> >
> > void ice_dealloc_all_dynamic_ports(struct ice_pf *pf);
> >diff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.c b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
> >index 9eb8993df25a..27a5baee7880 100644
> >--- a/drivers/net/ethernet/intel/ice/ice_sf_eth.c
> >+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
> >@@ -150,6 +150,7 @@ static int ice_sf_dev_probe(struct auxiliary_device *adev,
> > devl_unlock(devlink);
> >
> > devlink_register(devlink);
> >+ dyn_port->attached = true;
> >
> > return 0;
> >
> >@@ -189,6 +190,8 @@ static void ice_sf_dev_remove(struct auxiliary_device *adev)
> > devl_unlock(devlink);
> > devlink_free(devlink);
> > ice_vsi_decfg(vsi);
> >+
> >+ dyn_port->attached = false;
> > }
> >
> > static const struct auxiliary_device_id ice_sf_dev_id_table[] = {
> >@@ -205,6 +208,8 @@ static struct auxiliary_driver ice_sf_driver = {
> > .id_table = ice_sf_dev_id_table
> > };
> >
> >+static DEFINE_XARRAY_ALLOC1(ice_sf_aux_id);
> >+
> > /**
> > * ice_sf_driver_register - Register new auxiliary subfunction driver
> > *
> >@@ -223,3 +228,101 @@ void ice_sf_driver_unregister(void)
> > {
> > auxiliary_driver_unregister(&ice_sf_driver);
> > }
> >+
> >+/**
> >+ * ice_sf_dev_release - Release device associated with auxiliary device
> >+ * @device: pointer to the device
> >+ *
> >+ * Since most of the code for subfunction deactivation is handled in
> >+ * the remove handler, here just free tracking resources.
> >+ */
> >+static void ice_sf_dev_release(struct device *device)
> >+{
> >+ struct auxiliary_device *adev = to_auxiliary_dev(device);
> >+ struct ice_sf_dev *sf_dev = ice_adev_to_sf_dev(adev);
> >+
> >+ xa_erase(&ice_sf_aux_id, adev->id);
> >+ kfree(sf_dev);
> >+}
> >+
> >+/**
> >+ * ice_sf_eth_activate - Activate Ethernet subfunction port
> >+ * @dyn_port: the dynamic port instance for this subfunction
> >+ * @extack: extack for reporting error messages
> >+ *
> >+ * Activate the dynamic port as an Ethernet subfunction. Setup the netdev
> >+ * resources associated and initialize the auxiliary device.
> >+ *
> >+ * Return: zero on success or an error code on failure.
> >+ */
> >+int
> >+ice_sf_eth_activate(struct ice_dynamic_port *dyn_port,
> >+ struct netlink_ext_ack *extack)
> >+{
> >+ struct ice_pf *pf = dyn_port->pf;
> >+ struct ice_sf_dev *sf_dev;
> >+ struct pci_dev *pdev;
> >+ int err;
> >+ u32 id;
> >+
> >+ err = xa_alloc(&ice_sf_aux_id, &id, NULL, xa_limit_32b,
> >+ GFP_KERNEL);
> >+ if (err) {
> >+ NL_SET_ERR_MSG_MOD(extack, "Could not allocate SF ID");
> >+ return err;
> >+ }
> >+
> >+ sf_dev = kzalloc(sizeof(*sf_dev), GFP_KERNEL);
> >+ if (!sf_dev) {
> >+ err = -ENOMEM;
> >+ NL_SET_ERR_MSG_MOD(extack, "Could not allocate SF memory");
> >+ goto xa_erase;
> >+ }
> >+ pdev = pf->pdev;
> >+
> >+ sf_dev->dyn_port = dyn_port;
> >+ sf_dev->adev.id = id;
> >+ sf_dev->adev.name = "sf";
> >+ sf_dev->adev.dev.release = ice_sf_dev_release;
> >+ sf_dev->adev.dev.parent = &pdev->dev;
> >+
> >+ err = auxiliary_device_init(&sf_dev->adev);
> >+ if (err) {
> >+ NL_SET_ERR_MSG_MOD(extack, "Failed to initialize SF device");
> >+ goto sf_dev_free;
> >+ }
> >+
> >+ err = auxiliary_device_add(&sf_dev->adev);
> >+ if (err) {
> >+ NL_SET_ERR_MSG_MOD(extack, "Failed to add SF device");
> >+ goto aux_dev_uninit;
> >+ }
> >+
> >+ dyn_port->sf_dev = sf_dev;
> >+
> >+ return 0;
> >+
> >+aux_dev_uninit:
> >+ auxiliary_device_uninit(&sf_dev->adev);
> >+sf_dev_free:
> >+ kfree(sf_dev);
> >+xa_erase:
> >+ xa_erase(&ice_sf_aux_id, id);
> >+
> >+ return err;
> >+}
> >+
> >+/**
> >+ * ice_sf_eth_deactivate - Deactivate Ethernet subfunction port
> >+ * @dyn_port: the dynamic port instance for this subfunction
> >+ *
> >+ * Deactivate the Ethernet subfunction, removing its auxiliary device and the
> >+ * associated resources.
> >+ */
> >+void ice_sf_eth_deactivate(struct ice_dynamic_port *dyn_port)
> >+{
> >+ struct ice_sf_dev *sf_dev = dyn_port->sf_dev;
> >+
> >+ auxiliary_device_delete(&sf_dev->adev);
> >+ auxiliary_device_uninit(&sf_dev->adev);
> >+}
> >diff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.h b/drivers/net/ethernet/intel/ice/ice_sf_eth.h
> >index e972c50f96c9..c558cad0a183 100644
> >--- a/drivers/net/ethernet/intel/ice/ice_sf_eth.h
> >+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.h
> >@@ -27,4 +27,7 @@ ice_sf_dev *ice_adev_to_sf_dev(struct auxiliary_device *adev)
> > int ice_sf_driver_register(void);
> > void ice_sf_driver_unregister(void);
> >
> >+int ice_sf_eth_activate(struct ice_dynamic_port *dyn_port,
> >+ struct netlink_ext_ack *extack);
> >+void ice_sf_eth_deactivate(struct ice_dynamic_port *dyn_port);
> > #endif /* _ICE_SF_ETH_H_ */
> >--
> >2.42.0
> >
> >
^ permalink raw reply [flat|nested] 26+ messages in thread