From patchwork Tue Jun 19 14:37:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Goshen X-Patchwork-Id: 41303 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 [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8021F1B435; Wed, 20 Jun 2018 00:56:01 +0200 (CEST) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10133.outbound.protection.outlook.com [40.107.1.133]) by dpdk.org (Postfix) with ESMTP id 854AA4C96; Tue, 19 Jun 2018 16:38:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cgstowernetworks.onmicrosoft.com; s=selector1-cgstowernetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fvqdsnNvyHsTqargmNibv0lCJVkY0H8Knptvfe3t0tk=; b=ZtsagUJUGgj++XqUXYcuFEPae/0dBdmceVMnE++XD3TuuiByyps1Sj18RVVcdMrm09asfbxI5tlNrdJ7Wk57ezOwDD2ISCu0tBDGz8e/eRrCE5tpe8qiUs8ChP5kkz2tFI3aSWoFsnm3kaGm/HqOBSopggN17N/gBb4Oiz+kzlA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Ido@cgstowernetworks.com; Received: from ubuntu.localdomain (5.144.48.231) by VI1PR0901MB1439.eurprd09.prod.outlook.com (2603:10a6:800:8d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.19; Tue, 19 Jun 2018 14:38:04 +0000 From: ido goshen To: Ferruh Yigit Cc: dev@dpdk.org, ido goshen , stable@dpdk.org Date: Tue, 19 Jun 2018 17:37:25 +0300 Message-Id: <1529419046-95906-1-git-send-email-ido@cgstowernetworks.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [5.144.48.231] X-ClientProxiedBy: LO2P265CA0190.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a::34) To VI1PR0901MB1439.eurprd09.prod.outlook.com (2603:10a6:800:8d::7) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 07e17506-8d8b-4301-cc94-08d5d5f244b7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:VI1PR0901MB1439; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0901MB1439; 3:HE0C7qWt5FZn1dEjrjKzqTGu35t3ogqEbQH49KTBX6w058PUcU2JfhwRIehAIBwi9eY4J539LQHyvdZDZ0xgXggcd32043EdMOjbpI9WD3hQ9bDX1wa0ZKXg7NVK3FGuce4dDPbYJU+6KepsmJmFbrSFvEcOT6qOCH7bqWWr4LXRQ6/39tA/xdjWauiii5v8rJP6LA57MnTZVev6c3SCbjnoC8fV13if3tmJkVJXKwHsLP8Y7W90PxjiX0zFxiCI; 25:KQVK8ppOHfM78sIX07BJGg3dYluIV2nCegHThx1zU7lthpWbN2sRc3ZeTrDeJPVnw0ta72HL3vCxQwY9v5/EoCj4oy6ar62Nu0edYZ+Lm9A5U1gN+8woowFN702b20LR5uNgKZppInLw15Ah0RrrMqW9rTX2LfY0vguAADLqqtGnAK7jvh9BQnvFJPJNd7InMTnlkb7OTLB00O33IUTjcDSPxqnYFaKgDLhc04POn7S+VCouW64jSzuyLojRQ3T4pYxfiDgBQIha0Oe6kzGAdndtSWK21hUHLKMcZd7oV3RcIwZbPfAjfsldPPp5l5oXy+xc3DZcOZKD0I3HhcP2+w==; 31:wxx8fDEKEwmnlZmrMa8l4lRJLqhsANtRHq+E5iJgtro7DYX53REgc1Tubf2LWQCjwwTZ/0xvfSyrYR7UHCVJ+pGXV9gr8oIAY3jEF1K4u83LFfRghTkhTQOeqFKuKRalNiN+frK2Qv10eZk78qk1q+GV7hPvLxRSIJktj+nana+Is97xB+bTwA6GxoIC/cmDttqRwk0WxtZ9ai1hERlC+QtAZl0h950iTBlX4twPN3Y= X-MS-TrafficTypeDiagnostic: VI1PR0901MB1439: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(10201501046)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:VI1PR0901MB1439; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0901MB1439; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0901MB1439; 4:g7QKSnN8+9vfBG14t7y1FVo6miD8dYHi19P++m9KcAnUzqdTvttX6qbNfA3hzfI8Mw+3jYkppKIry3Ik+sy6tQFrcXjnVRazgZ6ayJlVQHosm/GfhE4YB59jNfnovCoeJ3+RQMmqRR38m6xijioXrfGVK/r9uLmkqVR1kI/BJUSE7nemVWVUov/fIirNCi37hvJydrA7kjshfWgYntJqtHMY3MN6QhctRUN941a4MgLXPVcT7kqlbtDfpNMUXJutZLwJfoZiqT6S8u5aK3lvdw== X-Forefront-PRVS: 07083FF734 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39840400004)(366004)(39380400002)(396003)(376002)(346002)(199004)(189003)(48376002)(86362001)(316002)(305945005)(51416003)(16586007)(53936002)(52116002)(486006)(476003)(2616005)(956004)(50466002)(478600001)(71446004)(72206003)(80792005)(106356001)(25786009)(8936002)(97736004)(4326008)(81166006)(105586002)(8676002)(81156014)(386003)(6506007)(26005)(186003)(16526019)(2906002)(7736002)(6916009)(5660300001)(66066001)(6666003)(36756003)(50226002)(6116002)(3846002)(68736007)(47776003)(6512007)(6486002)(86152003)(37156001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0901MB1439; H:ubuntu.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: cgstowernetworks.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0901MB1439; 23:0rZd2ODZ/vCMfLJHDSykwPEPeuWQWnxJYssc0/l?= 7xplMS/XS6VOh4QuQkyucDwW9i6CTi4Wwh0zVgNoX418rpcS/u9BBg52jTvC+9kHxSpaCiBaScrp+fyDNTXDBdg589ygn+B4hc3j9Kjw2oeuDJ9oUsvbtauD1kg3nBKUEFZTtiOdY3rYz8rlc7mycStcRnPGsueLa4DNd4ugUzqm1aPrXqeuPNn1V3bkdq+Ym+RS2nabHFGhO88rMasGxxpw5k8fi5pCup+jrwESVJ0SuG3d1c6pQEfQ8ZG3vUSmx4zkuIf1Wdkxfe0kpZO579+GOV6u2IK3qYwpQUfCEdN07cplTpjd0rh3pECkVxpPMJrGIEjcPuUhjhvj4SfFjj8oFqzr5xJjgOAZAu+S7d73o9rSXYqbcAxhzggefD+nZeGQ1lzFBA0Eoa08bqWsH54hwF+vay0A3jGrxW1pTg2Q+A99W6lQJykAVtzAYAFJXTD78WpkapX5XhW5c7fhABViBqRgXSlBIiWOJo9ZnEZG+Da4J2mHWfXN9Od8I8MswTQfZBxofuZk7D2GOL0EzCgYkJgGDaduY7mw9nqKSGyA168KE1zF1K9BkUhym70wU0E5QJBaOcE7A+cH4uixL/RPs5HebyWLo/FdCqZIhMybheNzaqE6vxcR+KNAF5+x5d9b/xFu7XmX218y+pCp4hpxXvDitu7t4yw/4biOJuaIWHD/heyvg6XdWuELWjaR9XpuetDxoQ0h69edPqGTanaoDEuG8I3DIErFv6O5uoRQ1MXIN+zHHM3IoXCQvYNSXCFzKlIi1ZJz3+NV2aOHz+n0cJyfu3gmEW4IVm0fTuXR/hIAdys0cJe4fVNw5VyVyBgw9kmG/2gDxWaG9wRk0CXYB5hND3nvBqZ1JrF7am9tKQIRnOn6/TOIkZRf1g7ley+gb8+3RFSh+hsJkjr5m/8X8ZcbOUIdgaE67mqZKxF3SdPWDD9Pgytx63lhRsJGVIubDnoSdCaW2suX2nvd3SucXhPohUroCIF1mPuEn6gGIDxH8PZWSU+HqCnzVpShri0UNaWxJAgvs8nS4yRgDfO13y4AWLureFCoUrsJfITT3RYCQ0ffQTwgP11CrkiDtMcXg4u84A615wiKTbLnVnm1lLgLGmt/xbJPwWuE/IdDgvUHZgIfNaOJutCKS5saEHKfQCSiYA/KAQxECBPSYIn1djLnC/YxrHyPvPMOo/o31Uw== X-Microsoft-Antispam-Message-Info: iuexML23l3prgvO4fR2+evN7BLo7KiBYJh0mRZXJxgl/FWkfGvBXcuUi1V314viyTHy/MquFTWSg38S/8xLproZ0D41z/tFqKcloJYaY4/KqqfNX1lnow03EPPaPKCAbTn7hX+RvfN4hMFqZCGm7hkWDXujn+mZIjzaZCs8DKkxrMb6y3Fpejw2xgI9TdIoH3u6cbwuFxzTcyPC9kKVFpUkUDSL14JBvRYfldG/xXnIPsUsIH1SaIiEP2weIgLXDVGsWlS5U9HK3q/KvIuB0o3MhT1oHtlUlo1Z4q7abZyhcrZhKJu6sKjjXjo7ftX6k X-Microsoft-Exchange-Diagnostics: 1; VI1PR0901MB1439; 6:b2HsW2QG8nn0Ai5MeHWftnESSrbCDyZxT+g/XWeplL016cNWAylvmWe2OkOguR3B44z3RTuJezf1/UtGu7Ip8hrExzuf/sjNHzM4+5F9xFFeveTS95YPcdh7SPIdMjS9T1aDvWcunR7TxOgcDT7VWnd5SIJ0niiefFoiLqpmPE8EJoGmBslyMWFCQ3ifcz85l2okuC1bUb6dZFqGGSpjsX5Php4PcJ17L6gu//XMJopmoU/fwM8wYi/kAGuV1t4/sbJdpeyQJW7F+BaEGjE1clU1++ZMDzYf7RwGLyXAyTa56olf+W26IBnb66SXhTr3v0oa9zmRuySj2KsU4kS3es9P7NpXOtAcJ/gdncXOblTknW85yjz9MmmNlycjgqa0rzvO6FwpNp1Ddf32lkakBASIqp9zJ3KGAocZ264sAIl3zPOquuHUrzTrN5BPsRHb5F1MQuUG/P4vkOE6XKrfJg==; 5:X8Zp3jZQYmdkMWa9zc9fIBUSw12n74DgRbEzjaIfxVW8dSHUwq9ENbNEIGJ4zYB3hwqhGCeXLsRWMYE60j6ASY117pvQZfManLVp2OLX2qlOT9y0mIS1D+sIOXPV2EslDRvsZiwEAzNCowIMJwE1jgn6LfJ8CrKOpb8pt5gWL4k=; 24:jf6N7Ep8WuglUThc9ptLWOoeH5n+mSrpks7HCn+7bvNn437Um+PFHkO9IG7C8egjtKOoHtF558xQ4r8E+xKkgW5s3PKPNsicVy+voEgLgyM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0901MB1439; 7:zvS6qlYDpzjXcO/VolYnm0PqpYK7hzhjYa21xqG65OIjbrzLN2AQSVFm46O9092yXThTPP/6EODXdzh2gBLVNlxvZO24lbG0unSpWhy79fN0kFlYfaWPYzHBTayV/UCMF7P6482JFMjhuTBcysMO9dpsaoAVKOA4wztsIIJtQr7tol+pLUN4MSj5MHorHEZ65pdSKka6SzjP0J6EMtN9DaEUClHuRSsPplImyjze79FlQDLzP8lLJH5W6ma7l7CD X-OriginatorOrg: cgstowernetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2018 14:38:04.7772 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 07e17506-8d8b-4301-cc94-08d5d5f244b7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fc9e9498-07e8-4b82-b4cf-365bba23cbbf X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0901MB1439 X-Mailman-Approved-At: Wed, 20 Jun 2018 00:55:58 +0200 Subject: [dpdk-dev] [PATCH v2 1/2] net/pcap: multiple queues fix 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" Fixes: 4c173302c307 ("pcap: add new driver") Cc: stable@dpdk.org Change open_rx/tx_pcap/iface functions to open only a single pcap/dumper and not loop num_of_queue times The num_of_queue loop is already acheived by the caller rte_kvargs_process Fixes: 1. Opens N requested pcaps/dumpers instead of N^2 2. Leak of pcap/dumper's which are being overwritten by the sequential calls to open_rx/tx_pcap/iface functions 3. Use the filename/iface args per queue and not just the last one that overwrites the previous names Signed-off-by: ido goshen Acked-by: Ferruh Yigit --- v2: * fix num of queues check --- drivers/net/pcap/rte_eth_pcap.c | 86 +++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 50 deletions(-) diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index 6bd4a7d..b4f81ac 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -665,19 +665,19 @@ struct pmd_devargs { static int open_rx_pcap(const char *key, const char *value, void *extra_args) { - unsigned int i; const char *pcap_filename = value; struct pmd_devargs *rx = extra_args; pcap_t *pcap = NULL; - for (i = 0; i < rx->num_of_queue; i++) { - if (open_single_rx_pcap(pcap_filename, &pcap) < 0) - return -1; + if (rx->num_of_queue >= RTE_PMD_PCAP_MAX_QUEUES) + return -1; + if (open_single_rx_pcap(pcap_filename, &pcap) < 0) + return -1; - rx->queue[i].pcap = pcap; - rx->queue[i].name = pcap_filename; - rx->queue[i].type = key; - } + rx->queue[rx->num_of_queue].pcap = pcap; + rx->queue[rx->num_of_queue].name = pcap_filename; + rx->queue[rx->num_of_queue].type = key; + rx->num_of_queue++; return 0; } @@ -689,19 +689,19 @@ struct pmd_devargs { static int open_tx_pcap(const char *key, const char *value, void *extra_args) { - unsigned int i; const char *pcap_filename = value; struct pmd_devargs *dumpers = extra_args; pcap_dumper_t *dumper; - for (i = 0; i < dumpers->num_of_queue; i++) { - if (open_single_tx_pcap(pcap_filename, &dumper) < 0) - return -1; + if (dumpers->num_of_queue >= RTE_PMD_PCAP_MAX_QUEUES) + return -1; + if (open_single_tx_pcap(pcap_filename, &dumper) < 0) + return -1; - dumpers->queue[i].dumper = dumper; - dumpers->queue[i].name = pcap_filename; - dumpers->queue[i].type = key; - } + dumpers->queue[dumpers->num_of_queue].dumper = dumper; + dumpers->queue[dumpers->num_of_queue].name = pcap_filename; + dumpers->queue[dumpers->num_of_queue].type = key; + dumpers->num_of_queue++; return 0; } @@ -732,18 +732,18 @@ struct pmd_devargs { static inline int open_rx_iface(const char *key, const char *value, void *extra_args) { - unsigned int i; const char *iface = value; struct pmd_devargs *rx = extra_args; pcap_t *pcap = NULL; - for (i = 0; i < rx->num_of_queue; i++) { - if (open_single_iface(iface, &pcap) < 0) - return -1; - rx->queue[i].pcap = pcap; - rx->queue[i].name = iface; - rx->queue[i].type = key; - } + if (rx->num_of_queue >= RTE_PMD_PCAP_MAX_QUEUES) + return -1; + if (open_single_iface(iface, &pcap) < 0) + return -1; + rx->queue[rx->num_of_queue].pcap = pcap; + rx->queue[rx->num_of_queue].name = iface; + rx->queue[rx->num_of_queue].type = key; + rx->num_of_queue++; return 0; } @@ -754,18 +754,18 @@ struct pmd_devargs { static int open_tx_iface(const char *key, const char *value, void *extra_args) { - unsigned int i; const char *iface = value; struct pmd_devargs *tx = extra_args; pcap_t *pcap; - for (i = 0; i < tx->num_of_queue; i++) { - if (open_single_iface(iface, &pcap) < 0) - return -1; - tx->queue[i].pcap = pcap; - tx->queue[i].name = iface; - tx->queue[i].type = key; - } + if (tx->num_of_queue >= RTE_PMD_PCAP_MAX_QUEUES) + return -1; + if (open_single_iface(iface, &pcap) < 0) + return -1; + tx->queue[tx->num_of_queue].pcap = pcap; + tx->queue[tx->num_of_queue].name = iface; + tx->queue[tx->num_of_queue].type = key; + tx->num_of_queue++; return 0; } @@ -958,15 +958,8 @@ struct pmd_devargs { * We check whether we want to open a RX stream from a real NIC or a * pcap file */ - pcaps.num_of_queue = rte_kvargs_count(kvlist, ETH_PCAP_RX_PCAP_ARG); - if (pcaps.num_of_queue) - is_rx_pcap = 1; - else - pcaps.num_of_queue = rte_kvargs_count(kvlist, - ETH_PCAP_RX_IFACE_ARG); - - if (pcaps.num_of_queue > RTE_PMD_PCAP_MAX_QUEUES) - pcaps.num_of_queue = RTE_PMD_PCAP_MAX_QUEUES; + is_rx_pcap = rte_kvargs_count(kvlist, ETH_PCAP_RX_PCAP_ARG) ? 1 : 0; + pcaps.num_of_queue = 0; if (is_rx_pcap) ret = rte_kvargs_process(kvlist, ETH_PCAP_RX_PCAP_ARG, @@ -982,15 +975,8 @@ struct pmd_devargs { * We check whether we want to open a TX stream to a real NIC or a * pcap file */ - dumpers.num_of_queue = rte_kvargs_count(kvlist, ETH_PCAP_TX_PCAP_ARG); - if (dumpers.num_of_queue) - is_tx_pcap = 1; - else - dumpers.num_of_queue = rte_kvargs_count(kvlist, - ETH_PCAP_TX_IFACE_ARG); - - if (dumpers.num_of_queue > RTE_PMD_PCAP_MAX_QUEUES) - dumpers.num_of_queue = RTE_PMD_PCAP_MAX_QUEUES; + is_tx_pcap = rte_kvargs_count(kvlist, ETH_PCAP_TX_PCAP_ARG) ? 1 : 0; + dumpers.num_of_queue = 0; if (is_tx_pcap) ret = rte_kvargs_process(kvlist, ETH_PCAP_TX_PCAP_ARG, From patchwork Tue Jun 19 14:37:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Goshen X-Patchwork-Id: 41304 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 [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6BC731B43E; Wed, 20 Jun 2018 00:56:03 +0200 (CEST) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00132.outbound.protection.outlook.com [40.107.0.132]) by dpdk.org (Postfix) with ESMTP id 181834C96 for ; Tue, 19 Jun 2018 16:38:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cgstowernetworks.onmicrosoft.com; s=selector1-cgstowernetworks-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bmFR8JQ3nGWoqsAE15rtkT9ucTFifrZ+qBy5qD9ZmXQ=; b=APW+kKsrQfA6sCdHUb0zOZszifECi6qRZQ6pBqdlNo/h8e8jyiQXY8fMxCjoyu4WOS8riCtaXMt7NgVpb39hOe4JwWSI0qjMo++IO/Uup5on7CTSqh4fgsQOF5Mm246wJef7x3y4CJVrXWBwvq676a7LuIozQx9V1MetoWdUikU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Ido@cgstowernetworks.com; Received: from ubuntu.localdomain (5.144.48.231) by VI1PR0901MB1439.eurprd09.prod.outlook.com (2603:10a6:800:8d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.19; Tue, 19 Jun 2018 14:38:13 +0000 From: ido goshen To: Ferruh Yigit Cc: dev@dpdk.org, ido goshen Date: Tue, 19 Jun 2018 17:37:26 +0300 Message-Id: <1529419046-95906-2-git-send-email-ido@cgstowernetworks.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1529419046-95906-1-git-send-email-ido@cgstowernetworks.com> References: <1529419046-95906-1-git-send-email-ido@cgstowernetworks.com> MIME-Version: 1.0 X-Originating-IP: [5.144.48.231] X-ClientProxiedBy: LO2P265CA0190.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a::34) To VI1PR0901MB1439.eurprd09.prod.outlook.com (2603:10a6:800:8d::7) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fcacca7c-8f2c-4680-afa1-08d5d5f249ff X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:VI1PR0901MB1439; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0901MB1439; 3:pTMrqcTuucZ+zHC78O06pvzvsqLoCgrDytT7GjDqxDmGjfpwzb5BtocjaUZ/WvSPKX/nO8UHzg4hDVhanje4woVXA9YFbvM72B/GycL0gnAeou9TJ6iXdien1zo/ixrvMz+2vh5IfiVCKJSfFWOG4qghzFEnjUdEzhw8frTzJ5njbgU70DBhRzYAN/Hr8QlBqGvimMb8cZut2gYFgl4s7Jv5KrtVTSONNCvtwx7zEx1jIkpnFzz8dDOwTTit4vUF; 25:VPeJQatIAPjU7ufKS9lJhZWmatPafD1KJfprnc5q4zmZYhoyTOdu6XhynJhRAPo+Q///VtAokffBmjuwnxnY+L7OMwRiNWo9vSrKF6FgSIoJ17rvitl/aSWcYdo+Wi1oRaqZr2Katfp603DQAAuZi29M2ByWjDNrEi6zt/TIqkYbmUyCOxvaEjtUOs0thrzyrVD7zxF9WeZzg3FhEkOm5otUJrqyxC01KVPZjdaX2eLQ9LT6+buuAHFcmjL29vEVkKowJnYb7aviylPfkS82XfSU/9dVTrVHNq296l/EHurckJsUvSshrsd+MKlDc7sdhQNqZ0UmbhnP4FO1HBY8CQ==; 31:cYrfqXlw+VnfQgKSuwJkVO8WEoTtRx6XwVWZbcPVxIrEpl3mV+I0t13CA5S4RJf0AsRXIeq14HN2h0Co2WAh+k8tznMc0TGUjpq4TFf2zyq2yk+KqU5CcK2Gw4hxn5tT6M4bNtd878CVE5IdZ4zhrfKrHv92EnMOxueGmab1xtTwdnAVt4G/ig3oI9m5h7zhXAv3B32SzM+B9OE7UEwtnQ2cBBiW9lNr/heGhpi9P8M= X-MS-TrafficTypeDiagnostic: VI1PR0901MB1439: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(10201501046)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:VI1PR0901MB1439; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0901MB1439; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0901MB1439; 4:31QgPLtcgo7XLWcd/GhGd8KkS18zAItnYqI7uZKjZdOI7irCZ0d5oLXwkOudwhznPLCGquHKGON6DKR1OKvKGXhiB+Ld3Z1ciSnD6NRJ4DFtDbLmcDtc1tzSGQ3d3QSjmQC3EEcusgensKa/8tWFO9e+Z0BYsLE2dIIAby1mYWxdkt+z/kVWXrH2npf/3Ckyaspz0QFI5h+7H9D61V/rLXVIDkBjdbRhZEC8DTtkOid6ZHm8ttuNnO5JNr4rbgYZpxIEYHLZMvzqeCaWUFFjCg== X-Forefront-PRVS: 07083FF734 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39840400004)(366004)(39380400002)(396003)(376002)(346002)(199004)(189003)(48376002)(86362001)(76176011)(316002)(305945005)(51416003)(16586007)(53936002)(52116002)(11346002)(486006)(476003)(2616005)(956004)(446003)(50466002)(478600001)(71446004)(72206003)(80792005)(106356001)(107886003)(25786009)(8936002)(97736004)(4326008)(81166006)(105586002)(8676002)(81156014)(386003)(6506007)(26005)(186003)(16526019)(2906002)(59450400001)(7736002)(6916009)(5660300001)(66066001)(6666003)(36756003)(50226002)(6116002)(3846002)(68736007)(47776003)(6512007)(6486002)(86152003)(37156001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0901MB1439; H:ubuntu.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: cgstowernetworks.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0901MB1439; 23:ZsYVHBU5HRPmE15CDUhY0oPX2oRyZo8WcfR9wvo?= rFyTk4cQEyMzojnH1WyBwxAN0bFc445luYU8b9NeCBu1pW8S0f4dVG0mkKXZIbWjBZsW8xBKFChCdSRFXlVw4gF2svAfZsMPneOCmUG2JOy79Dlo+0SDGGvdfQ7SLaK8d8n1tprJjLVaxa0Dh2e5zzBmdtaZALj/gCnMiFesbt/iyRsPGwExu+T0BVa8D/Q5ZMdbRfn1QenpZNViL1Kxou+9VkP7OcZTPVzyfZduvxShNPGhyZRgn4JzrAF6MtUW+xL2aMaSgANdNLA294kS0woIlQ1fFDRecanGL0aBBtnx/7KdQaeox3wX2JNVTslps799a2imas7HlvHxMGgdMDU8/rDTf6qgBlcgAiyq5bIurw+UA6ySPnnzhYqZiPyO5TkLLJcmQxY+p31DDq2m3Gwv4iaqYpI0QQ7SIePGpApuWcWLXyjTNlng6Rop0AqSGOYpmO1SzdaR3dIIOWjQMe1BDq01UOkwyIk8ne0DUKuh57LsEYFpSdXuV+JG/IFkGJKaA5tFH5xGeiTZm9PbxDYxkJnnovYVcyrbKqCtrQ/8XfbC/xa/KymONftWW/KXkLIRLR1KEGP9Uz9G2anh/GNixYnuB5COIVBXzL6Dsn3JCJohAU6wG8sxvNewbeeMALgcLJwVHn2ccZQihjnEruHflEbxpFXJ7GeJU87Jjho0FbYouG6Bym/mLJcAi7mNmydIXCFznoQfKoxtFAB6N3jwLLikZnuBa7Khl+RpAdDidIrXfDfEyekTR9lXDTUyeWIT/yV18c/FCigXLpkvEs4JzUFsgfiS9c7/a1mE4WWJqS2TnMAR7R9IXXU6Fco9BByvwGpu8mON25uD3UvDzZGrgX3IMcnWCG5zCS7/BDuLcawq45/FF++U0KR9W7AsXzUt6vyCpe1WXe4qEIvs9fwvNMCq9+w0LYhArFJNFQ/eDdsNYX+oNTuwIZj5W4qchb47uqGA6dP3Z++mUPyIob3V0jVVJjVMF1pJbEQJJH8fO3T2z0yU82tCuAa+e7DZUvFmR3srrMjTRd90tonh+vR48BYi6ew4e506V4wN4x1ZW5uxcGEn1zFU26THniWgbAGKtj+NlEAluyTlL3sqERH7u3/PZLBC3gRM37Q3LrqymErb8VHV5gXE19j1QKw3QZ3Xk4crHfJMWS+KyOyMNtdI4HikZXy1T/FAPcEl0dWyinUnDskQlpDOPjCnqqZcG8Nwv3KgfLukget68BO8n2bwpfkD7WTwqmEWX/bR62ORbmf8z5NZWUujbShYD/9rEpTBRaOjNeKjmH8cmsNLe830q X-Microsoft-Antispam-Message-Info: HdhclWyW+9PLsNcAqxSl36NUUG67CENBOESbBWzsSOUwRLMrN5SofyxI2yxTZICgbHloeCjSWot8FDWSQXXe+x0lehsx+zOg8WEWBa+KTtnweu2umWdptzE16Qh5ViGRX2Cfv+V68rQBro0v+N0m3DtcmMhv9OPP2Yw+8p3TwKAv+5oVFBMbywJ/BHnI7R81V0vpjOu/i3YJd0OxPoNs5b/Iyy0mZuq80d7h8F8wSALEt/xJo3vdY8TuXYedTe8mHGI7w/oqxGhzV6lhgBZ+AoBcOykAFP560IblS3cep9s9suhdjuinsa4f0St47OKRX+WtjYJc/YaMpeOPoR9U5Q== X-Microsoft-Exchange-Diagnostics: 1; VI1PR0901MB1439; 6:JhMr5Mq4zj4GlRn7UjjiWZslb9qQzE9XnjSAkR4viIZVvJHZFLywZ5xzW7d047GrhiX6IBYk3wVOfk433MSFR/bobO2In92wPf2p3DH/ZfFroEqycksQJ86yZLzb7M9Ykpin10a6ojMQ83zcnWbge2hBItYPV82/LrxNMtQHGJhMDB27UeHKO9FAw+LUNJEFwhWmbsq879vNlO0GdbcnPdk89Fe8Z2LmPmSkWLWjhktHxsR2z93Twp6Td24fnC5jIbAzGkadjzeLHEkS4vFMDgNUnudMsyp4IVHSJR8pHL45jfIp3cTzGg+uSWs9INBUrCIa/fPiamWEv9uMDMQX8CJGQudDt/65bGHlf2nxkHi8DMh7MLCKuErlINJkCe6DxdUDCQ6ECYrXmBRJwJpJE0w31I9RtxK7Jkxyr9dqZmwpY6b4Wp6FLHbbiPXv8/6Xhg6rcIq/TdBwN50CXpJBeA==; 5:DrbmWnukWOo/FJZC1Dyh+lPprn+r/4QONy2gS5fy6uye6ApFO9nNgVnavJv/3CewwxDd9gIM9zOaJA9wBaUVmXmi4q9iqageE3AFk4KsHdks7nyVkQ3I08NofH0OzUSBmHjvaypqiQpsbVegWq0VSlXc0V/kWhnAxICKuc+2z4o=; 24:mlmaTHgRdiHQTOg5PtMLjb2a9vWXuN/1cWdVn/G1TJQ5uHVJzGKL/BgzNlfn1SZBcATQgmzRLnebUL/YQYnZNfiIkIS7tx18eU8Z3rWftIY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0901MB1439; 7:wrGPVmoml2knpYbNMplpGOdS02lBJHtAHRnViuGKZAa9EQX94sdQN0aCnd8O2qc5ictprXKC0f2rznEMQOjBDbtey7RjsTDIleGk/nEfbV0ChKo3a2znA3imdi0P6ivRVOm3/P+JyKdb+FxWjkqcqVgJXssQCLZkkrTIMlNf+B4co6681EA4lU6G+nNs7AyuZ2752otcdn143l0vQAMZqVjFGqIVSxZ89fbB4ogxCJtpjMMW7JBpyP+7Lr7TZw8u X-OriginatorOrg: cgstowernetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2018 14:38:13.6994 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fcacca7c-8f2c-4680-afa1-08d5d5f249ff X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fc9e9498-07e8-4b82-b4cf-365bba23cbbf X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0901MB1439 X-Mailman-Approved-At: Wed, 20 Jun 2018 00:55:58 +0200 Subject: [dpdk-dev] [PATCH v2 2/2] net/pcap: duplicate code consolidation 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" Signed-off-by: ido goshen --- drivers/net/pcap/rte_eth_pcap.c | 77 +++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index b4f81ac..b21930b 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -658,6 +658,22 @@ struct pmd_devargs { .stats_reset = eth_stats_reset, }; +static int +add_queue(struct pmd_devargs *pmd, const char *name, const char *type, + pcap_t *pcap, pcap_dumper_t *dumper) +{ + if (pmd->num_of_queue >= RTE_PMD_PCAP_MAX_QUEUES) + return -1; + if (pcap) + pmd->queue[pmd->num_of_queue].pcap = pcap; + if (dumper) + pmd->queue[pmd->num_of_queue].dumper = dumper; + pmd->queue[pmd->num_of_queue].name = name; + pmd->queue[pmd->num_of_queue].type = type; + pmd->num_of_queue++; + return 0; +} + /* * Function handler that opens the pcap file for reading a stores a * reference of it for use it later on. @@ -669,15 +685,13 @@ struct pmd_devargs { struct pmd_devargs *rx = extra_args; pcap_t *pcap = NULL; - if (rx->num_of_queue >= RTE_PMD_PCAP_MAX_QUEUES) - return -1; if (open_single_rx_pcap(pcap_filename, &pcap) < 0) return -1; - rx->queue[rx->num_of_queue].pcap = pcap; - rx->queue[rx->num_of_queue].name = pcap_filename; - rx->queue[rx->num_of_queue].type = key; - rx->num_of_queue++; + if (add_queue(rx, pcap_filename, key, pcap, NULL) < 0) { + pcap_close(pcap); + return -1; + } return 0; } @@ -693,15 +707,13 @@ struct pmd_devargs { struct pmd_devargs *dumpers = extra_args; pcap_dumper_t *dumper; - if (dumpers->num_of_queue >= RTE_PMD_PCAP_MAX_QUEUES) - return -1; if (open_single_tx_pcap(pcap_filename, &dumper) < 0) return -1; - dumpers->queue[dumpers->num_of_queue].dumper = dumper; - dumpers->queue[dumpers->num_of_queue].name = pcap_filename; - dumpers->queue[dumpers->num_of_queue].type = key; - dumpers->num_of_queue++; + if (add_queue(dumpers, pcap_filename, key, NULL, dumper) < 0) { + pcap_dump_close(dumper); + return -1; + } return 0; } @@ -726,48 +738,39 @@ struct pmd_devargs { return 0; } -/* - * Opens a NIC for reading packets from it - */ static inline int -open_rx_iface(const char *key, const char *value, void *extra_args) +open_iface(const char *key, const char *value, void *extra_args) { const char *iface = value; - struct pmd_devargs *rx = extra_args; + struct pmd_devargs *pmd = extra_args; pcap_t *pcap = NULL; - if (rx->num_of_queue >= RTE_PMD_PCAP_MAX_QUEUES) - return -1; if (open_single_iface(iface, &pcap) < 0) return -1; - rx->queue[rx->num_of_queue].pcap = pcap; - rx->queue[rx->num_of_queue].name = iface; - rx->queue[rx->num_of_queue].type = key; - rx->num_of_queue++; + if (add_queue(pmd, iface, key, pcap, NULL) < 0) { + pcap_close(pcap); + return -1; + } return 0; } /* + * Opens a NIC for reading packets from it + */ +static inline int +open_rx_iface(const char *key, const char *value, void *extra_args) +{ + return open_iface(key, value, extra_args); +} + +/* * Opens a NIC for writing packets to it */ static int open_tx_iface(const char *key, const char *value, void *extra_args) { - const char *iface = value; - struct pmd_devargs *tx = extra_args; - pcap_t *pcap; - - if (tx->num_of_queue >= RTE_PMD_PCAP_MAX_QUEUES) - return -1; - if (open_single_iface(iface, &pcap) < 0) - return -1; - tx->queue[tx->num_of_queue].pcap = pcap; - tx->queue[tx->num_of_queue].name = iface; - tx->queue[tx->num_of_queue].type = key; - tx->num_of_queue++; - - return 0; + return open_iface(key, value, extra_args); } static struct rte_vdev_driver pmd_pcap_drv;