[dpdk-dev,v2,1/2] i40evf: allocate virtchnl cmd buffer for each vf
Commit Message
Currently, i40evf PMD uses a global static buffer to send virtchnl
command to host driver. It is shared by multi VFs.
This patch changed to allocate virtchnl cmd buffer for each VF.
Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
---
drivers/net/i40e/i40e_ethdev.h | 2 +
drivers/net/i40e/i40e_ethdev_vf.c | 181 +++++++++++++++-----------------------
2 files changed, 74 insertions(+), 109 deletions(-)
Comments
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Jingjing Wu
> Sent: Wednesday, January 27, 2016 9:50 AM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH v2 1/2] i40evf: allocate virtchnl cmd buffer for
> each vf
>
> Currently, i40evf PMD uses a global static buffer to send virtchnl command to
> host driver. It is shared by multi VFs.
> This patch changed to allocate virtchnl cmd buffer for each VF.
>
> Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
> ---
> drivers/net/i40e/i40e_ethdev.h | 2 +
> drivers/net/i40e/i40e_ethdev_vf.c | 181 +++++++++++++++-------------------
> ----
> 2 files changed, 74 insertions(+), 109 deletions(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev.h
> b/drivers/net/i40e/i40e_ethdev.h index 1f9792b..93122ad 100644
> --- a/drivers/net/i40e/i40e_ethdev.h
> +++ b/drivers/net/i40e/i40e_ethdev.h
> @@ -494,7 +494,9 @@ struct i40e_vf {
> bool link_up;
> bool vf_reset;
> volatile uint32_t pend_cmd; /* pending command not finished yet */
> + uint32_t cmd_retval; /* return value of the cmd response from PF */
> u16 pend_msg; /* flags indicates events from pf not handled yet */
> + uint8_t *aq_resp; /* buffer to store the adminq response from PF */
>
> /* VSI info */
> struct i40e_virtchnl_vf_resource *vf_res; /* All VSIs */ diff --git
> a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
> index 14d2a50..64e6957 100644
> --- a/drivers/net/i40e/i40e_ethdev_vf.c
> +++ b/drivers/net/i40e/i40e_ethdev_vf.c
> @@ -103,9 +103,6 @@ enum i40evf_aq_result {
> I40EVF_MSG_CMD, /* Read async command result */
> };
>
> -/* A share buffer to store the command result from PF driver */ -static
> uint8_t cmd_result_buffer[I40E_AQ_BUF_SZ];
> -
> static int i40evf_dev_configure(struct rte_eth_dev *dev); static int
> i40evf_dev_start(struct rte_eth_dev *dev); static void
> i40evf_dev_stop(struct rte_eth_dev *dev); @@ -237,31 +234,39 @@
> i40evf_set_mac_type(struct i40e_hw *hw) }
>
> /*
> - * Parse admin queue message.
> - *
> - * return value:
> - * < 0: meet error
> - * 0: read sys msg
> - * > 0: read cmd result
> + * Read data in admin queue to get msg from pf driver
> */
> static enum i40evf_aq_result
> -i40evf_parse_pfmsg(struct i40e_vf *vf,
> - struct i40e_arq_event_info *event,
> - struct i40evf_arq_msg_info *data)
> +i40evf_read_pfmsg(struct rte_eth_dev *dev, struct i40evf_arq_msg_info
> +*data)
> {
> - enum i40e_virtchnl_ops opcode = (enum i40e_virtchnl_ops)\
> - rte_le_to_cpu_32(event->desc.cookie_high);
> - enum i40e_status_code retval = (enum i40e_status_code)\
> - rte_le_to_cpu_32(event->desc.cookie_low);
> - enum i40evf_aq_result ret = I40EVF_MSG_CMD;
> + struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> + struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data-
> >dev_private);
> + struct i40e_arq_event_info event;
> + enum i40e_virtchnl_ops opcode;
> + enum i40e_status_code retval;
> + int ret;
> + enum i40evf_aq_result result = I40EVF_MSG_NON;
>
> + event.buf_len = data->buf_len;
> + event.msg_buf = data->msg;
> + ret = i40e_clean_arq_element(hw, &event, NULL);
> + /* Can't read any msg from adminQ */
> + if (ret) {
> + if (ret == I40E_ERR_ADMIN_QUEUE_NO_WORK)
> + result = I40EVF_MSG_NON;
> + else
> + result = I40EVF_MSG_ERR;
> + return result;
> + }
> +
> + opcode = (enum
> i40e_virtchnl_ops)rte_le_to_cpu_32(event.desc.cookie_high);
> + retval = (enum
> +i40e_status_code)rte_le_to_cpu_32(event.desc.cookie_low);
> /* pf sys event */
> if (opcode == I40E_VIRTCHNL_OP_EVENT) {
> struct i40e_virtchnl_pf_event *vpe =
> - (struct i40e_virtchnl_pf_event *)event->msg_buf;
> + (struct i40e_virtchnl_pf_event *)event.msg_buf;
>
> - /* Initialize ret to sys event */
> - ret = I40EVF_MSG_SYS;
> + result = I40EVF_MSG_SYS;
> switch (vpe->event) {
> case I40E_VIRTCHNL_EVENT_LINK_CHANGE:
> vf->link_up =
> @@ -286,74 +291,17 @@ i40evf_parse_pfmsg(struct i40e_vf *vf,
> }
> } else {
> /* async reply msg on command issued by vf previously */
> - ret = I40EVF_MSG_CMD;
> + result = I40EVF_MSG_CMD;
> /* Actual data length read from PF */
> - data->msg_len = event->msg_len;
> + data->msg_len = event.msg_len;
> }
> - /* fill the ops and result to notify VF */
> +
> data->result = retval;
> data->ops = opcode;
>
> - return ret;
> -}
> -
> -/*
> - * Read data in admin queue to get msg from pf driver
> - */
> -static enum i40evf_aq_result
> -i40evf_read_pfmsg(struct rte_eth_dev *dev, struct i40evf_arq_msg_info
> *data) -{
> - struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> - struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data-
> >dev_private);
> - struct i40e_arq_event_info event;
> - int ret;
> - enum i40evf_aq_result result = I40EVF_MSG_NON;
> -
> - event.buf_len = data->buf_len;
> - event.msg_buf = data->msg;
> - ret = i40e_clean_arq_element(hw, &event, NULL);
> - /* Can't read any msg from adminQ */
> - if (ret) {
> - if (ret == I40E_ERR_ADMIN_QUEUE_NO_WORK)
> - result = I40EVF_MSG_NON;
> - else
> - result = I40EVF_MSG_ERR;
> - return result;
> - }
> -
> - /* Parse the event */
> - result = i40evf_parse_pfmsg(vf, &event, data);
> -
> return result;
> }
>
> -/*
> - * Polling read until command result return from pf driver or meet error.
> - */
> -static int
> -i40evf_wait_cmd_done(struct rte_eth_dev *dev,
> - struct i40evf_arq_msg_info *data)
> -{
> - int i = 0;
> - enum i40evf_aq_result ret;
> -
> -#define MAX_TRY_TIMES 20
> -#define ASQ_DELAY_MS 100
> - do {
> - /* Delay some time first */
> - rte_delay_ms(ASQ_DELAY_MS);
> - ret = i40evf_read_pfmsg(dev, data);
> - if (ret == I40EVF_MSG_CMD)
> - return 0;
> - else if (ret == I40EVF_MSG_ERR)
> - return -1;
> -
> - /* If don't read msg or read sys event, continue */
> - } while(i++ < MAX_TRY_TIMES);
> -
> - return -1;
> -}
> -
> /**
> * clear current command. Only call in case execute
> * _atomic_set_cmd successfully.
> @@ -380,13 +328,18 @@ _atomic_set_cmd(struct i40e_vf *vf, enum
> i40e_virtchnl_ops ops)
> return !ret;
> }
>
> +#define MAX_TRY_TIMES 20
> +#define ASQ_DELAY_MS 100
> +
> static int
> i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info *args)
> {
> struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data-
> >dev_private);
> - int err = -1;
> struct i40evf_arq_msg_info info;
> + enum i40evf_aq_result ret;
> + int err = -1;
> + int i = 0;
>
> if (_atomic_set_cmd(vf, args->ops))
> return -1;
> @@ -404,19 +357,22 @@ i40evf_execute_vf_cmd(struct rte_eth_dev *dev,
> struct vf_cmd_info *args)
> return err;
> }
>
> - err = i40evf_wait_cmd_done(dev, &info);
> - /* read message and it's expected one */
> - if (!err && args->ops == info.ops)
> - _clear_cmd(vf);
> - else if (err) {
> - PMD_DRV_LOG(ERR, "Failed to read message from
> AdminQ");
> - _clear_cmd(vf);
> - }
> - else if (args->ops != info.ops)
> - PMD_DRV_LOG(ERR, "command mismatch, expect %u,
> get %u",
> - args->ops, info.ops);
> + do {
> + /* Delay some time first */
> + rte_delay_ms(ASQ_DELAY_MS);
> + ret = i40evf_read_pfmsg(dev, &info);
> + if (ret == I40EVF_MSG_CMD) {
> + err = 0;
> + break;
> + } else if (ret == I40EVF_MSG_ERR) {
> + err = -1;
> + break;
> + }
> + /* If don't read msg or read sys event, continue */
> + } while (i++ < MAX_TRY_TIMES);
> + _clear_cmd(vf);
>
> - return (err | info.result);
> + return (err | vf->cmd_retval);
> }
>
Why combine the i40evf_parse_pfmsg and i40evf_read_pfmsg into one function i40evf_read_pfmsg?
> -----Original Message-----
> From: Tao, Zhe
> Sent: Friday, January 29, 2016 3:28 PM
> To: Wu, Jingjing; dev@dpdk.org
> Subject: RE: [dpdk-dev] [PATCH v2 1/2] i40evf: allocate virtchnl cmd buffer
> for each vf
>
>
>
> > -----Original Message-----
> > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Jingjing Wu
> > Sent: Wednesday, January 27, 2016 9:50 AM
> > To: dev@dpdk.org
> > Subject: [dpdk-dev] [PATCH v2 1/2] i40evf: allocate virtchnl cmd
> > buffer for each vf
> >
> > Currently, i40evf PMD uses a global static buffer to send virtchnl
> > command to host driver. It is shared by multi VFs.
> > This patch changed to allocate virtchnl cmd buffer for each VF.
> >
> > Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
> > ---
> > drivers/net/i40e/i40e_ethdev.h | 2 +
> > drivers/net/i40e/i40e_ethdev_vf.c | 181
> > +++++++++++++++-------------------
> > ----
> > 2 files changed, 74 insertions(+), 109 deletions(-)
> >
> > diff --git a/drivers/net/i40e/i40e_ethdev.h
> > b/drivers/net/i40e/i40e_ethdev.h index 1f9792b..93122ad 100644
> > --- a/drivers/net/i40e/i40e_ethdev.h
> > +++ b/drivers/net/i40e/i40e_ethdev.h
> > @@ -494,7 +494,9 @@ struct i40e_vf {
> > bool link_up;
> > bool vf_reset;
> > volatile uint32_t pend_cmd; /* pending command not finished yet */
> > + uint32_t cmd_retval; /* return value of the cmd response from PF */
> > u16 pend_msg; /* flags indicates events from pf not handled yet */
> > + uint8_t *aq_resp; /* buffer to store the adminq response from PF */
> >
> > /* VSI info */
> > struct i40e_virtchnl_vf_resource *vf_res; /* All VSIs */ diff --git
> > a/drivers/net/i40e/i40e_ethdev_vf.c
> > b/drivers/net/i40e/i40e_ethdev_vf.c
> > index 14d2a50..64e6957 100644
> > --- a/drivers/net/i40e/i40e_ethdev_vf.c
> > +++ b/drivers/net/i40e/i40e_ethdev_vf.c
> > @@ -103,9 +103,6 @@ enum i40evf_aq_result {
> > I40EVF_MSG_CMD, /* Read async command result */
> > };
> >
> > -/* A share buffer to store the command result from PF driver */
> > -static uint8_t cmd_result_buffer[I40E_AQ_BUF_SZ];
> > -
> > static int i40evf_dev_configure(struct rte_eth_dev *dev); static int
> > i40evf_dev_start(struct rte_eth_dev *dev); static void
> > i40evf_dev_stop(struct rte_eth_dev *dev); @@ -237,31 +234,39 @@
> > i40evf_set_mac_type(struct i40e_hw *hw) }
> >
> > /*
> > - * Parse admin queue message.
> > - *
> > - * return value:
> > - * < 0: meet error
> > - * 0: read sys msg
> > - * > 0: read cmd result
> > + * Read data in admin queue to get msg from pf driver
> > */
> > static enum i40evf_aq_result
> > -i40evf_parse_pfmsg(struct i40e_vf *vf,
> > - struct i40e_arq_event_info *event,
> > - struct i40evf_arq_msg_info *data)
> > +i40evf_read_pfmsg(struct rte_eth_dev *dev, struct i40evf_arq_msg_info
> > +*data)
> > {
> > - enum i40e_virtchnl_ops opcode = (enum i40e_virtchnl_ops)\
> > - rte_le_to_cpu_32(event->desc.cookie_high);
> > - enum i40e_status_code retval = (enum i40e_status_code)\
> > - rte_le_to_cpu_32(event->desc.cookie_low);
> > - enum i40evf_aq_result ret = I40EVF_MSG_CMD;
> > + struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data-
> > >dev_private);
> > + struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data-
> > >dev_private);
> > + struct i40e_arq_event_info event;
> > + enum i40e_virtchnl_ops opcode;
> > + enum i40e_status_code retval;
> > + int ret;
> > + enum i40evf_aq_result result = I40EVF_MSG_NON;
> >
> > + event.buf_len = data->buf_len;
> > + event.msg_buf = data->msg;
> > + ret = i40e_clean_arq_element(hw, &event, NULL);
> > + /* Can't read any msg from adminQ */
> > + if (ret) {
> > + if (ret == I40E_ERR_ADMIN_QUEUE_NO_WORK)
> > + result = I40EVF_MSG_NON;
> > + else
> > + result = I40EVF_MSG_ERR;
> > + return result;
> > + }
> > +
> > + opcode = (enum
> > i40e_virtchnl_ops)rte_le_to_cpu_32(event.desc.cookie_high);
> > + retval = (enum
> > +i40e_status_code)rte_le_to_cpu_32(event.desc.cookie_low);
> > /* pf sys event */
> > if (opcode == I40E_VIRTCHNL_OP_EVENT) {
> > struct i40e_virtchnl_pf_event *vpe =
> > - (struct i40e_virtchnl_pf_event *)event->msg_buf;
> > + (struct i40e_virtchnl_pf_event *)event.msg_buf;
> >
> > - /* Initialize ret to sys event */
> > - ret = I40EVF_MSG_SYS;
> > + result = I40EVF_MSG_SYS;
> > switch (vpe->event) {
> > case I40E_VIRTCHNL_EVENT_LINK_CHANGE:
> > vf->link_up =
> > @@ -286,74 +291,17 @@ i40evf_parse_pfmsg(struct i40e_vf *vf,
> > }
> > } else {
> > /* async reply msg on command issued by vf previously */
> > - ret = I40EVF_MSG_CMD;
> > + result = I40EVF_MSG_CMD;
> > /* Actual data length read from PF */
> > - data->msg_len = event->msg_len;
> > + data->msg_len = event.msg_len;
> > }
> > - /* fill the ops and result to notify VF */
> > +
> > data->result = retval;
> > data->ops = opcode;
> >
> > - return ret;
> > -}
> > -
> > -/*
> > - * Read data in admin queue to get msg from pf driver
> > - */
> > -static enum i40evf_aq_result
> > -i40evf_read_pfmsg(struct rte_eth_dev *dev, struct i40evf_arq_msg_info
> > *data) -{
> > - struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data-
> > >dev_private);
> > - struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data-
> > >dev_private);
> > - struct i40e_arq_event_info event;
> > - int ret;
> > - enum i40evf_aq_result result = I40EVF_MSG_NON;
> > -
> > - event.buf_len = data->buf_len;
> > - event.msg_buf = data->msg;
> > - ret = i40e_clean_arq_element(hw, &event, NULL);
> > - /* Can't read any msg from adminQ */
> > - if (ret) {
> > - if (ret == I40E_ERR_ADMIN_QUEUE_NO_WORK)
> > - result = I40EVF_MSG_NON;
> > - else
> > - result = I40EVF_MSG_ERR;
> > - return result;
> > - }
> > -
> > - /* Parse the event */
> > - result = i40evf_parse_pfmsg(vf, &event, data);
> > -
> > return result;
> > }
> >
> > -/*
> > - * Polling read until command result return from pf driver or meet error.
> > - */
> > -static int
> > -i40evf_wait_cmd_done(struct rte_eth_dev *dev,
> > - struct i40evf_arq_msg_info *data)
> > -{
> > - int i = 0;
> > - enum i40evf_aq_result ret;
> > -
> > -#define MAX_TRY_TIMES 20
> > -#define ASQ_DELAY_MS 100
> > - do {
> > - /* Delay some time first */
> > - rte_delay_ms(ASQ_DELAY_MS);
> > - ret = i40evf_read_pfmsg(dev, data);
> > - if (ret == I40EVF_MSG_CMD)
> > - return 0;
> > - else if (ret == I40EVF_MSG_ERR)
> > - return -1;
> > -
> > - /* If don't read msg or read sys event, continue */
> > - } while(i++ < MAX_TRY_TIMES);
> > -
> > - return -1;
> > -}
> > -
> > /**
> > * clear current command. Only call in case execute
> > * _atomic_set_cmd successfully.
> > @@ -380,13 +328,18 @@ _atomic_set_cmd(struct i40e_vf *vf, enum
> > i40e_virtchnl_ops ops)
> > return !ret;
> > }
> >
> > +#define MAX_TRY_TIMES 20
> > +#define ASQ_DELAY_MS 100
> > +
> > static int
> > i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info
> > *args) {
> > struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data-
> > >dev_private);
> > struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data-
> > >dev_private);
> > - int err = -1;
> > struct i40evf_arq_msg_info info;
> > + enum i40evf_aq_result ret;
> > + int err = -1;
> > + int i = 0;
> >
> > if (_atomic_set_cmd(vf, args->ops))
> > return -1;
> > @@ -404,19 +357,22 @@ i40evf_execute_vf_cmd(struct rte_eth_dev *dev,
> > struct vf_cmd_info *args)
> > return err;
> > }
> >
> > - err = i40evf_wait_cmd_done(dev, &info);
> > - /* read message and it's expected one */
> > - if (!err && args->ops == info.ops)
> > - _clear_cmd(vf);
> > - else if (err) {
> > - PMD_DRV_LOG(ERR, "Failed to read message from
> > AdminQ");
> > - _clear_cmd(vf);
> > - }
> > - else if (args->ops != info.ops)
> > - PMD_DRV_LOG(ERR, "command mismatch, expect %u,
> > get %u",
> > - args->ops, info.ops);
> > + do {
> > + /* Delay some time first */
> > + rte_delay_ms(ASQ_DELAY_MS);
> > + ret = i40evf_read_pfmsg(dev, &info);
> > + if (ret == I40EVF_MSG_CMD) {
> > + err = 0;
> > + break;
> > + } else if (ret == I40EVF_MSG_ERR) {
> > + err = -1;
> > + break;
> > + }
> > + /* If don't read msg or read sys event, continue */
> > + } while (i++ < MAX_TRY_TIMES);
> > + _clear_cmd(vf);
> >
> > - return (err | info.result);
> > + return (err | vf->cmd_retval);
> > }
> >
> Why combine the i40evf_parse_pfmsg and i40evf_read_pfmsg into one
> function i40evf_read_pfmsg?
Because what the i40evf_parse_pfmsg did is processing the pf event message, and
it is meaningless for checking whether the vf request message is done.
And the pf event message will be processed in i40evf_handle_pf_event which defined
in the next patch of the same patch set.
Thanks
Jingjing
> -----Original Message-----
> From: Wu, Jingjing
> Sent: Wednesday, January 27, 2016 9:50 AM
> To: dev@dpdk.org
> Cc: Wu, Jingjing; Zhang, Helin; Lu, Wenzhuo; Pei, Yulong
> Subject: [PATCH v2 1/2] i40evf: allocate virtchnl cmd buffer for each vf
>
> Currently, i40evf PMD uses a global static buffer to send virtchnl command to
> host driver. It is shared by multi VFs.
> This patch changed to allocate virtchnl cmd buffer for each VF.
>
> Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
> ---
> drivers/net/i40e/i40e_ethdev.h | 2 +
> drivers/net/i40e/i40e_ethdev_vf.c | 181 +++++++++++++++-------------------
> ----
> 2 files changed, 74 insertions(+), 109 deletions(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev.h
> b/drivers/net/i40e/i40e_ethdev.h index 1f9792b..93122ad 100644
> --- a/drivers/net/i40e/i40e_ethdev.h
> +++ b/drivers/net/i40e/i40e_ethdev.h
> @@ -494,7 +494,9 @@ struct i40e_vf {
> bool link_up;
> bool vf_reset;
> volatile uint32_t pend_cmd; /* pending command not finished yet */
> + uint32_t cmd_retval; /* return value of the cmd response from PF */
> u16 pend_msg; /* flags indicates events from pf not handled yet */
> + uint8_t *aq_resp; /* buffer to store the adminq response from PF */
>
> /* VSI info */
> struct i40e_virtchnl_vf_resource *vf_res; /* All VSIs */ diff --git
> a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
> index 14d2a50..64e6957 100644
> --- a/drivers/net/i40e/i40e_ethdev_vf.c
> +++ b/drivers/net/i40e/i40e_ethdev_vf.c
> @@ -103,9 +103,6 @@ enum i40evf_aq_result {
> I40EVF_MSG_CMD, /* Read async command result */
> };
>
> -/* A share buffer to store the command result from PF driver */ -static
> uint8_t cmd_result_buffer[I40E_AQ_BUF_SZ];
> -
> static int i40evf_dev_configure(struct rte_eth_dev *dev); static int
> i40evf_dev_start(struct rte_eth_dev *dev); static void
> i40evf_dev_stop(struct rte_eth_dev *dev); @@ -237,31 +234,39 @@
> i40evf_set_mac_type(struct i40e_hw *hw) }
>
> /*
> - * Parse admin queue message.
> - *
> - * return value:
> - * < 0: meet error
> - * 0: read sys msg
> - * > 0: read cmd result
> + * Read data in admin queue to get msg from pf driver
> */
> static enum i40evf_aq_result
> -i40evf_parse_pfmsg(struct i40e_vf *vf,
> - struct i40e_arq_event_info *event,
> - struct i40evf_arq_msg_info *data)
> +i40evf_read_pfmsg(struct rte_eth_dev *dev, struct i40evf_arq_msg_info
> +*data)
> {
> - enum i40e_virtchnl_ops opcode = (enum i40e_virtchnl_ops)\
> - rte_le_to_cpu_32(event->desc.cookie_high);
> - enum i40e_status_code retval = (enum i40e_status_code)\
> - rte_le_to_cpu_32(event->desc.cookie_low);
> - enum i40evf_aq_result ret = I40EVF_MSG_CMD;
> + struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> + struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data-
> >dev_private);
> + struct i40e_arq_event_info event;
> + enum i40e_virtchnl_ops opcode;
> + enum i40e_status_code retval;
> + int ret;
> + enum i40evf_aq_result result = I40EVF_MSG_NON;
>
> + event.buf_len = data->buf_len;
> + event.msg_buf = data->msg;
> + ret = i40e_clean_arq_element(hw, &event, NULL);
> + /* Can't read any msg from adminQ */
> + if (ret) {
> + if (ret == I40E_ERR_ADMIN_QUEUE_NO_WORK)
> + result = I40EVF_MSG_NON;
No need to assign I40EVF_MSG_NON, as it was initialized at first.
> + else
> + result = I40EVF_MSG_ERR;
> + return result;
> + }
> +
> + opcode = (enum
> i40e_virtchnl_ops)rte_le_to_cpu_32(event.desc.cookie_high);
> + retval = (enum
> +i40e_status_code)rte_le_to_cpu_32(event.desc.cookie_low);
> /* pf sys event */
> if (opcode == I40E_VIRTCHNL_OP_EVENT) {
> struct i40e_virtchnl_pf_event *vpe =
> - (struct i40e_virtchnl_pf_event *)event->msg_buf;
> + (struct i40e_virtchnl_pf_event *)event.msg_buf;
>
> - /* Initialize ret to sys event */
> - ret = I40EVF_MSG_SYS;
> + result = I40EVF_MSG_SYS;
> switch (vpe->event) {
> case I40E_VIRTCHNL_EVENT_LINK_CHANGE:
> vf->link_up =
> @@ -286,74 +291,17 @@ i40evf_parse_pfmsg(struct i40e_vf *vf,
> }
> } else {
> /* async reply msg on command issued by vf previously */
> - ret = I40EVF_MSG_CMD;
> + result = I40EVF_MSG_CMD;
> /* Actual data length read from PF */
> - data->msg_len = event->msg_len;
> + data->msg_len = event.msg_len;
> }
> - /* fill the ops and result to notify VF */
> +
> data->result = retval;
> data->ops = opcode;
>
> - return ret;
> -}
> -
> -/*
> - * Read data in admin queue to get msg from pf driver
> - */
> -static enum i40evf_aq_result
> -i40evf_read_pfmsg(struct rte_eth_dev *dev, struct i40evf_arq_msg_info
> *data) -{
> - struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> - struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data-
> >dev_private);
> - struct i40e_arq_event_info event;
> - int ret;
> - enum i40evf_aq_result result = I40EVF_MSG_NON;
> -
> - event.buf_len = data->buf_len;
> - event.msg_buf = data->msg;
> - ret = i40e_clean_arq_element(hw, &event, NULL);
> - /* Can't read any msg from adminQ */
> - if (ret) {
> - if (ret == I40E_ERR_ADMIN_QUEUE_NO_WORK)
> - result = I40EVF_MSG_NON;
> - else
> - result = I40EVF_MSG_ERR;
> - return result;
> - }
> -
> - /* Parse the event */
> - result = i40evf_parse_pfmsg(vf, &event, data);
> -
> return result;
> }
>
> -/*
> - * Polling read until command result return from pf driver or meet error.
> - */
> -static int
> -i40evf_wait_cmd_done(struct rte_eth_dev *dev,
> - struct i40evf_arq_msg_info *data)
> -{
> - int i = 0;
> - enum i40evf_aq_result ret;
> -
> -#define MAX_TRY_TIMES 20
> -#define ASQ_DELAY_MS 100
> - do {
> - /* Delay some time first */
> - rte_delay_ms(ASQ_DELAY_MS);
> - ret = i40evf_read_pfmsg(dev, data);
> - if (ret == I40EVF_MSG_CMD)
> - return 0;
> - else if (ret == I40EVF_MSG_ERR)
> - return -1;
> -
> - /* If don't read msg or read sys event, continue */
> - } while(i++ < MAX_TRY_TIMES);
> -
> - return -1;
> -}
> -
> /**
> * clear current command. Only call in case execute
> * _atomic_set_cmd successfully.
> @@ -380,13 +328,18 @@ _atomic_set_cmd(struct i40e_vf *vf, enum
> i40e_virtchnl_ops ops)
> return !ret;
> }
>
> +#define MAX_TRY_TIMES 20
> +#define ASQ_DELAY_MS 100
> +
> static int
> i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info *args)
> {
> struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data-
> >dev_private);
> - int err = -1;
> struct i40evf_arq_msg_info info;
> + enum i40evf_aq_result ret;
> + int err = -1;
> + int i = 0;
>
> if (_atomic_set_cmd(vf, args->ops))
> return -1;
> @@ -404,19 +357,22 @@ i40evf_execute_vf_cmd(struct rte_eth_dev *dev,
> struct vf_cmd_info *args)
> return err;
> }
>
> - err = i40evf_wait_cmd_done(dev, &info);
> - /* read message and it's expected one */
> - if (!err && args->ops == info.ops)
> - _clear_cmd(vf);
> - else if (err) {
> - PMD_DRV_LOG(ERR, "Failed to read message from
> AdminQ");
> - _clear_cmd(vf);
> - }
> - else if (args->ops != info.ops)
> - PMD_DRV_LOG(ERR, "command mismatch, expect %u,
> get %u",
> - args->ops, info.ops);
> + do {
> + /* Delay some time first */
> + rte_delay_ms(ASQ_DELAY_MS);
It would be better to read first, but not delay first.
In addition, the value of ASG_DELAY_MS shouldn't be 100ms.
It is a bit too long, try 5ms or 10ms, or even shorter, and see if it is good.
I remember that there is a complaint here for the interval.
Note that if ASG_DELAY_MS changed, MAX_TRY_TIMES should also be modified.
> + ret = i40evf_read_pfmsg(dev, &info);
> + if (ret == I40EVF_MSG_CMD) {
> + err = 0;
> + break;
> + } else if (ret == I40EVF_MSG_ERR) {
> + err = -1;
> + break;
> + }
> + /* If don't read msg or read sys event, continue */
> + } while (i++ < MAX_TRY_TIMES);
> + _clear_cmd(vf);
>
> - return (err | info.result);
> + return (err | vf->cmd_retval);
> }
>
> /*
@@ -494,7 +494,9 @@ struct i40e_vf {
bool link_up;
bool vf_reset;
volatile uint32_t pend_cmd; /* pending command not finished yet */
+ uint32_t cmd_retval; /* return value of the cmd response from PF */
u16 pend_msg; /* flags indicates events from pf not handled yet */
+ uint8_t *aq_resp; /* buffer to store the adminq response from PF */
/* VSI info */
struct i40e_virtchnl_vf_resource *vf_res; /* All VSIs */
@@ -103,9 +103,6 @@ enum i40evf_aq_result {
I40EVF_MSG_CMD, /* Read async command result */
};
-/* A share buffer to store the command result from PF driver */
-static uint8_t cmd_result_buffer[I40E_AQ_BUF_SZ];
-
static int i40evf_dev_configure(struct rte_eth_dev *dev);
static int i40evf_dev_start(struct rte_eth_dev *dev);
static void i40evf_dev_stop(struct rte_eth_dev *dev);
@@ -237,31 +234,39 @@ i40evf_set_mac_type(struct i40e_hw *hw)
}
/*
- * Parse admin queue message.
- *
- * return value:
- * < 0: meet error
- * 0: read sys msg
- * > 0: read cmd result
+ * Read data in admin queue to get msg from pf driver
*/
static enum i40evf_aq_result
-i40evf_parse_pfmsg(struct i40e_vf *vf,
- struct i40e_arq_event_info *event,
- struct i40evf_arq_msg_info *data)
+i40evf_read_pfmsg(struct rte_eth_dev *dev, struct i40evf_arq_msg_info *data)
{
- enum i40e_virtchnl_ops opcode = (enum i40e_virtchnl_ops)\
- rte_le_to_cpu_32(event->desc.cookie_high);
- enum i40e_status_code retval = (enum i40e_status_code)\
- rte_le_to_cpu_32(event->desc.cookie_low);
- enum i40evf_aq_result ret = I40EVF_MSG_CMD;
+ struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
+ struct i40e_arq_event_info event;
+ enum i40e_virtchnl_ops opcode;
+ enum i40e_status_code retval;
+ int ret;
+ enum i40evf_aq_result result = I40EVF_MSG_NON;
+ event.buf_len = data->buf_len;
+ event.msg_buf = data->msg;
+ ret = i40e_clean_arq_element(hw, &event, NULL);
+ /* Can't read any msg from adminQ */
+ if (ret) {
+ if (ret == I40E_ERR_ADMIN_QUEUE_NO_WORK)
+ result = I40EVF_MSG_NON;
+ else
+ result = I40EVF_MSG_ERR;
+ return result;
+ }
+
+ opcode = (enum i40e_virtchnl_ops)rte_le_to_cpu_32(event.desc.cookie_high);
+ retval = (enum i40e_status_code)rte_le_to_cpu_32(event.desc.cookie_low);
/* pf sys event */
if (opcode == I40E_VIRTCHNL_OP_EVENT) {
struct i40e_virtchnl_pf_event *vpe =
- (struct i40e_virtchnl_pf_event *)event->msg_buf;
+ (struct i40e_virtchnl_pf_event *)event.msg_buf;
- /* Initialize ret to sys event */
- ret = I40EVF_MSG_SYS;
+ result = I40EVF_MSG_SYS;
switch (vpe->event) {
case I40E_VIRTCHNL_EVENT_LINK_CHANGE:
vf->link_up =
@@ -286,74 +291,17 @@ i40evf_parse_pfmsg(struct i40e_vf *vf,
}
} else {
/* async reply msg on command issued by vf previously */
- ret = I40EVF_MSG_CMD;
+ result = I40EVF_MSG_CMD;
/* Actual data length read from PF */
- data->msg_len = event->msg_len;
+ data->msg_len = event.msg_len;
}
- /* fill the ops and result to notify VF */
+
data->result = retval;
data->ops = opcode;
- return ret;
-}
-
-/*
- * Read data in admin queue to get msg from pf driver
- */
-static enum i40evf_aq_result
-i40evf_read_pfmsg(struct rte_eth_dev *dev, struct i40evf_arq_msg_info *data)
-{
- struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
- struct i40e_arq_event_info event;
- int ret;
- enum i40evf_aq_result result = I40EVF_MSG_NON;
-
- event.buf_len = data->buf_len;
- event.msg_buf = data->msg;
- ret = i40e_clean_arq_element(hw, &event, NULL);
- /* Can't read any msg from adminQ */
- if (ret) {
- if (ret == I40E_ERR_ADMIN_QUEUE_NO_WORK)
- result = I40EVF_MSG_NON;
- else
- result = I40EVF_MSG_ERR;
- return result;
- }
-
- /* Parse the event */
- result = i40evf_parse_pfmsg(vf, &event, data);
-
return result;
}
-/*
- * Polling read until command result return from pf driver or meet error.
- */
-static int
-i40evf_wait_cmd_done(struct rte_eth_dev *dev,
- struct i40evf_arq_msg_info *data)
-{
- int i = 0;
- enum i40evf_aq_result ret;
-
-#define MAX_TRY_TIMES 20
-#define ASQ_DELAY_MS 100
- do {
- /* Delay some time first */
- rte_delay_ms(ASQ_DELAY_MS);
- ret = i40evf_read_pfmsg(dev, data);
- if (ret == I40EVF_MSG_CMD)
- return 0;
- else if (ret == I40EVF_MSG_ERR)
- return -1;
-
- /* If don't read msg or read sys event, continue */
- } while(i++ < MAX_TRY_TIMES);
-
- return -1;
-}
-
/**
* clear current command. Only call in case execute
* _atomic_set_cmd successfully.
@@ -380,13 +328,18 @@ _atomic_set_cmd(struct i40e_vf *vf, enum i40e_virtchnl_ops ops)
return !ret;
}
+#define MAX_TRY_TIMES 20
+#define ASQ_DELAY_MS 100
+
static int
i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info *args)
{
struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
- int err = -1;
struct i40evf_arq_msg_info info;
+ enum i40evf_aq_result ret;
+ int err = -1;
+ int i = 0;
if (_atomic_set_cmd(vf, args->ops))
return -1;
@@ -404,19 +357,22 @@ i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info *args)
return err;
}
- err = i40evf_wait_cmd_done(dev, &info);
- /* read message and it's expected one */
- if (!err && args->ops == info.ops)
- _clear_cmd(vf);
- else if (err) {
- PMD_DRV_LOG(ERR, "Failed to read message from AdminQ");
- _clear_cmd(vf);
- }
- else if (args->ops != info.ops)
- PMD_DRV_LOG(ERR, "command mismatch, expect %u, get %u",
- args->ops, info.ops);
+ do {
+ /* Delay some time first */
+ rte_delay_ms(ASQ_DELAY_MS);
+ ret = i40evf_read_pfmsg(dev, &info);
+ if (ret == I40EVF_MSG_CMD) {
+ err = 0;
+ break;
+ } else if (ret == I40EVF_MSG_ERR) {
+ err = -1;
+ break;
+ }
+ /* If don't read msg or read sys event, continue */
+ } while (i++ < MAX_TRY_TIMES);
+ _clear_cmd(vf);
- return (err | info.result);
+ return (err | vf->cmd_retval);
}
/*
@@ -436,7 +392,7 @@ i40evf_check_api_version(struct rte_eth_dev *dev)
args.ops = I40E_VIRTCHNL_OP_VERSION;
args.in_args = (uint8_t *)&version;
args.in_args_size = sizeof(version);
- args.out_buffer = cmd_result_buffer;
+ args.out_buffer = vf->aq_resp;
args.out_size = I40E_AQ_BUF_SZ;
err = i40evf_execute_vf_cmd(dev, &args);
@@ -474,7 +430,7 @@ i40evf_get_vf_resource(struct rte_eth_dev *dev)
uint32_t caps, len;
args.ops = I40E_VIRTCHNL_OP_GET_VF_RESOURCES;
- args.out_buffer = cmd_result_buffer;
+ args.out_buffer = vf->aq_resp;
args.out_size = I40E_AQ_BUF_SZ;
if (PF_IS_V11(vf)) {
caps = I40E_VIRTCHNL_VF_OFFLOAD_L2 |
@@ -527,7 +483,7 @@ i40evf_config_promisc(struct rte_eth_dev *dev,
args.ops = I40E_VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE;
args.in_args = (uint8_t *)&promisc;
args.in_args_size = sizeof(promisc);
- args.out_buffer = cmd_result_buffer;
+ args.out_buffer = vf->aq_resp;
args.out_size = I40E_AQ_BUF_SZ;
err = i40evf_execute_vf_cmd(dev, &args);
@@ -554,7 +510,7 @@ i40evf_config_vlan_offload(struct rte_eth_dev *dev,
args.ops = (enum i40e_virtchnl_ops)I40E_VIRTCHNL_OP_CFG_VLAN_OFFLOAD;
args.in_args = (uint8_t *)&offload;
args.in_args_size = sizeof(offload);
- args.out_buffer = cmd_result_buffer;
+ args.out_buffer = vf->aq_resp;
args.out_size = I40E_AQ_BUF_SZ;
err = i40evf_execute_vf_cmd(dev, &args);
@@ -585,7 +541,7 @@ i40evf_config_vlan_pvid(struct rte_eth_dev *dev,
args.ops = (enum i40e_virtchnl_ops)I40E_VIRTCHNL_OP_CFG_VLAN_PVID;
args.in_args = (uint8_t *)&tpid_info;
args.in_args_size = sizeof(tpid_info);
- args.out_buffer = cmd_result_buffer;
+ args.out_buffer = vf->aq_resp;
args.out_size = I40E_AQ_BUF_SZ;
err = i40evf_execute_vf_cmd(dev, &args);
@@ -664,7 +620,7 @@ i40evf_configure_vsi_queues(struct rte_eth_dev *dev)
args.ops = I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES;
args.in_args = (uint8_t *)vc_vqci;
args.in_args_size = size;
- args.out_buffer = cmd_result_buffer;
+ args.out_buffer = vf->aq_resp;
args.out_size = I40E_AQ_BUF_SZ;
ret = i40evf_execute_vf_cmd(dev, &args);
if (ret)
@@ -717,7 +673,7 @@ i40evf_configure_vsi_queues_ext(struct rte_eth_dev *dev)
(enum i40e_virtchnl_ops)I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES_EXT;
args.in_args = (uint8_t *)vc_vqcei;
args.in_args_size = size;
- args.out_buffer = cmd_result_buffer;
+ args.out_buffer = vf->aq_resp;
args.out_size = I40E_AQ_BUF_SZ;
ret = i40evf_execute_vf_cmd(dev, &args);
if (ret)
@@ -779,7 +735,7 @@ i40evf_config_irq_map(struct rte_eth_dev *dev)
args.ops = I40E_VIRTCHNL_OP_CONFIG_IRQ_MAP;
args.in_args = (u8 *)cmd_buffer;
args.in_args_size = sizeof(cmd_buffer);
- args.out_buffer = cmd_result_buffer;
+ args.out_buffer = vf->aq_resp;
args.out_size = I40E_AQ_BUF_SZ;
err = i40evf_execute_vf_cmd(dev, &args);
if (err)
@@ -810,7 +766,7 @@ i40evf_switch_queue(struct rte_eth_dev *dev, bool isrx, uint16_t qid,
args.ops = I40E_VIRTCHNL_OP_DISABLE_QUEUES;
args.in_args = (u8 *)&queue_select;
args.in_args_size = sizeof(queue_select);
- args.out_buffer = cmd_result_buffer;
+ args.out_buffer = vf->aq_resp;
args.out_size = I40E_AQ_BUF_SZ;
err = i40evf_execute_vf_cmd(dev, &args);
if (err)
@@ -902,7 +858,7 @@ i40evf_add_mac_addr(struct rte_eth_dev *dev, struct ether_addr *addr)
args.ops = I40E_VIRTCHNL_OP_ADD_ETHER_ADDRESS;
args.in_args = cmd_buffer;
args.in_args_size = sizeof(cmd_buffer);
- args.out_buffer = cmd_result_buffer;
+ args.out_buffer = vf->aq_resp;
args.out_size = I40E_AQ_BUF_SZ;
err = i40evf_execute_vf_cmd(dev, &args);
if (err)
@@ -939,7 +895,7 @@ i40evf_del_mac_addr(struct rte_eth_dev *dev, struct ether_addr *addr)
args.ops = I40E_VIRTCHNL_OP_DEL_ETHER_ADDRESS;
args.in_args = cmd_buffer;
args.in_args_size = sizeof(cmd_buffer);
- args.out_buffer = cmd_result_buffer;
+ args.out_buffer = vf->aq_resp;
args.out_size = I40E_AQ_BUF_SZ;
err = i40evf_execute_vf_cmd(dev, &args);
if (err)
@@ -962,7 +918,7 @@ i40evf_update_stats(struct rte_eth_dev *dev, struct i40e_eth_stats **pstats)
args.ops = I40E_VIRTCHNL_OP_GET_STATS;
args.in_args = (u8 *)&q_stats;
args.in_args_size = sizeof(q_stats);
- args.out_buffer = cmd_result_buffer;
+ args.out_buffer = vf->aq_resp;
args.out_size = I40E_AQ_BUF_SZ;
err = i40evf_execute_vf_cmd(dev, &args);
@@ -1056,7 +1012,7 @@ i40evf_add_vlan(struct rte_eth_dev *dev, uint16_t vlanid)
args.ops = I40E_VIRTCHNL_OP_ADD_VLAN;
args.in_args = (u8 *)&cmd_buffer;
args.in_args_size = sizeof(cmd_buffer);
- args.out_buffer = cmd_result_buffer;
+ args.out_buffer = vf->aq_resp;
args.out_size = I40E_AQ_BUF_SZ;
err = i40evf_execute_vf_cmd(dev, &args);
if (err)
@@ -1083,7 +1039,7 @@ i40evf_del_vlan(struct rte_eth_dev *dev, uint16_t vlanid)
args.ops = I40E_VIRTCHNL_OP_DEL_VLAN;
args.in_args = (u8 *)&cmd_buffer;
args.in_args_size = sizeof(cmd_buffer);
- args.out_buffer = cmd_result_buffer;
+ args.out_buffer = vf->aq_resp;
args.out_size = I40E_AQ_BUF_SZ;
err = i40evf_execute_vf_cmd(dev, &args);
if (err)
@@ -1095,6 +1051,7 @@ i40evf_del_vlan(struct rte_eth_dev *dev, uint16_t vlanid)
static int
i40evf_get_link_status(struct rte_eth_dev *dev, struct rte_eth_link *link)
{
+ struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
int err;
struct vf_cmd_info args;
struct rte_eth_link *new_link;
@@ -1102,7 +1059,7 @@ i40evf_get_link_status(struct rte_eth_dev *dev, struct rte_eth_link *link)
args.ops = (enum i40e_virtchnl_ops)I40E_VIRTCHNL_OP_GET_LINK_STAT;
args.in_args = NULL;
args.in_args_size = 0;
- args.out_buffer = cmd_result_buffer;
+ args.out_buffer = vf->aq_resp;
args.out_size = I40E_AQ_BUF_SZ;
err = i40evf_execute_vf_cmd(dev, &args);
if (err) {
@@ -1196,7 +1153,6 @@ i40evf_init_vf(struct rte_eth_dev *dev)
goto err;
}
-
/* Reset VF and wait until it's complete */
if (i40evf_reset_vf(hw)) {
PMD_INIT_LOG(ERR, "reset NIC failed");
@@ -1214,6 +1170,11 @@ i40evf_init_vf(struct rte_eth_dev *dev)
PMD_INIT_LOG(ERR, "init_adminq failed");
return -1;
}
+ vf->aq_resp = rte_zmalloc("vf_aq_resp", I40E_AQ_BUF_SZ, 0);
+ if (!vf->aq_resp) {
+ PMD_INIT_LOG(ERR, "unable to allocate vf_aq_resp memory");
+ goto err_aq;
+ }
if (i40evf_check_api_version(dev) != 0) {
PMD_INIT_LOG(ERR, "check_api version failed");
goto err_aq;
@@ -1279,6 +1240,8 @@ i40evf_uninit_vf(struct rte_eth_dev *dev)
i40evf_dev_close(dev);
rte_free(vf->vf_res);
vf->vf_res = NULL;
+ rte_free(vf->aq_resp);
+ vf->aq_resp = NULL;
return 0;
}