From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00058.outbound.protection.outlook.com [40.107.0.58]) by dpdk.org (Postfix) with ESMTP id 6721E325F for ; Thu, 6 Sep 2018 18:56:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=coriant.onmicrosoft.com; s=selector1-coriant-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=h7AgjgRnhcO/Mc+7ZlreTahJbzrh1sc1zu64BSGqN/g=; b=N1J6Sp0bty7PUVsLorCm63p2n8XmEf17Dyq7g9A1rqQ2UkBRXPTRKtv273Rhxoz6odgscHLeMDGOCVZteg/dbJalpwQjEWOC4XjGdonp+Sl96u4bJQaX/nP5SrUTv2OMXeSKyeG8m5CWCwScWDjVqVF43r60q18CGgQRNFIDZ3c= Received: from HE1PR0402CA0043.eurprd04.prod.outlook.com (2603:10a6:7:7c::32) by HE1PR0402MB2922.eurprd04.prod.outlook.com (2603:10a6:3:da::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.15; Thu, 6 Sep 2018 16:56:43 +0000 Received: from HE1EUR02FT060.eop-EUR02.prod.protection.outlook.com (2a01:111:f400:7e05::206) by HE1PR0402CA0043.outlook.office365.com (2603:10a6:7:7c::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1122.15 via Frontend Transport; Thu, 6 Sep 2018 16:56:43 +0000 Authentication-Results: spf=pass (sender IP is 204.154.131.209) smtp.mailfrom=coriant.com; coriant.com; dkim=none (message not signed) header.d=none;coriant.com; dmarc=bestguesspass action=none header.from=coriant.com; Received-SPF: Pass (protection.outlook.com: domain of coriant.com designates 204.154.131.209 as permitted sender) receiver=protection.outlook.com; client-ip=204.154.131.209; helo=usnapvlsmtp01.coriant.com; Received: from usnapvlsmtp01.coriant.com (204.154.131.209) by HE1EUR02FT060.mail.protection.outlook.com (10.152.11.208) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.1101.10 via Frontend Transport; Thu, 6 Sep 2018 16:56:42 +0000 Received: from super-tessie-2.tellabs.fi (lb03 [172.23.229.177]) by usnapvlsmtp01.coriant.com (Postfix) with ESMTP id EA7BD401FE; Thu, 6 Sep 2018 11:56:39 -0500 (CDT) From: Juhamatti Kuusisaari To: CC: , Juhamatti Kuusisaari Date: Thu, 6 Sep 2018 19:56:13 +0300 Message-ID: <20180906165613.25848-1-juhamatti.kuusisaari@coriant.com> X-Mailer: git-send-email 2.17.1 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:204.154.131.209; IPV:CAL; SCL:-1; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(136003)(39860400002)(346002)(376002)(396003)(2980300002)(438002)(199004)(189003)(68736007)(426003)(336012)(81156014)(81166006)(106466001)(2616005)(50226002)(26005)(51416003)(106002)(126002)(2351001)(476003)(77096007)(356003)(316002)(97736004)(16586007)(478600001)(53936002)(8936002)(53416004)(1076002)(54906003)(26826003)(86362001)(2906002)(4326008)(5660300001)(14444005)(107886003)(6666003)(6916009)(6266002)(36756003)(8676002)(47776003)(486006)(104016004)(305945005)(69596002)(50466002)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0402MB2922; H:usnapvlsmtp01.coriant.com; FPR:; SPF:Pass; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; HE1EUR02FT060; 1:Z3eWNfyXR7IHq6ln6Du1tOiJdMGViB34ypjB8tmY83Xl/k8dwllZRIacZjYlctZwYuU+qaHECcHwKn5VYpYxmEqV8tStQ2nFa8Y9DUVgfqg/vwVJ+RPKiYTkkyI0GTvY MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cce46de6-aa4c-4bd2-5c99-08d61419b922 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(5600074)(711020)(4608076)(2017052603328)(7153060); SRVR:HE1PR0402MB2922; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0402MB2922; 3:IyUGHsWN+6Ek9G0kVSqFPL/LYKa9TtXgS15jc7k6e7LMaCM76TA1pVNZ0EDIoaSptegYOQX8MtMEe/OasTzee45UHQnry+p6i8Pk4HjdQ3wABgezNMIsLXOLEVQjchPLWPEH8n9qxxddEynZuimAYMDE3k9CB8FB8btZ155cmRkYgwu6+j9q3s43WIgl880i7nNcoSpE7s4ma83PqhteiKTQrjcCIqaFRQK6M4Ewm1mDf+jqcm7zYDk+Dhmd04OfiOKHyJgJ2jGO2152q/p7rfwQl3judhmpUJqokFRD4n9Mh7PWIm/taN1daSpMSXSuxiYM2Xi5yXwZZM9oLjKoy1ZKm42OaPYrGC0Vgf8c5ZM=; 25:qCZqYUCKwZdnH7B6Q2cwd7AlnVmuln12xRUgHsBZZIVlAypVNbK3EIUKxfiQJJ+j0Toxi8hYcE82NvsQda57NyvjwKMh5/9fDcdGC6azGqyRA3PY/B5CBarGF9DMBXcLbjILU0YcuVPjLRg1xO94/7iluyaHybGgZcV7vT74x8jPcuxU2lPoAFWiLP26frhnyJbff9X3xv5Ue9KtWSB3xc0cY/k45AbrtHXy51mudz20iqLy0T4fAcvD7c0PECSmFnKLW1VG96Am8OHa3n0qIQfBFAPm7+2FFICx4WBorx2rafCzBMqCb5wS9oN7C87X9wh7r8T6bd35na4nOLd6iw== X-MS-TrafficTypeDiagnostic: HE1PR0402MB2922: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0402MB2922; 31:5HleComXY60OUtYcz35+r+nQEl7W1OXEVxHiwcTjvcjK7NNSYsuG+DyVhBRMjbsRIqHxMtYgOVqZBf6V0r8bqzk2LBaGB0zh7fNultQyCwUWhC7UxdCslDGO7JstySK9jvedanh6N+sRj5xk5eMbvfaN1D0wdtOMcQ8VaiK5MD5iw7iMHMgx+b57Q7KQeUb7oVUXY5ccsDKZNZ5Z/bfMjpVorNHAMx8F0oWT9sVmbmQ=; 20:pZTWRXLDY9g6QJ/4j2NdyByGgBAOqH0uBVwco8smRAbUk/4QqIp7znY5F5N7C1HhpujflYRWeC7zZSng/QgasrMRUp4/lVn6Rve6mueGoHtroeoJdprVUThdXv9Xh4727hinujz7JhemUxIZQzFphaNS/QvDhtQgRHzyJUvzKG3qBUpsBDfrmuf/BfGylbr6Qtwry3aFRrixR4N2yqcKNLLPy5+M6ugea8gvSr9WeAkSur6cynjh/LCTjwAzQWugugkhyDh4Gt2AEMlorvvP+46hk8CWy1NrOFqmKlrUKbwVt8EOI/qMpkvfzkdGApIJTc4LWthd2Sa36JsVlIbtYqejIvuzW9EKbC2qEIhZKn/x3LdGqw0Iu0mqwIFnAJ3Jp4EiCRP9J8S8vHRJ/V9A8nquBgFHKItKUbTeOIJcGu4C92c7WLgz0RxJeDaX1Z1+4ABj2tAUWuVj2C8nypvGLcoJOhEqBQYcOJz+g27Lh7EOfnq0MxrZYQpBUPESYcSESEFpVM6FrsSWfXx0C6uLPCArGQJh15H300VG3hl+3EDVGE2Yj76LwtXhlKcx7MArVyOvNlMsy+R5JqvZOWyzgeEV0I1k9ouDsZs/ItFGWL0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(51653755401839); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(93006095)(93004095)(3231311)(944501410)(52105095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699016); SRVR:HE1PR0402MB2922; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0402MB2922; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0402MB2922; 4:IFRRsuURkVvpglaVk5pU3MO9OaAlthaSTkaYl5reC6Ts6f8dYXxrMCEPlqflG5wBYPYhau8/c+L1/7Jdcp5TgkPtskBdr+gKYgrge2nPTFaLx1/o2dtCrOgZlHM6p6g4syJ2H5PAMQqLV5hhVab6/fVkq5T6YrRcyxycG7J7+j3aK+dBK+QSE2M+Ale8sG1TsWMBkPAQVBLG/kDruwvt8pq+88wQ8IRB6/IgwviZcQNiHxwBvSiV0AfQpqrvijdNdsfKVIL4BOkIVi1/5zg7IJe/idyQuQ8zCn39qD5Rh4A9HVfi9g6L3qOhXtepTPJH X-Forefront-PRVS: 0787459938 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR0402MB2922; 23:FjR9TK2huCSNBO//cy+rXdN6APyrIbjmUoZWYku?= =?us-ascii?Q?yhaz09nA2SjalGyD4xrHS6p058/h+AE6J6/RDyLM6feSnXGtjHhuftNH+Y29?= =?us-ascii?Q?Apd92+GixKrZLVqbHm0zcHpMzDw02eZkTyzbnK4lcPyOc19GFHSa3AZxytyp?= =?us-ascii?Q?CsbrSTszggoiI1lXTa9krUhmypE7UJHieO+i+qp+xeryqawTUBH10cYk/0sf?= =?us-ascii?Q?ec2wNjZqrE0BLfgabJkG9w2iwN2HkmMWX1qMgEboXtYTJk9ot+I7q7V6Z6Po?= =?us-ascii?Q?0y2DsxxUhU/tvf3ifn14Jp2h+a8HliSnhHX5Fcy56KC/aeZ1Go4w/HHAU+Lh?= =?us-ascii?Q?q8NhobIpirp8FPLowN9+r/WA4m5jqGEQFpyjgKkzybULuFD9zdviKnr/WS/R?= =?us-ascii?Q?PUz7kA9UFdOvfV/ellZ+QzeqaoUZfnSkRKv+2ESyTzJCJkzG7pbk/llbzy30?= =?us-ascii?Q?EwCtLXhu1TaVjKF7mfeg61KNdWmkx2zcXYccBDWkkrI6XLMYmYixttkvI+pV?= =?us-ascii?Q?tZlOW2j6gTzcLzQqEz3R94NpkSjacxEHCXOZnCY7MWCjpgj8xoXfg1Iz56AF?= =?us-ascii?Q?CDM7l5XFoIM/cenaZ5qMqK33fYJdATpLeyvltvl0TmIQNS12AaYZ1a8Obfv1?= =?us-ascii?Q?sXDuOmByB9EmFPcwZTNv0FIQ/SAKG0g1/84Po36+yIrxKnHm/wLjHQodLd6C?= =?us-ascii?Q?mXUsbzlF7dXeTBecnPbswM59aLYu6seeow7NIaisCg03rmkZTk+DNZjDlWXD?= =?us-ascii?Q?s9DNNXNdvVA0c0QGczvy4wKVyTZm8+CQrjclmTPUPlTBSsLVwQqJVSKfYvPb?= =?us-ascii?Q?I5w0OBHldWJXMuWC2cS5cDqC4GjC894sTgiUiIg460Tdfy/hL8CUYnxQnd/O?= =?us-ascii?Q?GCRpHguzKdNKzc9mwJnliKR3HWw7ZYW+1fI+YTff++8QmjiXXZKpPHyjBTzp?= =?us-ascii?Q?CaJKHbl2OhpZjyIo1r2lPPMOBjh0277qD5gEL0dVoUDv4s3UhlImHbkSKO6X?= =?us-ascii?Q?RRc5S0slG7brWXG1Z/NitFT9Vn0UeoWw3WFOyigoON0Q9q63Fwtr4M/kU99N?= =?us-ascii?Q?F84ZtTNv4bp2d3ia6sLD72w8IPQwcH0pljEGKe2jFpkNop6Z1UmOkS9fdsWX?= =?us-ascii?Q?rC6hb6oAxwEYlBBOZ4oXR2stEFZxe866/uQg2VmWY+IgjeoKWtSAsIJeaPDn?= =?us-ascii?Q?t8x7GLGozUuYn5Bo=3D?= X-Microsoft-Antispam-Message-Info: Lh6foKCabdwJOaX876VP//W2cP0SCmH0ZvL0n2Yt9TJ/L8/Vp3sXkC+94QwAThqgryBHLL1geKlrYGlDG/LPn6Qf1RTJ37ChWwYMLIHsIE+rotWxpB8DS8pbF5ySHC7vnfDkDMRH1Ak79gMTXbFIlkfR6p+c4Au4t7JFVzq5DGt6aFfKJwJ4a6iRQk9j4n3G/fAxNa6pTdJS+1vvknHIizpffduDAwpP3PqSprzJiQuKnZgCiddy4cHENwFOgU2bY1+eJgvr2K6hvGjPI+xfzWf8AnqIGKzPO03owjKgI5Tgxp5e8O9PBzbOf/TpO6sC3rGiqnjMIU2n/SqGMm/eKHTZDSPFObUmnWmPUI9k4yzCxzuc7zFp1mBHhLqIhrGVSH76Ffl7ovGsW7jRoYsDDA== X-Microsoft-Exchange-Diagnostics: 1; HE1PR0402MB2922; 6:faXpYOuBF7EfNdP0RjnhfY7VwIqB+vrcUMBuJcp/jwn1h93EKjMvDhdrGcOzuksAEogwQFctuM0t+WGW6/+PE/0mUX20Ho1M4Yg+59Y87JiM0TzIkXFJhoRd5Rwcz4+OqoRWNR0nCkJKQjj0QZjiTpRzvSaUpGHqnv13v5sSx3a6U8MaDWh9wHlnsbu0TEN87Hq/Zxx8XfNsGjol+IlpBA9fb2SRpDrBOb/sch9qKg8uzdWXh+2hPutIGjBeh2FbJU7bVbR2RK86MXGWh6kNLh5q54YXmrZSH1Eno131av6M1BB0VI6z6zp+Mz6An6HWSCF38WyXdGokpbNjL4xMFN6J5nsMHNc7Z1V5kwHIGP2UnsHbjFV5UrXcAyHpev1Nr/irxROGyE8LCaYJQMEuuhegKMqnTXbmxXYHeg8qm7m1C4H8g1SUGptwqwCPkbNknQ2+p54piArd3Yo8ttPfEw==; 5:I0iFcDWkuDF2xqfWJ5i04cqHc3fXQp8i2zmOGEw5iyovRRUG9r7t1p8/GS05fnt5MPujSlSoA4Nmg+JI2LClZBIdbMyu3VvnmE6/zl/oAjcQCk9227CnWtH5Ju20Mcshe+FTUfkV8AyskmKEsfiHFvTsmRFL3KXfeJL1TgOHfJg=; 7:vBKHwH0P6ROz5xTC2mFqM1msHf3h9QDmBXuzDrXLkZ6bb34hRj+EPrvA4zDd0ZFw4+iIIsvqwGvRn9SH1JhCBHW/nnjSqxa4QK+YL+NpZyM9J8gENTBQZNzhvEgDy4Bz7gexWPc/4iyWV0EXmpRKYASMRno9sMAkvagFUMWDnYesxdH4MystkjR/FP4ah+xekuVi0xNTcAxUH5eyDtLo4u3QmaT/ZK0oN2624sx+L4/V2IV+532laM45sDnt1IYm SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: coriant.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2018 16:56:42.7122 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cce46de6-aa4c-4bd2-5c99-08d61419b922 X-MS-Exchange-CrossTenant-Id: 76595477-907e-4695-988b-a6b39087332d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=76595477-907e-4695-988b-a6b39087332d; Ip=[204.154.131.209]; Helo=[usnapvlsmtp01.coriant.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB2922 Subject: [dpdk-dev] [PATCH v5] net/pcap: physical interface MAC address support 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: , X-List-Received-Date: Thu, 06 Sep 2018 16:56:45 -0000 Support for PCAP physical interface MAC with phy_mac=1 devarg. Signed-off-by: Juhamatti Kuusisaari --- doc/guides/rel_notes/release_18_11.rst | 4 + drivers/net/pcap/rte_eth_pcap.c | 119 +++++++++++++++++++++++-- 2 files changed, 118 insertions(+), 5 deletions(-) diff --git a/doc/guides/rel_notes/release_18_11.rst b/doc/guides/rel_notes/release_18_11.rst index 3ae6b3f58..70966740a 100644 --- a/doc/guides/rel_notes/release_18_11.rst +++ b/doc/guides/rel_notes/release_18_11.rst @@ -54,6 +54,10 @@ New Features Also, make sure to start the actual text at the margin. ========================================================= +* **Added a devarg to use PCAP interface physical MAC address.** + A new devarg ``phy_mac`` was introduced to allow users to use physical + MAC address of the selected PCAP interface. + API Changes ----------- diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index e8810a171..8917c4c4d 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -7,6 +7,14 @@ #include #include +#include +#include +#include + +#ifdef __FreeBSD__ +#include +#include +#endif #include @@ -17,6 +25,7 @@ #include #include #include +#include #define RTE_ETH_PCAP_SNAPSHOT_LEN 65535 #define RTE_ETH_PCAP_SNAPLEN ETHER_MAX_JUMBO_FRAME_LEN @@ -29,6 +38,7 @@ #define ETH_PCAP_RX_IFACE_IN_ARG "rx_iface_in" #define ETH_PCAP_TX_IFACE_ARG "tx_iface" #define ETH_PCAP_IFACE_ARG "iface" +#define ETH_PCAP_PHY_MAC_ARG "phy_mac" #define ETH_PCAP_ARG_MAXLEN 64 @@ -87,6 +97,7 @@ static const char *valid_arguments[] = { ETH_PCAP_RX_IFACE_IN_ARG, ETH_PCAP_TX_IFACE_ARG, ETH_PCAP_IFACE_ARG, + ETH_PCAP_PHY_MAC_ARG, NULL }; @@ -904,12 +915,79 @@ pmd_init_internals(struct rte_vdev_device *vdev, return 0; } +static void eth_pcap_update_mac(const char *if_name, struct rte_eth_dev **eth_dev, + const unsigned int numa_node) +{ + void *mac_addrs; + PMD_LOG(INFO, "Setting phy MAC for %s\n", + if_name); +#ifndef __FreeBSD__ + int if_fd = socket(AF_INET, SOCK_DGRAM, 0); + if (if_fd != -1) { + struct ifreq ifr; + strlcpy(ifr.ifr_name, if_name, sizeof(ifr.ifr_name)); + if (!ioctl(if_fd, SIOCGIFHWADDR, &ifr)) { + mac_addrs = rte_zmalloc_socket(NULL, ETHER_ADDR_LEN, + 0, numa_node); + if (mac_addrs) { + (*eth_dev)->data->mac_addrs = mac_addrs; + rte_memcpy((*eth_dev)->data->mac_addrs, + ifr.ifr_addr.sa_data, + ETHER_ADDR_LEN); + } + } + close(if_fd); + } +#else + int mib[6]; + size_t len = 0; + char *buf = NULL; + + mib[0] = CTL_NET; + mib[1] = AF_ROUTE; + mib[2] = 0; + mib[3] = AF_LINK; + mib[4] = NET_RT_IFLIST; + mib[5] = if_nametoindex(if_name); + + if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) + return; + + if (len > 0) { + struct if_msghdr *ifm; + struct sockaddr_dl *sdl; + + buf = rte_zmalloc_socket(NULL, len, + 0, numa_node); + if (buf) { + if (sysctl(mib, 6, buf, &len, NULL, 0) < 0) { + rte_free(buf); + return; + } + + ifm = (struct if_msghdr *)buf; + sdl = (struct sockaddr_dl *)(ifm + 1); + mac_addrs = rte_zmalloc_socket(NULL, ETHER_ADDR_LEN, + 0, numa_node); + if (mac_addrs) { + (*eth_dev)->data->mac_addrs = mac_addrs; + rte_memcpy((*eth_dev)->data->mac_addrs, + LLADDR(sdl), + ETHER_ADDR_LEN); + } + } + } + if (buf) + rte_free(buf); +#endif +} + static int eth_from_pcaps_common(struct rte_vdev_device *vdev, struct pmd_devargs *rx_queues, const unsigned int nb_rx_queues, struct pmd_devargs *tx_queues, const unsigned int nb_tx_queues, struct rte_kvargs *kvlist, struct pmd_internals **internals, - struct rte_eth_dev **eth_dev) + const int phy_mac, struct rte_eth_dev **eth_dev) { struct rte_kvargs_pair *pair = NULL; unsigned int k_idx; @@ -955,6 +1033,9 @@ eth_from_pcaps_common(struct rte_vdev_device *vdev, else (*internals)->if_index = if_nametoindex(pair->value); + if (phy_mac && pair) + eth_pcap_update_mac(pair->value, eth_dev, vdev->device.numa_node); + return 0; } @@ -962,7 +1043,7 @@ static int eth_from_pcaps(struct rte_vdev_device *vdev, struct pmd_devargs *rx_queues, const unsigned int nb_rx_queues, struct pmd_devargs *tx_queues, const unsigned int nb_tx_queues, - struct rte_kvargs *kvlist, int single_iface, + struct rte_kvargs *kvlist, int single_iface, int phy_mac, unsigned int using_dumpers) { struct pmd_internals *internals = NULL; @@ -970,7 +1051,7 @@ eth_from_pcaps(struct rte_vdev_device *vdev, int ret; ret = eth_from_pcaps_common(vdev, rx_queues, nb_rx_queues, - tx_queues, nb_tx_queues, kvlist, &internals, ð_dev); + tx_queues, nb_tx_queues, kvlist, &internals, phy_mac, ð_dev); if (ret < 0) return ret; @@ -989,6 +1070,22 @@ eth_from_pcaps(struct rte_vdev_device *vdev, return 0; } +static int +select_phy_mac(const char *key, const char *value, void *extra_args) +{ + if (extra_args && strcmp(key, ETH_PCAP_PHY_MAC_ARG) == 0) { + const int phy_mac = atoi(value); + int *enable_phy_mac = extra_args; + + if (phy_mac != 0 && phy_mac != 1) + PMD_LOG(WARNING, "Value should be 0 or 1, set it as 1!"); + + if (phy_mac) + *enable_phy_mac = 1; + } + return 0; +} + static int pmd_pcap_probe(struct rte_vdev_device *dev) { @@ -999,6 +1096,7 @@ pmd_pcap_probe(struct rte_vdev_device *dev) struct pmd_devargs dumpers = {0}; struct rte_eth_dev *eth_dev; int single_iface = 0; + int phy_mac = 0; int ret; name = rte_vdev_device_name(dev); @@ -1026,6 +1124,16 @@ pmd_pcap_probe(struct rte_vdev_device *dev) if (kvlist == NULL) return -1; + /* + * We check whether we want to use phy MAC of pcap interface. + */ + if (rte_kvargs_count(kvlist, ETH_PCAP_PHY_MAC_ARG)) { + ret = rte_kvargs_process(kvlist, ETH_PCAP_PHY_MAC_ARG, + &select_phy_mac, &phy_mac); + if (ret < 0) + goto free_kvlist; + } + /* * If iface argument is passed we open the NICs and use them for * reading / writing @@ -1084,7 +1192,7 @@ pmd_pcap_probe(struct rte_vdev_device *dev) create_eth: ret = eth_from_pcaps(dev, &pcaps, pcaps.num_of_queue, &dumpers, - dumpers.num_of_queue, kvlist, single_iface, is_tx_pcap); + dumpers.num_of_queue, kvlist, single_iface, phy_mac, is_tx_pcap); free_kvlist: rte_kvargs_free(kvlist); @@ -1128,7 +1236,8 @@ RTE_PMD_REGISTER_PARAM_STRING(net_pcap, ETH_PCAP_RX_IFACE_ARG "= " ETH_PCAP_RX_IFACE_IN_ARG "= " ETH_PCAP_TX_IFACE_ARG "= " - ETH_PCAP_IFACE_ARG "="); + ETH_PCAP_IFACE_ARG "= " + ETH_PCAP_PHY_MAC_ARG "="); RTE_INIT(eth_pcap_init_log) { -- 2.17.1