4 files changed, 23 insertions, 10 deletions

diff --git a/src/vnet/devices/tap/cli.c b/src/vnet/devices/tap/cli.c
index 7580d920061..89b2ff091b0 100644
--- a/src/vnet/devices/tap/cli.c
+++ b/src/vnet/devices/tap/cli.c
@@ -142,7 +142,7 @@ VLIB_CLI_COMMAND (tap_create_command, static) = {
     "[host-ip4-addr <ip4addr/mask>] [host-ip6-addr <ip6-addr>] "
     "[host-ip4-gw <ip4-addr>] [host-ip6-gw <ip6-addr>] "
     "[host-mac-addr <host-mac-address>] [host-if-name <name>] "
-    "[host-mtu-size <size>] [no-gso|gso|csum-offload|gro-coalesce] "
+    "[host-mtu-size <size>] [no-gso|gso [gro-coalesce]|csum-offload] "
     "[persist] [attach] [tun] [packed] [in-order]",
   .function = tap_create_command_fn,
 };
diff --git a/src/vnet/devices/tap/tap.c b/src/vnet/devices/tap/tap.c
index 77c15ce0524..040ec1f1ea5 100644
--- a/src/vnet/devices/tap/tap.c
+++ b/src/vnet/devices/tap/tap.c
@@ -731,7 +731,6 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args)
   if ((args->tap_flags & TAP_FLAG_GSO)
       && (args->tap_flags & TAP_FLAG_GRO_COALESCE))
     {
-      vif->packet_coalesce = 1;
       virtio_set_packet_coalesce (vif);
     }
   vnet_hw_interface_set_input_node (vnm, vif->hw_if_index,
@@ -900,7 +899,6 @@ tap_gso_enable_disable (vlib_main_t * vm, u32 sw_if_index, int enable_disable,
 	}
       if (is_packet_coalesce)
 	{
-	  vif->packet_coalesce = 1;
 	  virtio_set_packet_coalesce (vif);
 	}
     }
diff --git a/src/vnet/devices/virtio/device.c b/src/vnet/devices/virtio/device.c
index 6f7d1f664dc..dcd565dd475 100644
--- a/src/vnet/devices/virtio/device.c
+++ b/src/vnet/devices/virtio/device.c
@@ -725,24 +725,38 @@ virtio_interface_rx_mode_change (vnet_main_t * vnm, u32 hw_if_index, u32 qid,
   virtio_main_t *mm = &virtio_main;
   vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
   virtio_if_t *vif = pool_elt_at_index (mm->interfaces, hw->dev_instance);
-  virtio_vring_t *vring = vec_elt_at_index (vif->rxq_vrings, qid);
+  virtio_vring_t *rx_vring = vec_elt_at_index (vif->rxq_vrings, qid);
+  virtio_vring_t *tx_vring = 0;
 
   if (vif->type == VIRTIO_IF_TYPE_PCI && !(vif->support_int_mode))
     {
-      vring->avail->flags |= VRING_AVAIL_F_NO_INTERRUPT;
+      rx_vring->avail->flags |= VRING_AVAIL_F_NO_INTERRUPT;
       return clib_error_return (0, "interrupt mode is not supported");
     }
 
   if (mode == VNET_HW_INTERFACE_RX_MODE_POLLING)
     {
-      /* only enable packet coalesce in poll mode */
-      gro_flow_table_set_is_enable (vring->flow_table, 1);
-      vring->avail->flags |= VRING_AVAIL_F_NO_INTERRUPT;
+      vec_foreach (tx_vring, vif->txq_vrings)
+      {
+	/* only enable packet coalesce in poll mode */
+	gro_flow_table_set_is_enable (tx_vring->flow_table, 1);
+      }
+      rx_vring->avail->flags |= VRING_AVAIL_F_NO_INTERRUPT;
     }
   else
     {
-      gro_flow_table_set_is_enable (vring->flow_table, 0);
-      vring->avail->flags &= ~VRING_AVAIL_F_NO_INTERRUPT;
+      if (vif->packet_coalesce)
+	{
+	  virtio_log_warning (vif,
+			      "interface %U is in interrupt mode, disabling packet coalescing",
+			      format_vnet_sw_if_index_name, vnet_get_main (),
+			      vif->sw_if_index);
+	  vec_foreach (tx_vring, vif->txq_vrings)
+	  {
+	    gro_flow_table_set_is_enable (tx_vring->flow_table, 0);
+	  }
+	}
+      rx_vring->avail->flags &= ~VRING_AVAIL_F_NO_INTERRUPT;
     }
 
   return 0;
diff --git a/src/vnet/devices/virtio/virtio.c b/src/vnet/devices/virtio/virtio.c
index ec22a0d45f4..e74f3783756 100644
--- a/src/vnet/devices/virtio/virtio.c
+++ b/src/vnet/devices/virtio/virtio.c
@@ -226,6 +226,7 @@ virtio_set_packet_coalesce (virtio_if_t * vif)
   vnet_main_t *vnm = vnet_get_main ();
   vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, vif->hw_if_index);
   virtio_vring_t *vring;
+  vif->packet_coalesce = 1;
   vec_foreach (vring, vif->txq_vrings)
   {
     gro_flow_table_init (&vring->flow_table,