From patchwork Mon Apr 10 18:18:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wiles, Keith" X-Patchwork-Id: 23442 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id D9ABF2C01; Mon, 10 Apr 2017 20:18:56 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id E47902BF5 for ; Mon, 10 Apr 2017 20:18:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491848335; x=1523384335; h=from:to:subject:date:message-id; bh=5SvQ1tbNP8VZuuSz9VK7frNHHKKkHiz6UTunMNHxp3Y=; b=aC/dejScUSCKDwHD4L5ipTynRidOTuu/IVDQuBrtB726Jyr6+q2IDfmJ 8rVVnza5FLQnsOFb2K9SjuVvORiprg==; Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Apr 2017 11:18:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.37,182,1488873600"; d="scan'208"; a="1117860720" Received: from jgauthi1-mobl1.amr.corp.intel.com ([10.254.98.247]) by orsmga001.jf.intel.com with ESMTP; 10 Apr 2017 11:18:53 -0700 From: Keith Wiles To: dev@dpdk.org Date: Mon, 10 Apr 2017 13:18:50 -0500 Message-Id: <20170410181850.44845-1-keith.wiles@intel.com> X-Mailer: git-send-email 2.10.1 Subject: [dpdk-dev] [PATCH] net/tap: add support for fixed mac addresses X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Support for a fixed MAC address for testing with the last octet incrementing by one for each interface defined with the new 'mac=fixed' string on the --vdev option. The default option is still to randomize the MAC address for each tap interface. Signed-off-by: Keith Wiles --- doc/guides/nics/tap.rst | 13 +++++++++++- drivers/net/tap/rte_eth_tap.c | 49 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/doc/guides/nics/tap.rst b/doc/guides/nics/tap.rst index 5c5ba5357..e3819836a 100644 --- a/doc/guides/nics/tap.rst +++ b/doc/guides/nics/tap.rst @@ -46,7 +46,7 @@ These TAP interfaces can be used with Wireshark or tcpdump or Pktgen-DPDK along with being able to be used as a network connection to the DPDK application. The method enable one or more interfaces is to use the ``--vdev=net_tap0`` option on the DPDK application command line. Each -``--vdev=net_tap1`` option give will create an interface named dtap0, dtap1, +``--vdev=net_tap1`` option given will create an interface named dtap0, dtap1, and so on. The interface name can be changed by adding the ``iface=foo0``, for example:: @@ -58,6 +58,17 @@ needed, but the interface does not enforce that speed, for example:: --vdev=net_tap0,iface=foo0,speed=25000 +Normally the PMD will generate random MAC address, but when testing or with +a static configurations the developer may need a fixed MAC address style. +Using the option ``mac=fixed`` you can create a fixed known MAC address:: + + --vdev=net_tap0,mac=fixed + +The MAC address will be fixed value with the last octet incrementing by one +each time for each interface string containing ``mac=fixed``. The MAC address +is formatted as 00:'d':'t':'a':'p':[00-FF] convert the characters to hex +and you get ``00:64:74:61:70:[00-FF]``. + It is possible to specify a remote netdevice to capture packets from by adding ``remote=foo1``, for example:: diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 347a80741..7a676c588 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2016 Intel Corporation. All rights reserved. + * Copyright(c) 2017 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,6 +71,13 @@ #define ETH_TAP_IFACE_ARG "iface" #define ETH_TAP_SPEED_ARG "speed" #define ETH_TAP_REMOTE_ARG "remote" +#define ETH_TAP_MAC_ARG "mac" + +#ifdef IFF_MULTI_QUEUE +#define RTE_PMD_TAP_MAX_QUEUES 16 +#else +#define RTE_PMD_TAP_MAX_QUEUES 1 +#endif #define FLOWER_KERNEL_VERSION KERNEL_VERSION(4, 2, 0) #define FLOWER_VLAN_KERNEL_VERSION KERNEL_VERSION(4, 9, 0) @@ -81,10 +88,12 @@ static const char *valid_arguments[] = { ETH_TAP_IFACE_ARG, ETH_TAP_SPEED_ARG, ETH_TAP_REMOTE_ARG, + ETH_TAP_MAC_ARG, NULL }; static int tap_unit; +static int fixed_mac_type; static volatile uint32_t tap_trigger; /* Rx trigger */ @@ -1230,7 +1239,17 @@ eth_dev_tap_create(const char *name, char *tap_name, char *remote_iface) rte_memcpy(&pmd->eth_addr, ifr.ifr_hwaddr.sa_data, ETHER_ADDR_LEN); } else { - eth_random_addr((uint8_t *)&pmd->eth_addr); + if (fixed_mac_type) { + static int iface_idx; + + pmd->eth_addr.addr_bytes[0] = 0x00; + pmd->eth_addr.addr_bytes[1] = 'd'; + pmd->eth_addr.addr_bytes[2] = 't'; + pmd->eth_addr.addr_bytes[3] = 'a'; + pmd->eth_addr.addr_bytes[4] = 'p'; + pmd->eth_addr.addr_bytes[5] = 0 + iface_idx++; + } else + eth_random_addr((uint8_t *)&pmd->eth_addr); } return 0; @@ -1285,6 +1304,16 @@ set_remote_iface(const char *key __rte_unused, return 0; } +static int +set_mac_type(const char *key __rte_unused, const char *value, void *extra_args) +{ + /* Assume random mac address */ + *(int *)extra_args = 0; + if (value && !strcasecmp("fixed", value)) + *(int *)extra_args = 1; + return 0; +} + /* Open a TAP interface device. */ static int @@ -1301,6 +1330,7 @@ rte_pmd_tap_probe(const char *name, const char *params) DEFAULT_TAP_NAME, tap_unit++); memset(remote_iface, 0, RTE_ETH_NAME_MAX_LEN); + fixed_mac_type = 0; if (params && (params[0] != '\0')) { RTE_LOG(DEBUG, PMD, "paramaters (%s)\n", params); @@ -1332,6 +1362,15 @@ rte_pmd_tap_probe(const char *name, const char *params) if (ret == -1) goto leave; } + + if (rte_kvargs_count(kvlist, ETH_TAP_MAC_ARG) == 1) { + ret = rte_kvargs_process(kvlist, + ETH_TAP_MAC_ARG, + &set_mac_type, + &fixed_mac_type); + if (ret == -1) + goto leave; + } } } pmd_link.link_speed = speed; @@ -1394,4 +1433,8 @@ static struct rte_vdev_driver pmd_tap_drv = { }; RTE_PMD_REGISTER_VDEV(net_tap, pmd_tap_drv); RTE_PMD_REGISTER_ALIAS(net_tap, eth_tap); -RTE_PMD_REGISTER_PARAM_STRING(net_tap, "iface=,speed=N"); +RTE_PMD_REGISTER_PARAM_STRING(net_tap, + "iface=," + "speed=N," + "remote=," + "mac=fixed");