From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C89A4DDA6 for ; Fri, 2 Aug 2024 04:57:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722574661; cv=none; b=eyayu3LTgjJzAUaITQ4UOaT1qL9X58lx77B9GqPFggTCFK8kSMZD2+i2ExT1IhFAArEu2kgZDoo7PqpwV5KAQwCv7kjFDGvCAQjG8H2Jp1mNOCkVsoj2grnqd1gjhSTd9B/L0cI0P6ZL8DU4VkHGlaMnyy/RPFsfPSVRslnWJ/4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722574661; c=relaxed/simple; bh=f6SpNQ5LA0elTBxb/ALOnTrksbjaOhNlRBHVL0wyf9o=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=pIZ+JZweHQC0XnJAl0+oV8LHoNWIi/URZ6HeO5PKMhgbsMY87eWs6WA2jsa2XKJRXH2g6IlUA2c1iThUpoQY51zZJl/UqVXZmpwBMM+DeglMud8aL8fWdAtSD/cXp5PGGlS5qI6oIK7P+qjTt/CaBpJeEbcI2Q/FjUO66FxdgzE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=hArM2B0Q; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="hArM2B0Q" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1722574660; x=1754110660; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=f6SpNQ5LA0elTBxb/ALOnTrksbjaOhNlRBHVL0wyf9o=; b=hArM2B0QuxJThhtre5wz1+2xGDgZntOiEqgRk1+sQnSU7O0VY1zLRSar R5i2pypMvRmmIchYKWK+DOLcLNBoHOskNIF/otFmMEvPoioid/gFzJz5B THLqyGJGkC8J60plxkK/QwODERff3QLDvkbs+wpu0OaBKsH0WX9FLyG/j WBy7hVHE5oCeaId57tTpR7Rc20NbjO1t0rhVfvWQhBld5cx3fKAW1mNiY s0B5wIsQcOYQaWWrQr1LZoqyEYZ0Gp1F0DQD1YobDPnkO7qdqNKZz2EDK nHg2QBVkMnEfeVMOgEKP8t45p1v/B/MFiyVXNc3b7Udu0Uf73gRp6yfQv A==; X-CSE-ConnectionGUID: Lb5iQgJJQhiA5Td0eOCXcg== X-CSE-MsgGUID: h65Nku7nRWCFuIZvr6Z42Q== X-IronPort-AV: E=McAfee;i="6700,10204,11151"; a="20157174" X-IronPort-AV: E=Sophos;i="6.09,256,1716274800"; d="scan'208";a="20157174" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2024 21:57:39 -0700 X-CSE-ConnectionGUID: uEzZcrVOQP64pSlhYGaP/A== X-CSE-MsgGUID: gPbxJfcRRXqHULVWGP/Ifw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,256,1716274800"; d="scan'208";a="86203580" Received: from mev-dev.igk.intel.com ([10.237.112.144]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2024 21:57:34 -0700 Date: Fri, 2 Aug 2024 06:55:56 +0200 From: Michal Swiatkowski To: Jiri Pirko Cc: Tony Nguyen , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, netdev@vger.kernel.org, Piotr Raczynski , jiri@nvidia.com, shayd@nvidia.com, wojciech.drewek@intel.com, horms@kernel.org, sridhar.samudrala@intel.com, mateusz.polchlopek@intel.com, kalesh-anakkur.purayil@broadcom.com, michal.kubiak@intel.com, pio.raczynski@gmail.com, przemyslaw.kitszel@intel.com, jacob.e.keller@intel.com, maciej.fijalkowski@intel.com, Rafal Romanowski Subject: Re: [PATCH net-next v2 15/15] ice: allow to activate and deactivate subfunction Message-ID: References: <20240731221028.965449-1-anthony.l.nguyen@intel.com> <20240731221028.965449-16-anthony.l.nguyen@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Thu, Aug 01, 2024 at 04:59:53PM +0200, Jiri Pirko wrote: > Thu, Aug 01, 2024 at 12:10:26AM CEST, anthony.l.nguyen@intel.com wrote: > >From: Piotr Raczynski > > > >Use previously implemented SF aux driver. It is probe during SF > >activation and remove after deactivation. > > > >Reviewed-by: Simon Horman > >Signed-off-by: Piotr Raczynski > >Signed-off-by: Michal Swiatkowski > >Tested-by: Rafal Romanowski > >Signed-off-by: Tony Nguyen > >--- > > .../ethernet/intel/ice/devlink/devlink_port.c | 173 ++++++++++++++++++ > > .../ethernet/intel/ice/devlink/devlink_port.h | 7 + > > drivers/net/ethernet/intel/ice/ice_sf_eth.c | 107 +++++++++++ > > drivers/net/ethernet/intel/ice/ice_sf_eth.h | 3 + > > 4 files changed, 290 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..4abdc40d345e 100644 > >--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c > >+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c > >@@ -530,6 +530,42 @@ 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; > >+ > >+ 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) > >+{ > > You set "active" flag here and in the function above. Why do you check > it outside? (ice_dealloc_dynamic_port()/ice_devlink_port_fn_state_set()) > Just move the check here. > > Similar for the "!active" check. I can do that. > > > >+ 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 +578,9 @@ 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; > > > >+ if (dyn_port->active) > >+ 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 +668,142 @@ 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: > >+ if (!dyn_port->active) > >+ return ice_activate_dynamic_port(dyn_port, extack); > >+ break; > >+ case DEVLINK_PORT_FN_STATE_INACTIVE: > >+ if (dyn_port->active) > >+ 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 c901c07da1d4..abd74f30dabc 100644 > >--- a/drivers/net/ethernet/intel/ice/ice_sf_eth.c > >+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.c > >@@ -149,6 +149,7 @@ static int ice_sf_dev_probe(struct auxiliary_device *adev, > > devl_unlock(devlink); > > > > devlink_register(devlink); > >+ dyn_port->attached = true; > > > > return 0; > > > >@@ -188,6 +189,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[] = { > >@@ -204,6 +207,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 > > * > >@@ -222,3 +227,105 @@ 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 subfunction 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_dev 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 auxiliary device"); > >+ goto sf_dev_free; > >+ } > >+ > >+ err = auxiliary_device_add(&sf_dev->adev); > >+ if (err) { > >+ NL_SET_ERR_MSG_MOD(extack, "Failed to add SF aux device"); > > NL_SET_ERR_MSG_MOD(extack, "Could not allocate subfunction ID"); > NL_SET_ERR_MSG_MOD(extack, "Could not allocate sf_dev memory"); > NL_SET_ERR_MSG_MOD(extack, "Failed to initialize auxiliary device"); > > Could you make the messages somehow consistent in terminology? Ok > > > >+ 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; > >+ > >+ if (sf_dev) { > > How exactly sf_dev could be NULL here? > > > >+ auxiliary_device_delete(&sf_dev->adev); > >+ auxiliary_device_uninit(&sf_dev->adev); > >+ } > >+ > >+ dyn_port->sf_dev = NULL; > > Why you need this set? > > Looks like you are somehow making this partially redundant with "active" > flag. Could you use either sf_dev null as indication or "active" flag? > Ok, will change that. > > > >+} > >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 > > > >