octeon: add support for max_rx_frame_size update

This patch adds capability to update max_rx_frame_size on octeon
port.
Initial MTU value is being set in the "oct_port_start", which is
invoked every time the Ethernet interface is brought up, thus
overwriting any MTU value set by VPP CLI.
Moved the MTU initialization to "oct_port_init" to address this.

Type: feature

Change-Id: I00d0d52bc7711062cde47b8fe52e6823bb718d08
Signed-off-by: Alok Mishra <[email protected]>

diff --git a/src/plugins/dev_octeon/port.c b/src/plugins/dev_octeon/port.c
index 68ed1a5..8290880 100644 (file)
--- a/src/plugins/dev_octeon/port.c
+++ b/src/plugins/dev_octeon/port.c
@@ -142,6 +142,12 @@ oct_port_init (vlib_main_t *vm, vnet_dev_port_t *port)
 
   oct_port_add_counters (vm, port);
 
+  if ((rrv = roc_nix_mac_mtu_set (nix, port->max_rx_frame_size)))
+    {
+      rv = oct_roc_err (dev, rrv, "roc_nix_mac_mtu_set() failed");
+      return rv;
+    }
+
   return VNET_DEV_OK;
 }
 
@@ -361,12 +367,6 @@ oct_port_start (vlib_main_t *vm, vnet_dev_port_t *port)
       ctq->n_enq = 0;
     }
 
-  if ((rrv = roc_nix_mac_mtu_set (nix, 9200)))
-    {
-      rv = oct_roc_err (dev, rrv, "roc_nix_mac_mtu_set() failed");
-      goto done;
-    }
-
   if ((rrv = roc_nix_npc_rx_ena_dis (nix, true)))
     {
       rv = oct_roc_err (dev, rrv, "roc_nix_npc_rx_ena_dis() failed");
@@ -474,7 +474,6 @@ oct_port_add_del_eth_addr (vlib_main_t *vm, vnet_dev_port_t *port,
   oct_device_t *cd = vnet_dev_get_data (dev);
   struct roc_nix *nix = cd->nix;
   vnet_dev_rv_t rv = VNET_DEV_OK;
-
   i32 rrv;
 
   if (is_primary)
@@ -500,6 +499,24 @@ oct_port_add_del_eth_addr (vlib_main_t *vm, vnet_dev_port_t *port,
            }
        }
     }
+
+  return rv;
+}
+
+vnet_dev_rv_t
+oct_op_config_max_rx_len (vlib_main_t *vm, vnet_dev_port_t *port,
+                         u32 rx_frame_size)
+{
+  vnet_dev_t *dev = port->dev;
+  oct_device_t *cd = vnet_dev_get_data (dev);
+  struct roc_nix *nix = cd->nix;
+  vnet_dev_rv_t rv = VNET_DEV_OK;
+  i32 rrv;
+
+  rrv = roc_nix_mac_max_rx_len_set (nix, rx_frame_size);
+  if (rrv)
+    rv = oct_roc_err (dev, rrv, "roc_nix_mac_max_rx_len_set() failed");
+
   return rv;
 }
 
@@ -564,6 +581,7 @@ oct_port_cfg_change (vlib_main_t *vm, vnet_dev_port_t *port,
       break;
 
     case VNET_DEV_PORT_CFG_MAX_RX_FRAME_SIZE:
+      rv = oct_op_config_max_rx_len (vm, port, req->max_rx_frame_size);
       break;
 
     case VNET_DEV_PORT_CFG_ADD_RX_FLOW:

diff --git a/src/vnet/dev/port.c b/src/vnet/dev/port.c
index 5b4b8cd..df7805c 100644 (file)
--- a/src/vnet/dev/port.c
+++ b/src/vnet/dev/port.c
@@ -305,7 +305,8 @@ vnet_dev_port_cfg_change_req_validate (vlib_main_t *vm, vnet_dev_port_t *port,
   switch (req->type)
     {
     case VNET_DEV_PORT_CFG_MAX_RX_FRAME_SIZE:
-      if (req->max_rx_frame_size > port->attr.max_supported_rx_frame_size)
+      if ((req->max_rx_frame_size > port->attr.max_supported_rx_frame_size) ||
+         (req->max_rx_frame_size < ETHERNET_MIN_PACKET_BYTES))
        return VNET_DEV_ERR_INVALID_VALUE;
       if (req->max_rx_frame_size == port->max_rx_frame_size)
        return VNET_DEV_ERR_NO_CHANGE;