From patchwork Thu Sep 29 10:27:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Kavanagh X-Patchwork-Id: 676586 X-Patchwork-Delegate: diproiettod@vmware.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3sl9jx3Lkhz9s5w for ; Thu, 29 Sep 2016 20:27:17 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 1EF5E10664; Thu, 29 Sep 2016 03:27:11 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 2E9F510656 for ; Thu, 29 Sep 2016 03:27:09 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id 9643A161468 for ; Thu, 29 Sep 2016 04:27:08 -0600 (MDT) X-ASG-Debug-ID: 1475144828-0b323776cfdacd0001-byXFYA Received: from mx3-pf2.cudamail.com ([192.168.14.1]) by bar6.cudamail.com with ESMTP id N5Pfp1Ud5fIWDkLp (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 29 Sep 2016 04:27:08 -0600 (MDT) X-Barracuda-Envelope-From: mark.b.kavanagh@intel.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.1 Received: from unknown (HELO mga09.intel.com) (134.134.136.24) by mx3-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 29 Sep 2016 10:27:07 -0000 Received-SPF: pass (mx3-pf2.cudamail.com: SPF record at intel.com designates 134.134.136.24 as permitted sender) X-Barracuda-Apparent-Source-IP: 134.134.136.24 X-Barracuda-RBL-IP: 134.134.136.24 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP; 29 Sep 2016 03:27:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,414,1470726000"; d="scan'208";a="174506992" Received: from silpixa00380299.ir.intel.com ([10.237.222.17]) by fmsmga004.fm.intel.com with ESMTP; 29 Sep 2016 03:27:06 -0700 X-CudaMail-Envelope-Sender: mark.b.kavanagh@intel.com From: Mark Kavanagh To: dev@openvswitch.org X-CudaMail-MID: CM-V2-928003294 X-CudaMail-DTE: 092916 X-CudaMail-Originating-IP: 134.134.136.24 Date: Thu, 29 Sep 2016 11:27:02 +0100 X-ASG-Orig-Subj: [##CM-V2-928003294##][ovs-dev][PATCH 1/2] netdev-dpdk: consistent naming for mbuf variables Message-Id: <1475144823-209138-2-git-send-email-mark.b.kavanagh@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1475144823-209138-1-git-send-email-mark.b.kavanagh@intel.com> References: <1475144823-209138-1-git-send-email-mark.b.kavanagh@intel.com> X-GBUdb-Analysis: 0, 134.134.136.24, Ugly c=0.271956 p=0 Source Normal X-MessageSniffer-Rules: 0-0-0-8512-c X-Barracuda-Connect: UNKNOWN[192.168.14.1] X-Barracuda-Start-Time: 1475144828 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-ASG-Whitelist: EmailCat (corporate) Subject: [ovs-dev] [PATCH 1/2] netdev-dpdk: consistent naming for mbuf variables X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Pointers to struct rte_mbuf are typically denoted within functions as 'pkt'; similarly, arrays of, and pointer-to-pointer to, struct rte_mbuf are denoted by 'pkts'. Update discrepancies to the above convention for consistency. Signed-off-by: Mark Kavanagh --- lib/netdev-dpdk.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index cd7aaef..819a842 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -452,14 +452,14 @@ free_dpdk_buf(struct dp_packet *p) static void ovs_rte_pktmbuf_init(struct rte_mempool *mp, void *opaque_arg OVS_UNUSED, - void *_m, + void *_p, unsigned i OVS_UNUSED) { - struct rte_mbuf *m = _m; + struct rte_mbuf *pkt = _p; - rte_pktmbuf_init(mp, opaque_arg, _m, i); + rte_pktmbuf_init(mp, opaque_arg, _p, i); - dp_packet_init_dpdk((struct dp_packet *) m, m->buf_len); + dp_packet_init_dpdk((struct dp_packet *) pkt, pkt->buf_len); } static struct dpdk_mp * @@ -1553,7 +1553,7 @@ dpdk_do_tx_copy(struct netdev *netdev, int qid, struct dp_packet_batch *batch) enum { PKT_ARRAY_SIZE = NETDEV_MAX_BURST }; #endif struct netdev_dpdk *dev = netdev_dpdk_cast(netdev); - struct rte_mbuf *mbufs[PKT_ARRAY_SIZE]; + struct rte_mbuf *pkts[PKT_ARRAY_SIZE]; int dropped = 0; int newcnt = 0; int i; @@ -1578,34 +1578,34 @@ dpdk_do_tx_copy(struct netdev *netdev, int qid, struct dp_packet_batch *batch) continue; } - mbufs[newcnt] = rte_pktmbuf_alloc(dev->dpdk_mp->mp); + pkts[newcnt] = rte_pktmbuf_alloc(dev->dpdk_mp->mp); - if (!mbufs[newcnt]) { + if (!pkts[newcnt]) { dropped += batch->count - i; break; } /* We have to do a copy for now */ - memcpy(rte_pktmbuf_mtod(mbufs[newcnt], void *), + memcpy(rte_pktmbuf_mtod(pkts[newcnt], void *), dp_packet_data(batch->packets[i]), size); - rte_pktmbuf_data_len(mbufs[newcnt]) = size; - rte_pktmbuf_pkt_len(mbufs[newcnt]) = size; + rte_pktmbuf_data_len(pkts[newcnt]) = size; + rte_pktmbuf_pkt_len(pkts[newcnt]) = size; newcnt++; } if (dev->type == DPDK_DEV_VHOST) { - __netdev_dpdk_vhost_send(netdev, qid, (struct dp_packet **) mbufs, + __netdev_dpdk_vhost_send(netdev, qid, (struct dp_packet **) pkts, newcnt); } else { unsigned int qos_pkts = newcnt; /* Check if QoS has been configured for this netdev. */ - newcnt = netdev_dpdk_qos_run__(dev, mbufs, newcnt); + newcnt = netdev_dpdk_qos_run__(dev, pkts, newcnt); dropped += qos_pkts - newcnt; - netdev_dpdk_eth_tx_burst(dev, qid, mbufs, newcnt); + netdev_dpdk_eth_tx_burst(dev, qid, pkts, newcnt); } if (OVS_UNLIKELY(dropped)) { @@ -1654,15 +1654,15 @@ netdev_dpdk_send__(struct netdev_dpdk *dev, int qid, } else { int dropped; int cnt = batch->count; - struct rte_mbuf **cur_pkts = (struct rte_mbuf **) batch->packets; + struct rte_mbuf **pkts = (struct rte_mbuf **) batch->packets; dp_packet_batch_apply_cutlen(batch); - cnt = netdev_dpdk_filter_packet_len(dev, cur_pkts, cnt); - cnt = netdev_dpdk_qos_run__(dev, cur_pkts, cnt); + cnt = netdev_dpdk_filter_packet_len(dev, pkts, cnt); + cnt = netdev_dpdk_qos_run__(dev, pkts, cnt); dropped = batch->count - cnt; - netdev_dpdk_eth_tx_burst(dev, qid, cur_pkts, cnt); + netdev_dpdk_eth_tx_burst(dev, qid, pkts, cnt); if (OVS_UNLIKELY(dropped)) { rte_spinlock_lock(&dev->stats_lock);