[{"id":1761993,"web_url":"http://patchwork.ozlabs.org/comment/1761993/","msgid":"<7EB635BA-3385-4089-9C71-196977E2EEB9@vmware.com>","list_archive_url":null,"date":"2017-09-01T21:28:07","subject":"Re: [ovs-dev] [PATCH] dpif-netdev: Rename \"size\" variable to \"cnt\".","submitter":{"id":68212,"url":"http://patchwork.ozlabs.org/api/people/68212/","name":"Darrell Ball","email":"dball@vmware.com"},"content":"I applied the patch to dpdk_merge here\n\nhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_darball_ovs_commits_dpdk-5Fmerge&d=DwIGaQ&c=uilaK90D4TOVoH58JNXRgQ&r=BVhFA09CGX7JQ5Ih-uZnsw&m=A2_FCacqbp2moAo3HGFlTuxsjONUGhlN42OBcAuQQ6w&s=b6btPKhgvOFr2GOUYvktND6kaC6jc3fXI-mXfvNgXOU&e=\n\n\n \n On 9/1/17, 6:01 AM, \"ovs-dev-bounces@openvswitch.org on behalf of Cian Ferriter\" wrote:\n \n Commit 72c84bc (dp-packet: Enhance packet batch APIs.) changed how the amount\n of packets to be processed is retrieved. In the process, the patch used \"size\"\n as the variable holding the amount of packets rather than \"cnt\". Change this\n back to match with the \"emc_processing()\" comment.\n \n Signed-off-by: Cian Ferriter \n ---\n Alternatively the comment above \"emc_processing()\" could be changed:\n -/* Try to process all ('cnt') the 'packets' using only the exact match cache\n +/* Try to process all ('size') the 'packets' using only the exact match cache\n \n lib/dpif-netdev.c | 8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n \n diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c\n index 071ec14..08db217 100644\n --- a/lib/dpif-netdev.c\n +++ b/lib/dpif-netdev.c\n @@ -4872,13 +4872,13 @@ emc_processing(struct dp_netdev_pmd_thread *pmd,\n struct netdev_flow_key *key = &keys[0];\n size_t n_missed = 0, n_dropped = 0;\n struct dp_packet *packet;\n - const size_t size = dp_packet_batch_size(packets_);\n + const size_t cnt = dp_packet_batch_size(packets_);\n uint32_t cur_min;\n int i;\n \n atomic_read_relaxed(&pmd->dp->emc_insert_min, &cur_min);\n \n - DP_PACKET_BATCH_REFILL_FOR_EACH (i, size, packet, packets_) {\n + DP_PACKET_BATCH_REFILL_FOR_EACH (i, cnt, packet, packets_) {\n struct dp_netdev_flow *flow;\n \n if (OVS_UNLIKELY(dp_packet_size(packet) < ETH_HEADER_LEN)) {\n @@ -4887,7 +4887,7 @@ emc_processing(struct dp_netdev_pmd_thread *pmd,\n continue;\n }\n \n - if (i != size - 1) {\n + if (i != cnt - 1) {\n struct dp_packet **packets = packets_->packets;\n /* Prefetch next packet data and metadata. */\n OVS_PREFETCH(dp_packet_data(packets[i+1]));\n @@ -4918,7 +4918,7 @@ emc_processing(struct dp_netdev_pmd_thread *pmd,\n }\n \n dp_netdev_count_packet(pmd, DP_STAT_EXACT_HIT,\n - size - n_dropped - n_missed);\n + cnt - n_dropped - n_missed);\n \n return dp_packet_batch_size(packets_);\n }\n -- \n 1.7.0.7\n \n _______________________________________________\n dev mailing list\n dev@openvswitch.org\n https://urldefense.proofpoint.com/v2/url?u=https-3A__mail.openvswitch.org_mailman_listinfo_ovs-2Ddev&d=DwICAg&c=uilaK90D4TOVoH58JNXRgQ&r=BVhFA09CGX7JQ5Ih-uZnsw&m=YhIBIOieNxH33xwsgt2o4hQ-0Tb35mwXpQdq_bkRMNc&s=fzlkWYRv_fESeA4LIgGGvW0mkT44D8qUK1EdA8GN740&e=","headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","dev@openvswitch.org"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","ovs-dev@mail.linuxfoundation.org"],"Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=openvswitch.org\n\t(client-ip=140.211.169.12; helo=mail.linuxfoundation.org;\n\tenvelope-from=ovs-dev-bounces@openvswitch.org;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=onevmw.onmicrosoft.com\n\theader.i=@onevmw.onmicrosoft.com header.b=\"jD4Ixe+q\"; \n\tdkim-atps=neutral","spf=none (sender IP is )\n\tsmtp.mailfrom=dball@vmware.com; "],"Received":["from mail.linuxfoundation.org (mail.linuxfoundation.org\n\t[140.211.169.12])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xkXRm4jkZz9sPm\n\tfor ;\n\tSat, 2 Sep 2017 07:28:52 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 4B26CE71;\n\tFri, 1 Sep 2017 21:28:11 +0000 (UTC)","from smtp1.linuxfoundation.org (smtp1.linux-foundation.org\n\t[172.17.192.35])\n\tby mail.linuxfoundation.org (Postfix) with ESMTPS id 71304E4C\n\tfor ; Fri, 1 Sep 2017 21:28:10 +0000 (UTC)","from NAM02-BL2-obe.outbound.protection.outlook.com\n\t(mail-bl2nam02on0072.outbound.protection.outlook.com [104.47.38.72])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id BB59D466\n\tfor ; Fri, 1 Sep 2017 21:28:09 +0000 (UTC)","from BLUPR05MB611.namprd05.prod.outlook.com (10.141.204.27) by\n\tBLUPR05MB354.namprd05.prod.outlook.com (10.141.25.15) with Microsoft\n\tSMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id\n\t15.20.35.3; Fri, 1 Sep 2017 21:28:07 +0000","from BLUPR05MB611.namprd05.prod.outlook.com ([10.141.204.27]) by\n\tBLUPR05MB611.namprd05.prod.outlook.com ([10.141.204.27]) with mapi id\n\t15.20.0035.002; Fri, 1 Sep 2017 21:28:07 +0000"],"X-Greylist":"whitelisted by SQLgrey-1.7.6","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=onevmw.onmicrosoft.com; s=selector1-vmware-com;\n\th=From:Date:Subject:Message-ID:Content-Type:MIME-Version;\n\tbh=nvV5q+H2oNhwXoci6c5ZR4FBWUXBnTDR6irztKeNlN8=;\n\tb=jD4Ixe+qqi0EFQDMWk0/wqiqqKgD4sEbA/fZBNqDBcFjm7VtFRXgQfVFpCvnxEOVl0QawjrRTbuEkMQoBzE6+CcD7yL9Qu0B516GFoNcVaY7A/UDRYnTGav04yeW2XVSjJc3pnTjh1Zsb0OEMRCsBIREbsiPXLETeEtcQmpVIVQ=","From":"Darrell Ball ","To":"\"dev@openvswitch.org\" , \"Ferriter, Cian\"\n\t","Thread-Topic":"[ovs-dev] [PATCH] dpif-netdev: Rename \"size\" variable to \"cnt\".","Thread-Index":"AQHTIyKLoZHbrV0cp0ajoU2TWh0FZqKfuDIAgABel4A=","Date":"Fri, 1 Sep 2017 21:28:07 +0000","Message-ID":"<7EB635BA-3385-4089-9C71-196977E2EEB9@vmware.com>","References":"<1504270911-8294-1-git-send-email-cian.ferriter@intel.com>\n\t<13855EE6-713A-4676-9D9F-C6E8D5049893@vmware.com>","In-Reply-To":"<13855EE6-713A-4676-9D9F-C6E8D5049893@vmware.com>","Accept-Language":"en-US","Content-Language":"en-US","X-MS-Has-Attach":"","X-MS-TNEF-Correlator":"","user-agent":"Microsoft-MacOutlook/f.23.0.170610","x-originating-ip":"[73.162.236.45]","x-ms-publictraffictype":"Email","x-microsoft-exchange-diagnostics":"1; BLUPR05MB354;\n\t20:4C8Yg26o9MWfUa3jdt05Pde0YxdoMZEO1GhGGr7QqhNrKqgdngem4AFhsSrSfB3FmNbmj/Kzb2HEyBavsXcXOokvG62/Pv5L70oGnrxDWlDm90+30Qe66IB+Qv35djHIg0H2qHWBNDR4Y/SwJnwQg7KJTtAafP/QKBvGTQIhtoI=","x-ms-exchange-antispam-srfa-diagnostics":"SSOS;","x-ms-office365-filtering-correlation-id":"500e1f4f-e2ad-4d69-7eae-08d4f18056b6","x-microsoft-antispam":"UriScan:; BCL:0; PCL:0;\n\tRULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);\n\tSRVR:BLUPR05MB354; ","x-ms-traffictypediagnostic":"BLUPR05MB354:","authentication-results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=openvswitch.org\n\t(client-ip=140.211.169.12; helo=mail.linuxfoundation.org;\n\tenvelope-from=ovs-dev-bounces@openvswitch.org;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=onevmw.onmicrosoft.com\n\theader.i=@onevmw.onmicrosoft.com header.b=\"jD4Ixe+q\"; \n\tdkim-atps=neutral","spf=none (sender IP is )\n\tsmtp.mailfrom=dball@vmware.com; "],"x-exchange-antispam-report-test":"UriScan:(10436049006162)(216315784871565)(228905959029699); ","x-microsoft-antispam-prvs":"","x-exchange-antispam-report-cfa-test":"BCL:0; PCL:0;\n\tRULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(3002001)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123564025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);\n\tSRVR:BLUPR05MB354; BCL:0; PCL:0;\n\tRULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);\n\tSRVR:BLUPR05MB354; ","x-forefront-prvs":"0417A3FFD2","x-forefront-antispam-report":"SFV:NSPM;\n\tSFS:(10009020)(6009001)(199003)(377454003)(24454002)(189002)(478600001)(6512007)(83506001)(106356001)(3846002)(102836003)(6116002)(99286003)(25786009)(966005)(101416001)(6436002)(86362001)(575784001)(105586002)(5660300001)(14454004)(4001350100001)(83716003)(2501003)(36756003)(53546010)(2900100001)(53936002)(68736007)(2950100002)(6246003)(305945005)(229853002)(82746002)(50986999)(76176999)(2906002)(66066001)(77096006)(6486002)(6506006)(54356999)(3280700002)(81166006)(8936002)(81156014)(6306002)(97736004)(33656002)(189998001)(3660700001)(8676002)(7736002);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR05MB354;\n\tH:BLUPR05MB611.namprd05.prod.outlook.com; FPR:; SPF:None;\n\tPTR:InfoNoRecords; A:1; MX:1; LANG:en; ","received-spf":"None (protection.outlook.com: vmware.com does not designate\n\tpermitted sender hosts)","spamdiagnosticoutput":"1:99","spamdiagnosticmetadata":"NSPM","Content-ID":"<1C7AF952FC70E54E8AC1FD47B82483D9@namprd05.prod.outlook.com>","MIME-Version":"1.0","X-OriginatorOrg":"vmware.com","X-MS-Exchange-CrossTenant-originalarrivaltime":"01 Sep 2017 21:28:07.8522\n\t(UTC)","X-MS-Exchange-CrossTenant-fromentityheader":"Hosted","X-MS-Exchange-CrossTenant-id":"b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0","X-MS-Exchange-Transport-CrossTenantHeadersStamped":"BLUPR05MB354","X-Spam-Status":"No, score=0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,\n\tRCVD_IN_DNSWL_NONE autolearn=disabled version=3.3.1","X-Spam-Checker-Version":"SpamAssassin 3.3.1 (2010-03-16) on\n\tsmtp1.linux-foundation.org","Subject":"Re: [ovs-dev] [PATCH] dpif-netdev: Rename \"size\" variable to \"cnt\".","X-BeenThere":"ovs-dev@openvswitch.org","X-Mailman-Version":"2.1.12","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"ovs-dev-bounces@openvswitch.org","Errors-To":"ovs-dev-bounces@openvswitch.org"}}]