[v2] eventdev/eth_rx: fix queue config get logic

Message ID 20220214171016.961658-1-s.v.naga.harish.k@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Jerin Jacob
Headers
Series [v2] eventdev/eth_rx: fix queue config get logic |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/github-robot: build success github build: passed
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/intel-Testing success Testing PASS
ci/iol-abi-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS

Commit Message

Naga Harish K, S V Feb. 14, 2022, 5:10 p.m. UTC
  remove the memcpy usage in queue config get function for
`event` variable which is 8 byte size and use direct copy.
Also provide vector information and event buffer size in the
queue config info.

Fixes: da781e6488 ("eventdev/eth_rx: support Rx queue config get")

Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com>
---
v2:
* remove memcpy usage
  also provide vector data and event buffer size info
---
 lib/eventdev/rte_event_eth_rx_adapter.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)
  

Comments

Jayatheerthan, Jay Feb. 15, 2022, 4:54 p.m. UTC | #1
Looks good. Thanks!

Acked-by: Jay Jayatheerthan <jay.jayatheerthan@intel.com>

-Jay



> -----Original Message-----
> From: Naga Harish K, S V <s.v.naga.harish.k@intel.com>
> Sent: Monday, February 14, 2022 10:40 PM
> To: Jayatheerthan, Jay <jay.jayatheerthan@intel.com>; jerinj@marvell.com
> Cc: dev@dpdk.org
> Subject: [PATCH v2] eventdev/eth_rx: fix queue config get logic
> 
> remove the memcpy usage in queue config get function for
> `event` variable which is 8 byte size and use direct copy.
> Also provide vector information and event buffer size in the
> queue config info.
> 
> Fixes: da781e6488 ("eventdev/eth_rx: support Rx queue config get")
> 
> Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com>
> ---
> v2:
> * remove memcpy usage
>   also provide vector data and event buffer size info
> ---
>  lib/eventdev/rte_event_eth_rx_adapter.c | 16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c
> index ae1e260c08..28388d3abb 100644
> --- a/lib/eventdev/rte_event_eth_rx_adapter.c
> +++ b/lib/eventdev/rte_event_eth_rx_adapter.c
> @@ -3194,11 +3194,11 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
>  			uint16_t rx_queue_id,
>  			struct rte_event_eth_rx_adapter_queue_conf *queue_conf)
>  {
> +#define TICK2NSEC(_ticks, _freq) (((_ticks) * (1E9)) / (_freq))
>  	struct rte_eventdev *dev;
>  	struct event_eth_rx_adapter *rx_adapter;
>  	struct eth_device_info *dev_info;
>  	struct eth_rx_queue_info *queue_info;
> -	struct rte_event *qi_ev;
>  	int ret;
> 
>  	if (rxa_memzone_lookup())
> @@ -3229,7 +3229,6 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
>  	}
> 
>  	queue_info = &dev_info->rx_queue[rx_queue_id];
> -	qi_ev = (struct rte_event *)&queue_info->event;
> 
>  	memset(queue_conf, 0, sizeof(*queue_conf));
>  	queue_conf->rx_queue_flags = 0;
> @@ -3238,7 +3237,18 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
>  			RTE_EVENT_ETH_RX_ADAPTER_QUEUE_FLOW_ID_VALID;
>  	queue_conf->servicing_weight = queue_info->wt;
> 
> -	memcpy(&queue_conf->ev, qi_ev, sizeof(*qi_ev));
> +	queue_conf->ev.event = queue_info->event;
> +
> +	queue_conf->vector_sz = queue_info->vector_data.max_vector_count;
> +	queue_conf->vector_mp = queue_info->vector_data.vector_pool;
> +	/* need to be converted from ticks to ns */
> +	queue_conf->vector_timeout_ns = TICK2NSEC(
> +		queue_info->vector_data.vector_timeout_ticks, rte_get_timer_hz());
> +
> +	if (queue_info->event_buf != NULL)
> +		queue_conf->event_buf_size = queue_info->event_buf->events_size;
> +	else
> +		queue_conf->event_buf_size = 0;
> 
>  	dev = &rte_eventdevs[rx_adapter->eventdev_id];
>  	if (dev->dev_ops->eth_rx_adapter_queue_conf_get != NULL) {
> --
> 2.23.0
  
Jerin Jacob Feb. 18, 2022, 1:57 p.m. UTC | #2
On Tue, Feb 15, 2022 at 10:24 PM Jayatheerthan, Jay
<jay.jayatheerthan@intel.com> wrote:
>
> Looks good. Thanks!
>
> Acked-by: Jay Jayatheerthan <jay.jayatheerthan@intel.com>


Applied to dpdk-next-net-eventdev/for-main. Thanks


> -Jay
>
>
>
> > -----Original Message-----
> > From: Naga Harish K, S V <s.v.naga.harish.k@intel.com>
> > Sent: Monday, February 14, 2022 10:40 PM
> > To: Jayatheerthan, Jay <jay.jayatheerthan@intel.com>; jerinj@marvell.com
> > Cc: dev@dpdk.org
> > Subject: [PATCH v2] eventdev/eth_rx: fix queue config get logic
> >
> > remove the memcpy usage in queue config get function for
> > `event` variable which is 8 byte size and use direct copy.
> > Also provide vector information and event buffer size in the
> > queue config info.
> >
> > Fixes: da781e6488 ("eventdev/eth_rx: support Rx queue config get")
> >
> > Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com>
> > ---
> > v2:
> > * remove memcpy usage
> >   also provide vector data and event buffer size info
> > ---
> >  lib/eventdev/rte_event_eth_rx_adapter.c | 16 +++++++++++++---
> >  1 file changed, 13 insertions(+), 3 deletions(-)
> >
> > diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c
> > index ae1e260c08..28388d3abb 100644
> > --- a/lib/eventdev/rte_event_eth_rx_adapter.c
> > +++ b/lib/eventdev/rte_event_eth_rx_adapter.c
> > @@ -3194,11 +3194,11 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
> >                       uint16_t rx_queue_id,
> >                       struct rte_event_eth_rx_adapter_queue_conf *queue_conf)
> >  {
> > +#define TICK2NSEC(_ticks, _freq) (((_ticks) * (1E9)) / (_freq))
> >       struct rte_eventdev *dev;
> >       struct event_eth_rx_adapter *rx_adapter;
> >       struct eth_device_info *dev_info;
> >       struct eth_rx_queue_info *queue_info;
> > -     struct rte_event *qi_ev;
> >       int ret;
> >
> >       if (rxa_memzone_lookup())
> > @@ -3229,7 +3229,6 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
> >       }
> >
> >       queue_info = &dev_info->rx_queue[rx_queue_id];
> > -     qi_ev = (struct rte_event *)&queue_info->event;
> >
> >       memset(queue_conf, 0, sizeof(*queue_conf));
> >       queue_conf->rx_queue_flags = 0;
> > @@ -3238,7 +3237,18 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
> >                       RTE_EVENT_ETH_RX_ADAPTER_QUEUE_FLOW_ID_VALID;
> >       queue_conf->servicing_weight = queue_info->wt;
> >
> > -     memcpy(&queue_conf->ev, qi_ev, sizeof(*qi_ev));
> > +     queue_conf->ev.event = queue_info->event;
> > +
> > +     queue_conf->vector_sz = queue_info->vector_data.max_vector_count;
> > +     queue_conf->vector_mp = queue_info->vector_data.vector_pool;
> > +     /* need to be converted from ticks to ns */
> > +     queue_conf->vector_timeout_ns = TICK2NSEC(
> > +             queue_info->vector_data.vector_timeout_ticks, rte_get_timer_hz());
> > +
> > +     if (queue_info->event_buf != NULL)
> > +             queue_conf->event_buf_size = queue_info->event_buf->events_size;
> > +     else
> > +             queue_conf->event_buf_size = 0;
> >
> >       dev = &rte_eventdevs[rx_adapter->eventdev_id];
> >       if (dev->dev_ops->eth_rx_adapter_queue_conf_get != NULL) {
> > --
> > 2.23.0
>
  

Patch

diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c
index ae1e260c08..28388d3abb 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -3194,11 +3194,11 @@  rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
 			uint16_t rx_queue_id,
 			struct rte_event_eth_rx_adapter_queue_conf *queue_conf)
 {
+#define TICK2NSEC(_ticks, _freq) (((_ticks) * (1E9)) / (_freq))
 	struct rte_eventdev *dev;
 	struct event_eth_rx_adapter *rx_adapter;
 	struct eth_device_info *dev_info;
 	struct eth_rx_queue_info *queue_info;
-	struct rte_event *qi_ev;
 	int ret;
 
 	if (rxa_memzone_lookup())
@@ -3229,7 +3229,6 @@  rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
 	}
 
 	queue_info = &dev_info->rx_queue[rx_queue_id];
-	qi_ev = (struct rte_event *)&queue_info->event;
 
 	memset(queue_conf, 0, sizeof(*queue_conf));
 	queue_conf->rx_queue_flags = 0;
@@ -3238,7 +3237,18 @@  rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
 			RTE_EVENT_ETH_RX_ADAPTER_QUEUE_FLOW_ID_VALID;
 	queue_conf->servicing_weight = queue_info->wt;
 
-	memcpy(&queue_conf->ev, qi_ev, sizeof(*qi_ev));
+	queue_conf->ev.event = queue_info->event;
+
+	queue_conf->vector_sz = queue_info->vector_data.max_vector_count;
+	queue_conf->vector_mp = queue_info->vector_data.vector_pool;
+	/* need to be converted from ticks to ns */
+	queue_conf->vector_timeout_ns = TICK2NSEC(
+		queue_info->vector_data.vector_timeout_ticks, rte_get_timer_hz());
+
+	if (queue_info->event_buf != NULL)
+		queue_conf->event_buf_size = queue_info->event_buf->events_size;
+	else
+		queue_conf->event_buf_size = 0;
 
 	dev = &rte_eventdevs[rx_adapter->eventdev_id];
 	if (dev->dev_ops->eth_rx_adapter_queue_conf_get != NULL) {