From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
To: netdev@vger.kernel.org, davem@davemloft.net, kuba@kernel.org,
pabeni@redhat.com, edumazet@google.com
Cc: intel-wired-lan@lists.osuosl.org, jiri@nvidia.com,
anthony.l.nguyen@intel.com, alexandr.lobakin@intel.com,
sridhar.samudrala@intel.com, wojciech.drewek@intel.com,
lukasz.czapnik@intel.com, shiraz.saleem@intel.com,
jesse.brandeburg@intel.com, mustafa.ismail@intel.com,
przemyslaw.kitszel@intel.com, piotr.raczynski@intel.com,
jacob.e.keller@intel.com, david.m.ertman@intel.com,
leszek.kaliszczuk@intel.com,
Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Subject: [PATCH net-next 05/13] ice: stop hard coding the ICE_VSI_CTRL location
Date: Mon, 14 Nov 2022 13:57:47 +0100 [thread overview]
Message-ID: <20221114125755.13659-6-michal.swiatkowski@linux.intel.com> (raw)
In-Reply-To: <20221114125755.13659-1-michal.swiatkowski@linux.intel.com>
From: Jacob Keller <jacob.e.keller@intel.com>
When allocating the ICE_VSI_CTRL, the allocated struct ice_vsi pointer is
stored into the PF's pf->vsi array at a fixed location. This was
historically done on the basis that it could provide an O(1) lookup for the
special control VSI.
Since we store the ctrl_vsi_idx, we already have O(1) lookup regardless of
where in the array we store this VSI.
Simplify the logic in ice_vsi_alloc by using the same method of storing the
control VSI as other types of VSIs.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
---
drivers/net/ethernet/intel/ice/ice_lib.c | 34 +++++++++++-------------
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index 298bb901e4e7..dc672af10c25 100644
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -379,10 +379,7 @@ int ice_vsi_free(struct ice_vsi *vsi)
/* updates the PF for this cleared VSI */
pf->vsi[vsi->idx] = NULL;
- if (vsi->idx < pf->next_vsi && vsi->type != ICE_VSI_CTRL)
- pf->next_vsi = vsi->idx;
- if (vsi->idx < pf->next_vsi && vsi->type == ICE_VSI_CTRL && vsi->vf)
- pf->next_vsi = vsi->idx;
+ pf->next_vsi = vsi->idx;
ice_vsi_free_arrays(vsi);
mutex_unlock(&pf->sw_mutex);
@@ -540,23 +537,22 @@ ice_vsi_alloc(struct ice_pf *pf, struct ice_port_info *pi,
vsi->vf = vf;
set_bit(ICE_VSI_DOWN, vsi->state);
- if (vsi->type == ICE_VSI_CTRL && !vf) {
- /* Use the last VSI slot as the index for PF control VSI */
- vsi->idx = pf->num_alloc_vsi - 1;
- pf->ctrl_vsi_idx = vsi->idx;
- pf->vsi[vsi->idx] = vsi;
- } else {
- /* fill slot and make note of the index */
- vsi->idx = pf->next_vsi;
- pf->vsi[pf->next_vsi] = vsi;
+ /* fill slot and make note of the index */
+ vsi->idx = pf->next_vsi;
+ pf->vsi[pf->next_vsi] = vsi;
- /* prepare pf->next_vsi for next use */
- pf->next_vsi = ice_get_free_slot(pf->vsi, pf->num_alloc_vsi,
- pf->next_vsi);
- }
+ /* prepare pf->next_vsi for next use */
+ pf->next_vsi = ice_get_free_slot(pf->vsi, pf->num_alloc_vsi,
+ pf->next_vsi);
- if (vsi->type == ICE_VSI_CTRL && vf)
- vf->ctrl_vsi_idx = vsi->idx;
+ if (vsi->type == ICE_VSI_CTRL) {
+ if (vf) {
+ vf->ctrl_vsi_idx = vsi->idx;
+ } else {
+ WARN_ON(pf->ctrl_vsi_idx != ICE_NO_VSI);
+ pf->ctrl_vsi_idx = vsi->idx;
+ }
+ }
unlock_pf:
mutex_unlock(&pf->sw_mutex);
--
2.36.1
next prev parent reply other threads:[~2022-11-14 13:12 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-14 12:57 [PATCH net-next 00/13] resource management using devlink reload Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 01/13] ice: move RDMA init to ice_idc.c Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 02/13] ice: alloc id for RDMA using xa_array Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 03/13] ice: cleanup in VSI config/deconfig code Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 04/13] ice: split ice_vsi_setup into smaller functions Michal Swiatkowski
2022-11-15 5:08 ` Jakub Kicinski
2022-11-15 6:49 ` Michal Swiatkowski
2022-11-14 12:57 ` Michal Swiatkowski [this message]
2022-11-14 12:57 ` [PATCH net-next 06/13] ice: split probe " Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 07/13] ice: sync netdev filters after clearing VSI Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 08/13] ice: move VSI delete outside deconfig Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 09/13] ice: update VSI instead of init in some case Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 10/13] ice: implement devlink reinit action Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 11/13] ice: introduce eswitch capable flag Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 12/13] ice, irdma: prepare reservation of MSI-X to reload Michal Swiatkowski
2022-11-15 5:08 ` Jakub Kicinski
2022-11-15 6:49 ` Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 13/13] devlink, ice: add MSIX vectors as devlink resource Michal Swiatkowski
2022-11-14 15:28 ` Jiri Pirko
2022-11-14 16:03 ` Piotr Raczynski
2022-11-15 6:56 ` Michal Swiatkowski
2022-11-15 12:08 ` Jiri Pirko
2022-11-14 13:23 ` [PATCH net-next 00/13] resource management using devlink reload Leon Romanovsky
2022-11-14 15:31 ` Samudrala, Sridhar
2022-11-14 16:58 ` Keller, Jacob E
2022-11-14 17:09 ` Leon Romanovsky
2022-11-15 7:00 ` Michal Swiatkowski
2022-11-14 17:07 ` Leon Romanovsky
2022-11-15 7:12 ` Michal Swiatkowski
2022-11-15 8:11 ` Leon Romanovsky
2022-11-15 9:04 ` Michal Swiatkowski
2022-11-15 9:32 ` Leon Romanovsky
2022-11-15 10:16 ` Michal Swiatkowski
2022-11-15 12:12 ` Leon Romanovsky
2022-11-15 14:02 ` Michal Swiatkowski
2022-11-15 17:57 ` Leon Romanovsky
2022-11-16 1:59 ` Samudrala, Sridhar
2022-11-16 6:04 ` Leon Romanovsky
2022-11-16 12:04 ` Michal Swiatkowski
2022-11-16 17:59 ` Leon Romanovsky
2022-11-17 11:10 ` Michal Swiatkowski
2022-11-17 11:45 ` Leon Romanovsky
2022-11-17 13:39 ` Michal Swiatkowski
2022-11-17 17:38 ` Leon Romanovsky
2022-11-18 3:36 ` Jakub Kicinski
2022-11-18 6:20 ` Leon Romanovsky
2022-11-18 14:23 ` Saleem, Shiraz
2022-11-18 17:31 ` Leon Romanovsky
2022-11-20 22:24 ` Samudrala, Sridhar
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=20221114125755.13659-6-michal.swiatkowski@linux.intel.com \
--to=michal.swiatkowski@linux.intel.com \
--cc=alexandr.lobakin@intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=david.m.ertman@intel.com \
--cc=edumazet@google.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jacob.e.keller@intel.com \
--cc=jesse.brandeburg@intel.com \
--cc=jiri@nvidia.com \
--cc=kuba@kernel.org \
--cc=leszek.kaliszczuk@intel.com \
--cc=lukasz.czapnik@intel.com \
--cc=mustafa.ismail@intel.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=piotr.raczynski@intel.com \
--cc=przemyslaw.kitszel@intel.com \
--cc=shiraz.saleem@intel.com \
--cc=sridhar.samudrala@intel.com \
--cc=wojciech.drewek@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;
as well as URLs for NNTP newsgroup(s).