From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
To: Jacob Keller <jacob.e.keller@intel.com>
Cc: Anthony Nguyen <anthony.l.nguyen@intel.com>,
Intel Wired LAN <intel-wired-lan@lists.osuosl.org>
Subject: Re: [Intel-wired-lan] [PATCH net-next 02/13] ice: drop unnecessary VF parameter from several VSI functions
Date: Mon, 16 Jan 2023 11:34:27 +0100 [thread overview]
Message-ID: <Y8UoMzXJe7iguVUW@localhost.localdomain> (raw)
In-Reply-To: <20230113223735.2514364-3-jacob.e.keller@intel.com>
On Fri, Jan 13, 2023 at 02:37:24PM -0800, Jacob Keller wrote:
> The vsi->vf pointer gets assigned early on during ice_vsi_alloc. Several
> functions currently take a VF pointer, but they can just use the existing
> vsi->vf pointer as needed. Modify these functions to drop the unnecessary
> VF parameter.
>
> Note that ice_vsi_cfg is not changed as a following change will refactor so
> that the VF pointer is assigned during ice_vsi_cfg rather than
> ice_vsi_alloc.
>
> Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
> ---
> drivers/net/ethernet/intel/ice/ice_lib.c | 20 ++++++++------------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
> index 62d27e50f40e..0bf99f0e3faa 100644
> --- a/drivers/net/ethernet/intel/ice/ice_lib.c
> +++ b/drivers/net/ethernet/intel/ice/ice_lib.c
> @@ -166,14 +166,14 @@ static void ice_vsi_set_num_desc(struct ice_vsi *vsi)
> /**
> * ice_vsi_set_num_qs - Set number of queues, descriptors and vectors for a VSI
> * @vsi: the VSI being configured
> - * @vf: the VF associated with this VSI, if any
> *
> * Return 0 on success and a negative value on error
> */
> -static void ice_vsi_set_num_qs(struct ice_vsi *vsi, struct ice_vf *vf)
> +static void ice_vsi_set_num_qs(struct ice_vsi *vsi)
> {
> enum ice_vsi_type vsi_type = vsi->type;
> struct ice_pf *pf = vsi->back;
> + struct ice_vf *vf = vsi->vf;
>
> if (WARN_ON(vsi_type == ICE_VSI_VF && !vf))
> return;
> @@ -598,11 +598,10 @@ static int ice_vsi_alloc_stat_arrays(struct ice_vsi *vsi)
> * @ch: ptr to channel
> */
> static int
> -ice_vsi_alloc_def(struct ice_vsi *vsi, struct ice_vf *vf,
> - struct ice_channel *ch)
> +ice_vsi_alloc_def(struct ice_vsi *vsi, struct ice_channel *ch)
> {
> if (vsi->type != ICE_VSI_CHNL) {
> - ice_vsi_set_num_qs(vsi, vf);
> + ice_vsi_set_num_qs(vsi);
> if (ice_vsi_alloc_arrays(vsi))
> return -ENOMEM;
> }
> @@ -2702,14 +2701,11 @@ static int ice_vsi_cfg_tc_lan(struct ice_pf *pf, struct ice_vsi *vsi)
> /**
> * ice_vsi_cfg_def - configure default VSI based on the type
> * @vsi: pointer to VSI
> - * @vf: pointer to VF to which this VSI connects. This field is used primarily
> - * for the ICE_VSI_VF type. Other VSI types should pass NULL.
> * @ch: ptr to channel
> * @init_vsi: is this an initialization or a reconfigure of the VSI
> */
> static int
> -ice_vsi_cfg_def(struct ice_vsi *vsi, struct ice_vf *vf, struct ice_channel *ch,
> - int init_vsi)
> +ice_vsi_cfg_def(struct ice_vsi *vsi, struct ice_channel *ch, int init_vsi)
> {
> struct device *dev = ice_pf_to_dev(vsi->back);
> struct ice_pf *pf = vsi->back;
> @@ -2717,7 +2713,7 @@ ice_vsi_cfg_def(struct ice_vsi *vsi, struct ice_vf *vf, struct ice_channel *ch,
>
> vsi->vsw = pf->first_sw;
>
> - ret = ice_vsi_alloc_def(vsi, vf, ch);
> + ret = ice_vsi_alloc_def(vsi, ch);
> if (ret)
> return ret;
>
> @@ -2875,7 +2871,7 @@ int ice_vsi_cfg(struct ice_vsi *vsi, struct ice_vf *vf, struct ice_channel *ch,
> {
> int ret;
>
> - ret = ice_vsi_cfg_def(vsi, vf, ch, init_vsi);
> + ret = ice_vsi_cfg_def(vsi, ch, init_vsi);
> if (ret)
> return ret;
>
> @@ -3504,7 +3500,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, int init_vsi)
> prev_rxq = vsi->num_rxq;
>
> ice_vsi_decfg(vsi);
> - ret = ice_vsi_cfg_def(vsi, vsi->vf, vsi->ch, init_vsi);
> + ret = ice_vsi_cfg_def(vsi, vsi->ch, init_vsi);
> if (ret)
> goto err_vsi_cfg;
>
Looks better now
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
> --
> 2.38.1.420.g319605f8f00e
>
> _______________________________________________
> Intel-wired-lan mailing list
> Intel-wired-lan@osuosl.org
> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
next prev parent reply other threads:[~2023-01-16 10:34 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-13 22:37 [Intel-wired-lan] [PATCH net-next 00/13] ice: various virtualization cleanups Jacob Keller
2023-01-13 22:37 ` [Intel-wired-lan] [PATCH net-next 01/13] ice: fix function comment referring to ice_vsi_alloc Jacob Keller
2023-01-16 10:31 ` Michal Swiatkowski
2023-01-13 22:37 ` [Intel-wired-lan] [PATCH net-next 02/13] ice: drop unnecessary VF parameter from several VSI functions Jacob Keller
2023-01-16 10:34 ` Michal Swiatkowski [this message]
2023-01-13 22:37 ` [Intel-wired-lan] [PATCH net-next 03/13] ice: move vsi_type assignment from ice_vsi_alloc to ice_vsi_cfg Jacob Keller
2023-01-16 10:47 ` Michal Swiatkowski
2023-01-17 19:20 ` Jacob Keller
2023-01-18 5:37 ` Michal Swiatkowski
2023-01-18 20:50 ` Jacob Keller
2023-01-17 22:24 ` Jacob Keller
2023-01-13 22:37 ` [Intel-wired-lan] [PATCH net-next 04/13] ice: add helper function for checking VSI VF requirement Jacob Keller
2023-01-16 10:56 ` Michal Swiatkowski
2023-01-17 19:23 ` Jacob Keller
2023-01-18 5:24 ` Michal Swiatkowski
2023-01-18 20:49 ` Jacob Keller
2023-01-13 22:37 ` [Intel-wired-lan] [PATCH net-next 05/13] ice: Fix RDMA latency issue by allowing write-combining Jacob Keller
2023-01-14 0:37 ` kernel test robot
2023-01-14 1:58 ` kernel test robot
2023-01-13 22:37 ` [Intel-wired-lan] [PATCH net-next 06/13] ice: move ice_vf_vsi_release into ice_vf_lib.c Jacob Keller
2023-01-13 22:37 ` [Intel-wired-lan] [PATCH net-next 07/13] ice: Pull common tasks into ice_vf_post_vsi_rebuild Jacob Keller
2023-01-13 22:37 ` [Intel-wired-lan] [PATCH net-next 08/13] ice: add a function to initialize vf entry Jacob Keller
2023-01-13 22:37 ` [Intel-wired-lan] [PATCH net-next 09/13] ice: introduce ice_vf_init_host_cfg function Jacob Keller
2023-01-13 22:37 ` [Intel-wired-lan] [PATCH net-next 10/13] ice: convert vf_ops .vsi_rebuild to .create_vsi Jacob Keller
2023-01-27 9:46 ` Szlosek, Marek
2023-01-13 22:37 ` [Intel-wired-lan] [PATCH net-next 11/13] ice: introduce clear_reset_state operation Jacob Keller
2023-01-14 1:17 ` kernel test robot
2023-01-14 3:49 ` kernel test robot
2023-01-13 22:37 ` [Intel-wired-lan] [PATCH net-next 12/13] ice: introduce .irq_close VF operation Jacob Keller
2023-01-13 22:37 ` [Intel-wired-lan] [PATCH net-next 13/13] ice: remove unnecessary virtchnl_ether_addr struct use Jacob Keller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y8UoMzXJe7iguVUW@localhost.localdomain \
--to=michal.swiatkowski@linux.intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jacob.e.keller@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox