dpif-netdev: Delete packet if not able to do upcall

In dp_netdev_input() we nevered fully covered the case where handler queues are not there. With this change we increment the stat counter and free the packet. Signed-off-by: Daniele Di Proietto <[email protected]> Acked-by: Pravin B Shelar <[email protected]>
wxgospel · Jun 25, 2014 · 72d9667 · 72d9667
1 parent 9477751
commit 72d9667
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
@@ -2094,12 +2094,20 @@ dp_netdev_input(struct dp_netdev *dp, struct dpif_packet **packets, int cnt,
                 packet_batch_init(&batch, netdev_flow, packets[i], md,
                                   &key.flow);
             }
-        } else if (dp->handler_queues) {
+        } else {
+            /* Packet's flow not in datapath */
             dp_netdev_count_packet(dp, DP_STAT_MISS, 1);
-            dp_netdev_output_userspace(dp, &buf, 1,
-                                       miniflow_hash_5tuple(&key.flow, 0)
-                                       % dp->n_handlers,
-                                       DPIF_UC_MISS, &key.flow, NULL);
+
+            if (dp->handler_queues) {
+                /* Upcall */
+                dp_netdev_output_userspace(dp, &buf, 1,
+                                           miniflow_hash_5tuple(&key.flow, 0)
+                                           % dp->n_handlers,
+                                           DPIF_UC_MISS, &key.flow, NULL);
+            } else {
+                /* No upcall queue.  Freeing the packet */
+                dpif_packet_delete(packets[i]);
+            }
         }
     }