From nobody Fri Dec 19 20:11:56 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF437C61D9B for ; Wed, 22 Nov 2023 10:16:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343858AbjKVKQT (ORCPT ); Wed, 22 Nov 2023 05:16:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343766AbjKVKQG (ORCPT ); Wed, 22 Nov 2023 05:16:06 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BC02100 for ; Wed, 22 Nov 2023 02:16:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700648161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D3hDTFxHasNBEWnXI+ElFcNT855TFycKZ4IHkiG5eQE=; b=dp4kLElemvRiVpeVjerJUB+h/ln8k55JdZqteNZ2TJX1fkQmQv2MLVfYcHvFidPHvBzO/v /6qHFKjbuU67a7gyetEU4n6zFJ1yxfyt27ItJqYs6Waqlc0fF2Idi1B+KufeCBIo404IwX 1ho4EylvdFAlPbdgWtN6y4k+6zJnsFU= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-389-lCvHUwb2Ne2tgdQ_E2V4Dw-1; Wed, 22 Nov 2023 05:15:56 -0500 X-MC-Unique: lCvHUwb2Ne2tgdQ_E2V4Dw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 263093804500; Wed, 22 Nov 2023 10:15:55 +0000 (UTC) Received: from p1.luc.cera.cz (unknown [10.45.226.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49C5B10EA1; Wed, 22 Nov 2023 10:15:53 +0000 (UTC) From: Ivan Vecera To: intel-wired-lan@lists.osuosl.org Cc: Jesse Brandeburg , Tony Nguyen , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org, Jacob Keller , Wojciech Drewek , Simon Horman , mschmidt@redhat.com, netdev@vger.kernel.org Subject: [PATCH v4 3/5] i40e: Add helpers to find VSI and VEB by SEID and use them Date: Wed, 22 Nov 2023 11:15:43 +0100 Message-ID: <20231122101545.28819-4-ivecera@redhat.com> In-Reply-To: <20231122101545.28819-1-ivecera@redhat.com> References: <20231122101545.28819-1-ivecera@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add two helpers i40e_(veb|vsi)_get_by_seid() to find corresponding VEB or VSI by their SEID value and use these helpers to replace existing open-coded loops. Reviewed-by: Wojciech Drewek Signed-off-by: Ivan Vecera --- drivers/net/ethernet/intel/i40e/i40e.h | 36 +++++++++ .../net/ethernet/intel/i40e/i40e_debugfs.c | 38 ++------- drivers/net/ethernet/intel/i40e/i40e_main.c | 80 +++++++------------ 3 files changed, 68 insertions(+), 86 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/= intel/i40e/i40e.h index 1e9266de270b..c129e86d4f8b 100644 --- a/drivers/net/ethernet/intel/i40e/i40e.h +++ b/drivers/net/ethernet/intel/i40e/i40e.h @@ -1360,4 +1360,40 @@ static inline struct i40e_pf *i40e_hw_to_pf(struct i= 40e_hw *hw) =20 struct device *i40e_hw_to_dev(struct i40e_hw *hw); =20 +/** + * i40e_pf_get_vsi_by_seid - find VSI by SEID + * @pf: pointer to a PF + * @seid: SEID of the VSI + **/ +static inline struct i40e_vsi * +i40e_pf_get_vsi_by_seid(struct i40e_pf *pf, u16 seid) +{ + struct i40e_vsi *vsi; + int i; + + i40e_pf_for_each_vsi(pf, i, vsi) + if (vsi->seid =3D=3D seid) + return vsi; + + return NULL; +} + +/** + * i40e_pf_get_veb_by_seid - find VEB by SEID + * @pf: pointer to a PF + * @seid: SEID of the VSI + **/ +static inline struct i40e_veb * +i40e_pf_get_veb_by_seid(struct i40e_pf *pf, u16 seid) +{ + struct i40e_veb *veb; + int i; + + i40e_pf_for_each_veb(pf, i, veb) + if (veb->seid =3D=3D seid) + return veb; + + return NULL; +} + #endif /* _I40E_H_ */ diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/e= thernet/intel/i40e/i40e_debugfs.c index b236b0f93202..990a60889eef 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c +++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c @@ -24,37 +24,13 @@ enum ring_type { **/ static struct i40e_vsi *i40e_dbg_find_vsi(struct i40e_pf *pf, int seid) { - struct i40e_vsi *vsi; - int i; - if (seid < 0) { dev_info(&pf->pdev->dev, "%d: bad seid\n", seid); =20 return NULL; } =20 - i40e_pf_for_each_vsi(pf, i, vsi) - if (vsi->seid =3D=3D seid) - return vsi; - - return NULL; -} - -/** - * i40e_dbg_find_veb - searches for the veb with the given seid - * @pf: the PF structure to search for the veb - * @seid: seid of the veb it is searching for - **/ -static struct i40e_veb *i40e_dbg_find_veb(struct i40e_pf *pf, int seid) -{ - struct i40e_veb *veb; - int i; - - i40e_pf_for_each_veb(pf, i, veb) - if (veb->seid =3D=3D seid) - return veb; - - return NULL; + return i40e_pf_get_vsi_by_seid(pf, seid); } =20 /************************************************************** @@ -701,7 +677,7 @@ static void i40e_dbg_dump_veb_seid(struct i40e_pf *pf, = int seid) { struct i40e_veb *veb; =20 - veb =3D i40e_dbg_find_veb(pf, seid); + veb =3D i40e_pf_get_veb_by_seid(pf, seid); if (!veb) { dev_info(&pf->pdev->dev, "can't find veb %d\n", seid); return; @@ -853,7 +829,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp, =20 } else if (strncmp(cmd_buf, "add relay", 9) =3D=3D 0) { struct i40e_veb *veb; - int uplink_seid, i; + int uplink_seid; =20 cnt =3D sscanf(&cmd_buf[9], "%i %i", &uplink_seid, &vsi_seid); if (cnt !=3D 2) { @@ -875,12 +851,8 @@ static ssize_t i40e_dbg_command_write(struct file *fil= p, goto command_write_done; } =20 - i40e_pf_for_each_veb(pf, i, veb) - if (veb->seid =3D=3D uplink_seid) - break; - - if (i >=3D I40E_MAX_VEB && uplink_seid !=3D 0 && - uplink_seid !=3D pf->mac_seid) { + veb =3D i40e_pf_get_veb_by_seid(pf, uplink_seid); + if (!veb && uplink_seid !=3D 0 && uplink_seid !=3D pf->mac_seid) { dev_info(&pf->pdev->dev, "add relay: relay uplink %d not found\n", uplink_seid); diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethe= rnet/intel/i40e/i40e_main.c index c410fc31a051..935c2460f060 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -13120,18 +13120,14 @@ static int i40e_ndo_bridge_setlink(struct net_dev= ice *dev, struct i40e_pf *pf =3D vsi->back; struct nlattr *attr, *br_spec; struct i40e_veb *veb; - int i, rem; + int rem; =20 /* Only for PF VSI for now */ if (vsi->seid !=3D pf->vsi[pf->lan_vsi]->seid) return -EOPNOTSUPP; =20 /* Find the HW bridge for PF VSI */ - i40e_pf_for_each_veb(pf, i, veb) - if (veb->seid =3D=3D vsi->uplink_seid) - break; - if (i =3D=3D I40E_MAX_VEB) - veb =3D NULL; /* No VEB found */ + veb =3D i40e_pf_get_veb_by_seid(pf, vsi->uplink_seid); =20 br_spec =3D nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC); if (!br_spec) @@ -13196,18 +13192,15 @@ static int i40e_ndo_bridge_getlink(struct sk_buff= *skb, u32 pid, u32 seq, struct i40e_netdev_priv *np =3D netdev_priv(dev); struct i40e_vsi *vsi =3D np->vsi; struct i40e_pf *pf =3D vsi->back; - struct i40e_veb *veb =3D NULL; - int i; + struct i40e_veb *veb; =20 /* Only for PF VSI for now */ if (vsi->seid !=3D pf->vsi[pf->lan_vsi]->seid) return -EOPNOTSUPP; =20 /* Find the HW bridge for the PF VSI */ - i40e_pf_for_each_veb(pf, i, veb) - if (veb->seid =3D=3D vsi->uplink_seid) - break; - if (i =3D=3D I40E_MAX_VEB) + veb =3D i40e_pf_get_veb_by_seid(pf, vsi->uplink_seid); + if (!veb) return 0; =20 return ndo_dflt_bridge_getlink(skb, pid, seq, dev, veb->bridge_mode, @@ -14382,8 +14375,8 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf,= u8 type, struct i40e_vsi *vsi =3D NULL; struct i40e_veb *veb =3D NULL; u16 alloc_queue_pairs; - int ret, i; int v_idx; + int ret; =20 /* The requested uplink_seid must be either * - the PF's port seid @@ -14398,18 +14391,10 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *p= f, u8 type, * * Find which uplink_seid we were given and create a new VEB if needed */ - i40e_pf_for_each_veb(pf, i, veb) - if (veb->seid =3D=3D uplink_seid) - break; - if (i =3D=3D I40E_MAX_VEB) - veb =3D NULL; - + veb =3D i40e_pf_get_veb_by_seid(pf, uplink_seid); if (!veb && uplink_seid !=3D pf->mac_seid) { - i40e_pf_for_each_vsi(pf, i, vsi) - if (vsi->seid =3D=3D uplink_seid) - break; - - if (i =3D=3D pf->num_alloc_vsi) { + vsi =3D i40e_pf_get_vsi_by_seid(pf, uplink_seid); + if (!vsi) { dev_info(&pf->pdev->dev, "no such uplink_seid %d\n", uplink_seid); return NULL; @@ -14437,10 +14422,8 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf= , u8 type, } i40e_config_bridge_mode(veb); } - i40e_pf_for_each_veb(pf, i, veb) - if (veb->seid =3D=3D vsi->uplink_seid) - break; - if (i =3D=3D I40E_MAX_VEB) { + veb =3D i40e_pf_get_veb_by_seid(pf, vsi->uplink_seid); + if (!veb) { dev_info(&pf->pdev->dev, "couldn't add VEB\n"); return NULL; } @@ -14834,8 +14817,8 @@ struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf,= u16 flags, u8 enabled_tc) { struct i40e_veb *veb, *uplink_veb =3D NULL; - struct i40e_vsi *vsi; - int vsi_idx, veb_idx; + struct i40e_vsi *vsi =3D NULL; + int veb_idx; int ret; =20 /* if one seid is 0, the other must be 0 to create a floating relay */ @@ -14848,23 +14831,16 @@ struct i40e_veb *i40e_veb_setup(struct i40e_pf *p= f, u16 flags, } =20 /* make sure there is such a vsi and uplink */ - i40e_pf_for_each_vsi(pf, vsi_idx, vsi) - if (vsi->seid =3D=3D vsi_seid) - break; - - if (vsi_idx =3D=3D pf->num_alloc_vsi && vsi_seid !=3D 0) { - dev_info(&pf->pdev->dev, "vsi seid %d not found\n", - vsi_seid); - return NULL; + if (vsi_seid) { + vsi =3D i40e_pf_get_vsi_by_seid(pf, vsi_seid); + if (!vsi) { + dev_err(&pf->pdev->dev, "vsi seid %d not found\n", + vsi_seid); + return NULL; + } } - if (uplink_seid && uplink_seid !=3D pf->mac_seid) { - i40e_pf_for_each_veb(pf, veb_idx, veb) { - if (veb->seid =3D=3D uplink_seid) { - uplink_veb =3D veb; - break; - } - } + uplink_veb =3D i40e_pf_get_veb_by_seid(pf, uplink_seid); if (!uplink_veb) { dev_info(&pf->pdev->dev, "uplink seid %d not found\n", uplink_seid); @@ -14886,7 +14862,8 @@ struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf,= u16 flags, ret =3D i40e_add_veb(veb, vsi); if (ret) goto err_veb; - if (vsi_idx =3D=3D pf->lan_vsi) + + if (vsi && vsi->idx =3D=3D pf->lan_vsi) pf->lan_veb =3D veb->idx; =20 return veb; @@ -14933,13 +14910,10 @@ static void i40e_setup_pf_switch_element(struct i= 40e_pf *pf, int v; =20 /* find existing or else empty VEB */ - i40e_pf_for_each_veb(pf, v, veb) - if (veb->seid =3D=3D seid) { - pf->lan_veb =3D v; - break; - } - - if (pf->lan_veb >=3D I40E_MAX_VEB) { + veb =3D i40e_pf_get_veb_by_seid(pf, seid); + if (veb) { + pf->lan_veb =3D veb->idx; + } else { v =3D i40e_veb_mem_alloc(pf); if (v < 0) break; --=20 2.41.0