[{"id":1773407,"web_url":"http://patchwork.ozlabs.org/comment/1773407/","msgid":"","list_archive_url":null,"date":"2017-09-22T09:44:25","subject":"Re: [ovs-dev] [PATCH v2 05/12] dpif-netdev: Use\n\tDP_PACKET_BATCH_FOR_EACH in dp_netdev_run_meter.","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\nOn 9/20/17, 6:26 AM, \"ovs-dev-bounces@openvswitch.org on behalf of Bhanuprakash Bodireddy\" wrote:\n\n Use DP_PACKET_BATCH_FOR_EACH macro in dp_netdev_run_meter().\n \n Signed-off-by: Bhanuprakash Bodireddy \n ---\n lib/dpif-netdev.c | 15 +++++++--------\n 1 file changed, 7 insertions(+), 8 deletions(-)\n \n diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c\n index ca74df8..5000f7a 100644\n --- a/lib/dpif-netdev.c\n +++ b/lib/dpif-netdev.c\n @@ -4121,10 +4121,11 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_,\n {\n struct dp_meter *meter;\n struct dp_meter_band *band;\n + struct dp_packet *packet;\n long long int long_delta_t; /* msec */\n uint32_t delta_t; /* msec */\n int i;\n - int cnt = packets_->count;\n + const size_t cnt = dp_packet_batch_size(packets_);\n uint32_t bytes, volume;\n int exceeded_band[NETDEV_MAX_BURST];\n uint32_t exceeded_rate[NETDEV_MAX_BURST];\n @@ -4157,8 +4158,8 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_,\n meter->used = now;\n meter->packet_count += cnt;\n bytes = 0;\n - for (i = 0; i < cnt; i++) {\n - bytes += dp_packet_size(packets_->packets[i]);\n + DP_PACKET_BATCH_FOR_EACH (packet, packets_) {\n + bytes += dp_packet_size(packet);\n }\n meter->byte_count += bytes;\n \n @@ -4208,8 +4209,8 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_,\n } else {\n /* Packet sizes differ, must process one-by-one. */\n band_exceeded_pkt = cnt;\n - for (i = 0; i < cnt; i++) {\n - uint32_t bits = dp_packet_size(packets_->packets[i]) * 8;\n + DP_PACKET_BATCH_FOR_EACH (packet, packets_) {\n + uint32_t bits = dp_packet_size(packet) * 8;\n \n if (band->bucket >= bits) {\n band->bucket -= bits;\n @@ -4237,10 +4238,8 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_,\n /* Fire the highest rate band exceeded by each packet.\n * Drop packets if needed, by swapping packet to the end that will be\n * ignored. */\n - const size_t size = dp_packet_batch_size(packets_);\n - struct dp_packet *packet;\n size_t j;\n - DP_PACKET_BATCH_REFILL_FOR_EACH (j, size, packet, packets_) {\n + DP_PACKET_BATCH_REFILL_FOR_EACH (j, cnt, packet, packets_) {\n if (exceeded_band[j] >= 0) {\n /* Meter drop packet. */\n band = &meter->bands[exceeded_band[j]];\n -- \n 2.4.11\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=MbHPtTOV4k7OTZfYkivyETXRW-2SZ3V7XCDQksqyTcU&s=FDV8TuFGuBjYW5M_SGhWggJ2sPI9Tvmcnv5oQzo5U4k&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=\"UIoy9pgH\"; \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 3xz7tX2G35z9s9Y\n\tfor ;\n\tFri, 22 Sep 2017 19:47:16 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id E6881B49;\n\tFri, 22 Sep 2017 09:44:29 +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 24DEFB1B\n\tfor ; Fri, 22 Sep 2017 09:44:28 +0000 (UTC)","from NAM02-BL2-obe.outbound.protection.outlook.com\n\t(mail-bl2nam02on0049.outbound.protection.outlook.com [104.47.38.49])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id 77F6D17E\n\tfor ; Fri, 22 Sep 2017 09:44:27 +0000 (UTC)","from MWHPR05MB3406.namprd05.prod.outlook.com (10.174.175.155) by\n\tMWHPR05MB3406.namprd05.prod.outlook.com (10.174.175.155) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id\n\t15.20.77.5; Fri, 22 Sep 2017 09:44:26 +0000","from MWHPR05MB3406.namprd05.prod.outlook.com ([10.174.175.155]) by\n\tMWHPR05MB3406.namprd05.prod.outlook.com ([10.174.175.155]) with\n\tmapi id 15.20.0077.007; Fri, 22 Sep 2017 09:44:26 +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=ZVqB9f496mZmeEMpdRNzzkeDcmAMKwHERcW4vwWoOZ0=;\n\tb=UIoy9pgHU6LHFvCvtE6wVad4+VcS+QTXJH5vJ2iCUnmTITlCx/VW1a3InKLY/a6Ny61byKPe8fc0tTF93WzSrHju2y98lbYkQp/jbWOAiS4s0dm1KJo5Z7nLM0RoHMoiBrfI5kmU5tCfHkhzITziy0mCCYqsyD6f3GthK+ZYoM4=","From":"Darrell Ball ","To":"Bhanuprakash Bodireddy ,\n\t\"dev@openvswitch.org\" ","Thread-Topic":"[ovs-dev] [PATCH v2 05/12] dpif-netdev: Use\n\tDP_PACKET_BATCH_FOR_EACH in dp_netdev_run_meter.","Thread-Index":"AQHTM4dg89JPCXBxaE6UNttTQ/GKgw==","Date":"Fri, 22 Sep 2017 09:44:25 +0000","Message-ID":"","References":"<1505913181-82547-1-git-send-email-bhanuprakash.bodireddy@intel.com>\n\t<1505913181-82547-6-git-send-email-bhanuprakash.bodireddy@intel.com>","In-Reply-To":"<1505913181-82547-6-git-send-email-bhanuprakash.bodireddy@intel.com>","Accept-Language":"en-US","Content-Language":"en-US","X-MS-Has-Attach":"","X-MS-TNEF-Correlator":"","user-agent":"Microsoft-MacOutlook/f.26.0.170902","x-originating-ip":"[73.162.236.45]","x-ms-publictraffictype":"Email","x-microsoft-exchange-diagnostics":"1; MWHPR05MB3406;\n\t20:urowauVePfh5xMam/NtkMbR/o+2xRVs+GJHdaZVuHejVmOnebX/qm09aujozefiz3ULql20m9r69kaNCs8ONrb8JAvU2IUYOTwlSdIweOHinDAYXO9Fuf2O9Ms6DEhsrR4Yp0ZjWGAo31pTv+5nA4I2yuzJxoeG2hwaUWNQ3aLo=","x-ms-exchange-antispam-srfa-diagnostics":"SSOS;","x-ms-office365-filtering-correlation-id":"bf26ddcf-7633-49c1-c1d0-08d5019e8339","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:MWHPR05MB3406; ","x-ms-traffictypediagnostic":"MWHPR05MB3406:","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=\"UIoy9pgH\"; \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)(2401047)(8121501046)(5005006)(93006095)(93001095)(100000703101)(100105400095)(10201501046)(3002001)(6041248)(20161123560025)(20161123555025)(20161123562025)(20161123558100)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);\n\tSRVR:MWHPR05MB3406; BCL:0; PCL:0;\n\tRULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);\n\tSRVR:MWHPR05MB3406; ","x-forefront-prvs":"0438F90F17","x-forefront-antispam-report":"SFV:NSPM;\n\tSFS:(10009020)(6009001)(346002)(376002)(189002)(377454003)(199003)(24454002)(86362001)(81156014)(81166006)(97736004)(83506001)(106356001)(8676002)(99286003)(6306002)(7736002)(305945005)(6512007)(6436002)(6486002)(77096006)(58126008)(82746002)(316002)(66066001)(8936002)(6506006)(229853002)(189998001)(110136005)(2900100001)(53546010)(5660300001)(14454004)(6246003)(2501003)(3280700002)(54356999)(76176999)(50986999)(2906002)(101416001)(33656002)(2950100002)(478600001)(83716003)(105586002)(36756003)(102836003)(25786009)(966005)(68736007)(3660700001)(6116002)(53936002)(3846002);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR05MB3406;\n\tH:MWHPR05MB3406.namprd05.prod.outlook.com; FPR:; SPF:None;\n\tPTR:InfoNoRecords; MX:1; A: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":"<9CB8B7E95CE7B04FA7A0FBD51F5227C6@namprd05.prod.outlook.com>","MIME-Version":"1.0","X-OriginatorOrg":"vmware.com","X-MS-Exchange-CrossTenant-originalarrivaltime":"22 Sep 2017 09:44:25.8822\n\t(UTC)","X-MS-Exchange-CrossTenant-fromentityheader":"Hosted","X-MS-Exchange-CrossTenant-id":"b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0","X-MS-Exchange-Transport-CrossTenantHeadersStamped":"MWHPR05MB3406","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 v2 05/12] dpif-netdev: Use\n\tDP_PACKET_BATCH_FOR_EACH in dp_netdev_run_meter.","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"}}]