Re: [PATCH iwl-next 3/5] i40e: Add helpers to find VSI and VEB by SEID and use them

From: Wojciech Drewek
Date: Mon Nov 13 2023 - 08:27:44 EST

Next message: Conor Dooley: "Re: [PATCH 1/2] riscv: dts: cv1800b: add pinctrl node for cv1800b"
Previous message: Andrew Lunn: "Re: [PATCH net-next 3/3] net: ethernet: am65-cpsw: Error out if Enable TX/RX channel fails"
In reply to: Ivan Vecera: "[PATCH iwl-next 3/5] i40e: Add helpers to find VSI and VEB by SEID and use them"
Next in thread: Ivan Vecera: "Re: [PATCH iwl-next 3/5] i40e: Add helpers to find VSI and VEB by SEID and use them"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On 13.11.2023 13:58, Ivan Vecera wrote:
> 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.
>
> Signed-off-by: Ivan Vecera <ivecera@xxxxxxxxxx>
> ---

Only one nit
Reviewed-by: Wojciech Drewek <wojciech.drewek@xxxxxxxxx>

> drivers/net/ethernet/intel/i40e/i40e.h | 34 +++++++++
> .../net/ethernet/intel/i40e/i40e_debugfs.c | 38 ++--------
> drivers/net/ethernet/intel/i40e/i40e_main.c | 76 ++++++-------------
> 3 files changed, 64 insertions(+), 84 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
> index 1e9266de270b..220b5ce31519 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e.h
> @@ -1360,4 +1360,38 @@ static inline struct i40e_pf *i40e_hw_to_pf(struct i40e_hw *hw)
>
> struct device *i40e_hw_to_dev(struct i40e_hw *hw);
>
> +/**
> + * i40e_vsi_get_by_seid - find VSI by SEID
> + * @pf: pointer to a PF
> + **/
> +static inline struct i40e_vsi *
> +i40e_vsi_get_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 == seid)
> + return vsi;
> +
> + return NULL;
> +}
> +
> +/**
> + * i40e_veb_get_by_seid - find VEB by SEID
> + * @pf: pointer to a PF
> + **/
> +static inline struct i40e_veb *
> +i40e_veb_get_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 == seid)
> + return veb;
> +
> + return NULL;
> +}

I would prefer i40e_get_{veb|vsi}_by_seid but it's my opinion.

> +
> #endif /* _I40E_H_ */
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
> index b236b0f93202..d26348db125f 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);
>
> return NULL;
> }
>
> - i40e_pf_for_each_vsi(pf, i, vsi)
> - if (vsi->seid == 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 == seid)
> - return veb;
> -
> - return NULL;
> + return i40e_vsi_get_by_seid(pf, seid);
> }
>
> /**************************************************************
> @@ -701,7 +677,7 @@ static void i40e_dbg_dump_veb_seid(struct i40e_pf *pf, int seid)
> {
> struct i40e_veb *veb;
>
> - veb = i40e_dbg_find_veb(pf, seid);
> + veb = i40e_veb_get_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,
>
> } else if (strncmp(cmd_buf, "add relay", 9) == 0) {
> struct i40e_veb *veb;
> - int uplink_seid, i;
> + int uplink_seid;
>
> cnt = sscanf(&cmd_buf[9], "%i %i", &uplink_seid, &vsi_seid);
> if (cnt != 2) {
> @@ -875,12 +851,8 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
> goto command_write_done;
> }
>
> - i40e_pf_for_each_veb(pf, i, veb)
> - if (veb->seid == uplink_seid)
> - break;
> -
> - if (i >= I40E_MAX_VEB && uplink_seid != 0 &&
> - uplink_seid != pf->mac_seid) {
> + veb = i40e_veb_get_by_seid(pf, uplink_seid);
> + if (!veb && uplink_seid != 0 && uplink_seid != 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/ethernet/intel/i40e/i40e_main.c
> index c410fc31a051..e7be145f298a 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_device *dev,
> struct i40e_pf *pf = vsi->back;
> struct nlattr *attr, *br_spec;
> struct i40e_veb *veb;
> - int i, rem;
> + int rem;
>
> /* Only for PF VSI for now */
> if (vsi->seid != pf->vsi[pf->lan_vsi]->seid)
> return -EOPNOTSUPP;
>
> /* Find the HW bridge for PF VSI */
> - i40e_pf_for_each_veb(pf, i, veb)
> - if (veb->seid == vsi->uplink_seid)
> - break;
> - if (i == I40E_MAX_VEB)
> - veb = NULL; /* No VEB found */
> + veb = i40e_veb_get_by_seid(pf, vsi->uplink_seid);
>
> br_spec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);
> if (!br_spec)
> @@ -13197,17 +13193,14 @@ static int i40e_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
> struct i40e_vsi *vsi = np->vsi;
> struct i40e_pf *pf = vsi->back;
> struct i40e_veb *veb = NULL;
> - int i;
>
> /* Only for PF VSI for now */
> if (vsi->seid != pf->vsi[pf->lan_vsi]->seid)
> return -EOPNOTSUPP;
>
> /* Find the HW bridge for the PF VSI */
> - i40e_pf_for_each_veb(pf, i, veb)
> - if (veb->seid == vsi->uplink_seid)
> - break;
> - if (i == I40E_MAX_VEB)
> + veb = i40e_veb_get_by_seid(pf, vsi->uplink_seid);
> + if (!vsi)
> return 0;
>
> 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 = NULL;
> struct i40e_veb *veb = NULL;
> u16 alloc_queue_pairs;
> - int ret, i;
> int v_idx;
> + int ret;
>
> /* 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 *pf, 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 == uplink_seid)
> - break;
> - if (i == I40E_MAX_VEB)
> - veb = NULL;
> -
> + veb = i40e_veb_get_by_seid(pf, uplink_seid);
> if (!veb && uplink_seid != pf->mac_seid) {
> - i40e_pf_for_each_vsi(pf, i, vsi)
> - if (vsi->seid == uplink_seid)
> - break;
> -
> - if (i == pf->num_alloc_vsi) {
> + vsi = i40e_vsi_get_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 == vsi->uplink_seid)
> - break;
> - if (i == I40E_MAX_VEB) {
> + veb = i40e_veb_get_by_seid(pf, vsi->uplink_seid);
> + if (!veb) {
> dev_info(&pf->pdev->dev, "couldn't add VEB\n");
> return NULL;
> }
> @@ -14835,7 +14818,7 @@ struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags,
> {
> struct i40e_veb *veb, *uplink_veb = NULL;
> struct i40e_vsi *vsi;
> - int vsi_idx, veb_idx;
> + int veb_idx;
> int ret;
>
> /* 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 *pf, u16 flags,
> }
>
> /* make sure there is such a vsi and uplink */
> - i40e_pf_for_each_vsi(pf, vsi_idx, vsi)
> - if (vsi->seid == vsi_seid)
> - break;
> -
> - if (vsi_idx == pf->num_alloc_vsi && vsi_seid != 0) {
> - dev_info(&pf->pdev->dev, "vsi seid %d not found\n",
> - vsi_seid);
> - return NULL;
> + if (vsi_seid) {
> + vsi = i40e_vsi_get_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 != pf->mac_seid) {
> - i40e_pf_for_each_veb(pf, veb_idx, veb) {
> - if (veb->seid == uplink_seid) {
> - uplink_veb = veb;
> - break;
> - }
> - }
> + uplink_veb = i40e_veb_get_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 = i40e_add_veb(veb, vsi);
> if (ret)
> goto err_veb;
> - if (vsi_idx == pf->lan_vsi)
> +
> + if (vsi && vsi->idx == pf->lan_vsi)
> pf->lan_veb = veb->idx;
>
> return veb;
> @@ -14933,13 +14910,10 @@ static void i40e_setup_pf_switch_element(struct i40e_pf *pf,
> int v;
>
> /* find existing or else empty VEB */
> - i40e_pf_for_each_veb(pf, v, veb)
> - if (veb->seid == seid) {
> - pf->lan_veb = v;
> - break;
> - }
> -
> - if (pf->lan_veb >= I40E_MAX_VEB) {
> + veb = i40e_veb_get_by_seid(pf, seid);
> + if (veb) {
> + pf->lan_veb = veb->idx;
> + } else {
> v = i40e_veb_mem_alloc(pf);
> if (v < 0)
> break;

Next message: Conor Dooley: "Re: [PATCH 1/2] riscv: dts: cv1800b: add pinctrl node for cv1800b"
Previous message: Andrew Lunn: "Re: [PATCH net-next 3/3] net: ethernet: am65-cpsw: Error out if Enable TX/RX channel fails"
In reply to: Ivan Vecera: "[PATCH iwl-next 3/5] i40e: Add helpers to find VSI and VEB by SEID and use them"
Next in thread: Ivan Vecera: "Re: [PATCH iwl-next 3/5] i40e: Add helpers to find VSI and VEB by SEID and use them"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]