From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BC721A0A02; Sat, 27 Mar 2021 15:30:06 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3BF9240692; Sat, 27 Mar 2021 15:30:06 +0100 (CET) Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) by mails.dpdk.org (Postfix) with ESMTP id 1D94140686 for ; Sat, 27 Mar 2021 15:30:05 +0100 (CET) Received: by mail-io1-f46.google.com with SMTP id b10so8346579iot.4 for ; Sat, 27 Mar 2021 07:30:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=fDTSUcpvRvwXglHWmSDVMbzkyTmuN4tp74mXzjMIjEE=; b=tPP3rYu/DOx2Zf4kVQmfu0fkzrwN6FVW5YiRzhUHEfIFYi2gVmSQX3p4yR2rwisZ2x sPWSezm9CTT71rUHulYQA9ed8h8fKAngdeGZasBbG6gGMBW6ri9q+MSFC/FPrP70BV5t h70j8vWsz76xPiKJCt0rTk2Bukq8hRfEIeR9p8Bzdodws25FjFmSAvaEjvmmU6+8C1Jm C53dGrGXl5hon5FuZ5q0IygAR5xQ3BQpZ64GD+Inq0RjwH39gfNqKZAAI/bqNdZgN1Lb gIyctbm8EZIQJ+oW7+cC+UbbiOwfd8hN/jY4EDAgZvh4BCGKJAnMUkAluzHWbcA5rtQ8 fSrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=fDTSUcpvRvwXglHWmSDVMbzkyTmuN4tp74mXzjMIjEE=; b=Pv6CK5oj01VK4aT6ekIHJxaYc8z9qTiuxWQayRzL8NOuDmx3cc/jf/yoGSTXjQifK3 8t9T76IYb5UXEwjXr29CkUS3UopTdOg57Pm+DrY9c4sGgRiLXi54m4D3mpM+QMm3OSUq 8cCSAyg7oYdp9U4sWMe4Cu6Keh+gDPB3xpwTw+z7GKbekMhzpQNPGrVp31tWClNi6ocT lAZNY4WmLaeOwMOTbkok6utGRnW+0/vKwKeU3fd0RgEuWoGEPRYUUKe2mVDct+L8Ix8L +ixRxSh20VyBo0bYUKUSKEBCo2KICSjfDF+Hbdj2ZIvitXGuUlFPw6nYkSg4bsde0JrH ilXA== X-Gm-Message-State: AOAM533XlIIen93yrbiYiJixMLUq+TAaVtWeWYtX0UGGsYDxJTHaR9/j cxxnQCMcdXZXxAMkHq8QfNq3XgejluhCvN7kMuM= X-Google-Smtp-Source: ABdhPJyltdfnSZxpX7FTyIPJQg0bJjaWwqaI5Gb/3lqgT9hWT68uNwZkU4gAOQQi2d+lwovTfrqhiQaTgLoi9grZs6E= X-Received: by 2002:a5d:9e03:: with SMTP id h3mr14406138ioh.94.1616855404341; Sat, 27 Mar 2021 07:30:04 -0700 (PDT) MIME-Version: 1.0 References: <20210325160321.22016-1-smadarf@marvell.com> In-Reply-To: <20210325160321.22016-1-smadarf@marvell.com> From: Jerin Jacob Date: Sat, 27 Mar 2021 19:59:48 +0530 Message-ID: To: smadarf@marvell.com, Ferruh Yigit Cc: Jerin Jacob , Liron Himi , Guy Kaneti , dpdk-dev Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH v1] net/octeontx2: support flow action port id X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Fri, Mar 26, 2021 at 3:18 PM wrote: > > From: Smadar Fuks > > Action port_id was not supported until now. > In this patch the action port_id supports passing from input > port PF to output port which is one of input port respective VF > > Signed-off-by: Smadar Fuks Acked-by: Jerin Jacob Applied to dpdk-next-net-mrvl/for-main. Thanks > --- > doc/guides/nics/octeontx2.rst | 6 +++ > drivers/net/octeontx2/otx2_ethdev.c | 6 +-- > drivers/net/octeontx2/otx2_ethdev.h | 5 +++ > drivers/net/octeontx2/otx2_ethdev_devargs.c | 2 +- > drivers/net/octeontx2/otx2_flow_parse.c | 47 ++++++++++++++++++++- > 5 files changed, 61 insertions(+), 5 deletions(-) > > diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst > index cca7f7fc7..258c1693f 100644 > --- a/doc/guides/nics/octeontx2.rst > +++ b/doc/guides/nics/octeontx2.rst > @@ -401,6 +401,12 @@ Actions: > +----+-----------------------------------------+ > | 11 | RTE_FLOW_ACTION_TYPE_OF_POP_VLAN | > +----+-----------------------------------------+ > + | 12 | RTE_FLOW_ACTION_TYPE_PORT_ID | > + +----+-----------------------------------------+ > + > +.. note:: > + > + ``RTE_FLOW_ACTION_TYPE_PORT_ID`` is only supported between PF and its VFs. > > .. _table_octeontx2_supported_egress_action_types: > > diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c > index 389b66d03..4f95917e7 100644 > --- a/drivers/net/octeontx2/otx2_ethdev.c > +++ b/drivers/net/octeontx2/otx2_ethdev.c > @@ -2802,6 +2802,6 @@ static struct rte_pci_driver pci_nix = { > .remove = nix_remove, > }; > > -RTE_PMD_REGISTER_PCI(net_octeontx2, pci_nix); > -RTE_PMD_REGISTER_PCI_TABLE(net_octeontx2, pci_nix_map); > -RTE_PMD_REGISTER_KMOD_DEP(net_octeontx2, "vfio-pci"); > +RTE_PMD_REGISTER_PCI(OCTEONTX2_PMD, pci_nix); > +RTE_PMD_REGISTER_PCI_TABLE(OCTEONTX2_PMD, pci_nix_map); > +RTE_PMD_REGISTER_KMOD_DEP(OCTEONTX2_PMD, "vfio-pci"); > diff --git a/drivers/net/octeontx2/otx2_ethdev.h b/drivers/net/octeontx2/otx2_ethdev.h > index 99f0469d8..5a9dc9be0 100644 > --- a/drivers/net/octeontx2/otx2_ethdev.h > +++ b/drivers/net/octeontx2/otx2_ethdev.h > @@ -164,6 +164,11 @@ > /* Additional timesync values. */ > #define OTX2_CYCLECOUNTER_MASK 0xffffffffffffffffULL > > +#define OCTEONTX2_PMD net_octeontx2 > + > +#define otx2_ethdev_is_same_driver(dev) \ > + (strcmp((dev)->device->driver->name, RTE_STR(OCTEONTX2_PMD)) == 0) > + > enum nix_q_size_e { > nix_q_size_16, /* 16 entries */ > nix_q_size_64, /* 64 entries */ > diff --git a/drivers/net/octeontx2/otx2_ethdev_devargs.c b/drivers/net/octeontx2/otx2_ethdev_devargs.c > index 8d9feb3a8..83f905315 100644 > --- a/drivers/net/octeontx2/otx2_ethdev_devargs.c > +++ b/drivers/net/octeontx2/otx2_ethdev_devargs.c > @@ -201,7 +201,7 @@ otx2_ethdev_parse_devargs(struct rte_devargs *devargs, struct otx2_eth_dev *dev) > return -EINVAL; > } > > -RTE_PMD_REGISTER_PARAM_STRING(net_octeontx2, > +RTE_PMD_REGISTER_PARAM_STRING(OCTEONTX2_PMD, > OTX2_RSS_RETA_SIZE "=<64|128|256>" > OTX2_IPSEC_IN_MAX_SPI "=<1-65535>" > OTX2_SCL_ENABLE "=1" > diff --git a/drivers/net/octeontx2/otx2_flow_parse.c b/drivers/net/octeontx2/otx2_flow_parse.c > index bbb845811..63a33142a 100644 > --- a/drivers/net/octeontx2/otx2_flow_parse.c > +++ b/drivers/net/octeontx2/otx2_flow_parse.c > @@ -900,14 +900,17 @@ otx2_flow_parse_actions(struct rte_eth_dev *dev, > { > struct otx2_eth_dev *hw = dev->data->dev_private; > struct otx2_npc_flow_info *npc = &hw->npc_flow; > + const struct rte_flow_action_port_id *port_act; > const struct rte_flow_action_count *act_count; > const struct rte_flow_action_mark *act_mark; > const struct rte_flow_action_queue *act_q; > const struct rte_flow_action_vf *vf_act; > + uint16_t pf_func, vf_id, port_id, pf_id; > + char if_name[RTE_ETH_NAME_MAX_LEN]; > bool vlan_insert_action = false; > + struct rte_eth_dev *eth_dev; > const char *errmsg = NULL; > int sel_act, req_act = 0; > - uint16_t pf_func, vf_id; > int errcode = 0; > int mark = 0; > int rq = 0; > @@ -983,6 +986,48 @@ otx2_flow_parse_actions(struct rte_eth_dev *dev, > } > break; > > + case RTE_FLOW_ACTION_TYPE_PORT_ID: > + port_act = (const struct rte_flow_action_port_id *) > + actions->conf; > + port_id = port_act->id; > + if (rte_eth_dev_get_name_by_port(port_id, if_name)) { > + errmsg = "Name not found for output port id"; > + errcode = EINVAL; > + goto err_exit; > + } > + eth_dev = rte_eth_dev_allocated(if_name); > + if (!eth_dev) { > + errmsg = "eth_dev not found for output port id"; > + errcode = EINVAL; > + goto err_exit; > + } > + if (!otx2_ethdev_is_same_driver(eth_dev)) { > + errmsg = "Output port id unsupported type"; > + errcode = ENOTSUP; > + goto err_exit; > + } > + if (!otx2_dev_is_vf(otx2_eth_pmd_priv(eth_dev))) { > + errmsg = "Output port should be VF"; > + errcode = ENOTSUP; > + goto err_exit; > + } > + vf_id = otx2_eth_pmd_priv(eth_dev)->vf; > + if (vf_id >= hw->maxvf) { > + errmsg = "Invalid vf for output port"; > + errcode = EINVAL; > + goto err_exit; > + } > + pf_id = otx2_eth_pmd_priv(eth_dev)->pf; > + if (pf_id != hw->pf) { > + errmsg = "Output port unsupported PF"; > + errcode = ENOTSUP; > + goto err_exit; > + } > + pf_func &= (0xfc00); > + pf_func = (pf_func | (vf_id + 1)); > + req_act |= OTX2_FLOW_ACT_VF; > + break; > + > case RTE_FLOW_ACTION_TYPE_QUEUE: > /* Applicable only to ingress flow */ > act_q = (const struct rte_flow_action_queue *) > -- > 2.27.0 >