From patchwork Wed Sep 20 13:12:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Bodireddy, Bhanuprakash" X-Patchwork-Id: 816197 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xy0r92F9jz9rxj for ; Wed, 20 Sep 2017 23:26:17 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 4FBCCB1D; Wed, 20 Sep 2017 13:22:48 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 21A40AB9 for ; Wed, 20 Sep 2017 13:22:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id CAE70421 for ; Wed, 20 Sep 2017 13:22:41 +0000 (UTC) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Sep 2017 06:22:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,421,1500966000"; d="scan'208";a="314221704" Received: from silpixa00393942.ir.intel.com (HELO silpixa00393942.ger.corp.intel.com) ([10.237.223.42]) by fmsmga004.fm.intel.com with ESMTP; 20 Sep 2017 06:22:40 -0700 From: Bhanuprakash Bodireddy To: dev@openvswitch.org Date: Wed, 20 Sep 2017 14:12:54 +0100 Message-Id: <1505913181-82547-6-git-send-email-bhanuprakash.bodireddy@intel.com> X-Mailer: git-send-email 2.4.11 In-Reply-To: <1505913181-82547-1-git-send-email-bhanuprakash.bodireddy@intel.com> References: <1505913181-82547-1-git-send-email-bhanuprakash.bodireddy@intel.com> X-Spam-Status: No, score=-5.0 required=5.0 tests=RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v2 05/12] dpif-netdev: Use DP_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: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Use DP_PACKET_BATCH_FOR_EACH macro in dp_netdev_run_meter(). Signed-off-by: Bhanuprakash Bodireddy --- lib/dpif-netdev.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index ca74df8..5000f7a 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -4121,10 +4121,11 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_, { struct dp_meter *meter; struct dp_meter_band *band; + struct dp_packet *packet; long long int long_delta_t; /* msec */ uint32_t delta_t; /* msec */ int i; - int cnt = packets_->count; + const size_t cnt = dp_packet_batch_size(packets_); uint32_t bytes, volume; int exceeded_band[NETDEV_MAX_BURST]; uint32_t exceeded_rate[NETDEV_MAX_BURST]; @@ -4157,8 +4158,8 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_, meter->used = now; meter->packet_count += cnt; bytes = 0; - for (i = 0; i < cnt; i++) { - bytes += dp_packet_size(packets_->packets[i]); + DP_PACKET_BATCH_FOR_EACH (packet, packets_) { + bytes += dp_packet_size(packet); } meter->byte_count += bytes; @@ -4208,8 +4209,8 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_, } else { /* Packet sizes differ, must process one-by-one. */ band_exceeded_pkt = cnt; - for (i = 0; i < cnt; i++) { - uint32_t bits = dp_packet_size(packets_->packets[i]) * 8; + DP_PACKET_BATCH_FOR_EACH (packet, packets_) { + uint32_t bits = dp_packet_size(packet) * 8; if (band->bucket >= bits) { band->bucket -= bits; @@ -4237,10 +4238,8 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_, /* Fire the highest rate band exceeded by each packet. * Drop packets if needed, by swapping packet to the end that will be * ignored. */ - const size_t size = dp_packet_batch_size(packets_); - struct dp_packet *packet; size_t j; - DP_PACKET_BATCH_REFILL_FOR_EACH (j, size, packet, packets_) { + DP_PACKET_BATCH_REFILL_FOR_EACH (j, cnt, packet, packets_) { if (exceeded_band[j] >= 0) { /* Meter drop packet. */ band = &meter->bands[exceeded_band[j]];