[ovs-dev,v4,1/6] dpif-netdev: Change polled_queue to use dp_netdev_rxq.

Message ID 1502293530-10783-2-git-send-email-ktraynor@redhat.com
State Superseded
Delegated to: Darrell Ball
Headers show

Commit Message

Kevin Traynor Aug. 9, 2017, 3:45 p.m.
Soon we will want to store processing cycle counts in the dp_netdev_rxq,
so use that as a basis for the polled_queue that pmd_thread_main uses.

Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
---
 lib/dpif-netdev.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Greg Rose Aug. 10, 2017, 10:54 p.m. | #1
On 08/09/2017 08:45 AM, Kevin Traynor wrote:
> Soon we will want to store processing cycle counts in the dp_netdev_rxq,
> so use that as a basis for the polled_queue that pmd_thread_main uses.
>
> Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
> ---
>   lib/dpif-netdev.c | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
> index e2cd931..f35c079 100644
> --- a/lib/dpif-netdev.c
> +++ b/lib/dpif-netdev.c
> @@ -486,5 +486,5 @@ struct dp_netdev_pmd_cycles {
>
>   struct polled_queue {
> -    struct netdev_rxq *rx;
> +    struct dp_netdev_rxq *rxq;
>       odp_port_t port_no;
>   };
> @@ -3799,5 +3799,5 @@ pmd_load_queues_and_ports(struct dp_netdev_pmd_thread *pmd,
>       i = 0;
>       HMAP_FOR_EACH (poll, node, &pmd->poll_list) {
> -        poll_list[i].rx = poll->rxq->rx;
> +        poll_list[i].rxq = poll->rxq;
>           poll_list[i].port_no = poll->rxq->port->port_no;
>           i++;
> @@ -3837,6 +3837,6 @@ reload:
>       for (i = 0; i < poll_cnt; i++) {
>          VLOG_DBG("Core %d processing port \'%s\' with queue-id %d\n",
> -                pmd->core_id, netdev_rxq_get_name(poll_list[i].rx),
> -                netdev_rxq_get_queue_id(poll_list[i].rx));
> +                pmd->core_id, netdev_rxq_get_name(poll_list[i].rxq->rx),
> +                netdev_rxq_get_queue_id(poll_list[i].rxq->rx));
>       }
>
> @@ -3853,5 +3853,5 @@ reload:
>           for (i = 0; i < poll_cnt; i++) {
>               process_packets =
> -                dp_netdev_process_rxq_port(pmd, poll_list[i].rx,
> +                dp_netdev_process_rxq_port(pmd, poll_list[i].rxq->rx,
>                                              poll_list[i].port_no);
>               cycles_count_intermediate(pmd,
>
Tested-by: Greg Rose <gvrose8192@gmail.com>
Reviewed-by: Greg Rose <gvrose8192@gmail.com>

Patch

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index e2cd931..f35c079 100644
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -486,5 +486,5 @@  struct dp_netdev_pmd_cycles {
 
 struct polled_queue {
-    struct netdev_rxq *rx;
+    struct dp_netdev_rxq *rxq;
     odp_port_t port_no;
 };
@@ -3799,5 +3799,5 @@  pmd_load_queues_and_ports(struct dp_netdev_pmd_thread *pmd,
     i = 0;
     HMAP_FOR_EACH (poll, node, &pmd->poll_list) {
-        poll_list[i].rx = poll->rxq->rx;
+        poll_list[i].rxq = poll->rxq;
         poll_list[i].port_no = poll->rxq->port->port_no;
         i++;
@@ -3837,6 +3837,6 @@  reload:
     for (i = 0; i < poll_cnt; i++) {
        VLOG_DBG("Core %d processing port \'%s\' with queue-id %d\n",
-                pmd->core_id, netdev_rxq_get_name(poll_list[i].rx),
-                netdev_rxq_get_queue_id(poll_list[i].rx));
+                pmd->core_id, netdev_rxq_get_name(poll_list[i].rxq->rx),
+                netdev_rxq_get_queue_id(poll_list[i].rxq->rx));
     }
 
@@ -3853,5 +3853,5 @@  reload:
         for (i = 0; i < poll_cnt; i++) {
             process_packets =
-                dp_netdev_process_rxq_port(pmd, poll_list[i].rx,
+                dp_netdev_process_rxq_port(pmd, poll_list[i].rxq->rx,
                                            poll_list[i].port_no);
             cycles_count_intermediate(pmd,