{"id":815795,"url":"http://patchwork.ozlabs.org/api/patches/815795/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/1505849344-52387-4-git-send-email-bhanuprakash.bodireddy@intel.com/","project":{"id":47,"url":"http://patchwork.ozlabs.org/api/projects/47/?format=json","name":"Open vSwitch","link_name":"openvswitch","list_id":"ovs-dev.openvswitch.org","list_email":"ovs-dev@openvswitch.org","web_url":"http://openvswitch.org/","scm_url":"git@github.com:openvswitch/ovs.git","webscm_url":"https://github.com/openvswitch/ovs","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505849344-52387-4-git-send-email-bhanuprakash.bodireddy@intel.com>","list_archive_url":null,"date":"2017-09-19T19:28:57","name":"[ovs-dev,03/10] netdev-dpdk: Cleanup dpdk_do_tx_copy.","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"10700e23735a7775b67717d2f50b336a4db2bc4e","submitter":{"id":68557,"url":"http://patchwork.ozlabs.org/api/people/68557/?format=json","name":"Bodireddy, Bhanuprakash","email":"bhanuprakash.bodireddy@intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/openvswitch/patch/1505849344-52387-4-git-send-email-bhanuprakash.bodireddy@intel.com/mbox/","series":[{"id":3956,"url":"http://patchwork.ozlabs.org/api/series/3956/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/list/?series=3956","date":"2017-09-19T19:28:54","name":"Use DP_PACKET_BATCH_FOR_EACH macro.","version":1,"mbox":"http://patchwork.ozlabs.org/series/3956/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815795/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815795/checks/","tags":{},"related":[],"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=)","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 3xxYBZ6rbVz9s7p\n\tfor ;\n\tWed, 20 Sep 2017 05:40:38 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 539C7BD6;\n\tTue, 19 Sep 2017 19:38:47 +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 8CA92B79\n\tfor ; Tue, 19 Sep 2017 19:38:43 +0000 (UTC)","from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id 12AC54BF\n\tfor ; Tue, 19 Sep 2017 19:38:43 +0000 (UTC)","from orsmga001.jf.intel.com ([10.7.209.18])\n\tby fmsmga105.fm.intel.com with ESMTP; 19 Sep 2017 12:38:42 -0700","from silpixa00393942.ir.intel.com (HELO\n\tsilpixa00393942.ger.corp.intel.com) ([10.237.223.42])\n\tby orsmga001.jf.intel.com with ESMTP; 19 Sep 2017 12:38:42 -0700"],"X-Greylist":"domain auto-whitelisted by SQLgrey-1.7.6","X-ExtLoop1":"1","X-IronPort-AV":"E=Sophos; i=\"5.42,418,1500966000\"; d=\"scan'208\";\n\ta=\"1173892319\"","From":"Bhanuprakash Bodireddy ","To":"dev@openvswitch.org","Date":"Tue, 19 Sep 2017 20:28:57 +0100","Message-Id":"<1505849344-52387-4-git-send-email-bhanuprakash.bodireddy@intel.com>","X-Mailer":"git-send-email 2.4.11","In-Reply-To":"<1505849344-52387-1-git-send-email-bhanuprakash.bodireddy@intel.com>","References":"<1505849344-52387-1-git-send-email-bhanuprakash.bodireddy@intel.com>","X-Spam-Status":"No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED,\n\tRP_MATCHES_RCVD autolearn=disabled version=3.3.1","X-Spam-Checker-Version":"SpamAssassin 3.3.1 (2010-03-16) on\n\tsmtp1.linux-foundation.org","Subject":"[ovs-dev] [PATCH 03/10] netdev-dpdk: Cleanup dpdk_do_tx_copy.","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","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"ovs-dev-bounces@openvswitch.org","Errors-To":"ovs-dev-bounces@openvswitch.org"},"content":"Clean up dpdk_do_tx_copy()\n\nSigned-off-by: Bhanuprakash Bodireddy \n---\n lib/netdev-dpdk.c | 22 ++++++++++------------\n 1 file changed, 10 insertions(+), 12 deletions(-)","diff":"diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c\nindex 648d719..2078c94 100644\n--- a/lib/netdev-dpdk.c\n+++ b/lib/netdev-dpdk.c\n@@ -1835,22 +1835,23 @@ static void\n dpdk_do_tx_copy(struct netdev *netdev, int qid, struct dp_packet_batch *batch)\n OVS_NO_THREAD_SAFETY_ANALYSIS\n {\n+ const size_t batch_cnt = dp_packet_batch_size(batch);\n #if !defined(__CHECKER__) && !defined(_WIN32)\n- const size_t PKT_ARRAY_SIZE = batch->count;\n+ const size_t PKT_ARRAY_SIZE = batch_cnt;\n #else\n /* Sparse or MSVC doesn't like variable length array. */\n enum { PKT_ARRAY_SIZE = NETDEV_MAX_BURST };\n #endif\n struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);\n struct rte_mbuf *pkts[PKT_ARRAY_SIZE];\n- uint32_t cnt = batch->count;\n+ uint32_t cnt = batch_cnt;\n uint32_t dropped = 0;\n \n if (dev->type != DPDK_DEV_VHOST) {\n /* Check if QoS has been configured for this netdev. */\n cnt = netdev_dpdk_qos_run(dev, (struct rte_mbuf **) batch->packets,\n- cnt, false);\n- dropped += batch->count - cnt;\n+ batch_cnt, false);\n+ dropped += batch_cnt - cnt;\n }\n \n dp_packet_batch_apply_cutlen(batch);\n@@ -1858,8 +1859,8 @@ dpdk_do_tx_copy(struct netdev *netdev, int qid, struct dp_packet_batch *batch)\n uint32_t txcnt = 0;\n \n for (uint32_t i = 0; i < cnt; i++) {\n-\n- uint32_t size = dp_packet_size(batch->packets[i]);\n+ struct dp_packet *packet = batch->packets[i];\n+ uint32_t size = dp_packet_size(packet);\n \n if (OVS_UNLIKELY(size > dev->max_packet_len)) {\n VLOG_WARN_RL(&rl, \"Too big size %u max_packet_len %d\",\n@@ -1870,18 +1871,15 @@ dpdk_do_tx_copy(struct netdev *netdev, int qid, struct dp_packet_batch *batch)\n }\n \n pkts[txcnt] = rte_pktmbuf_alloc(dev->dpdk_mp->mp);\n-\n- if (!pkts[txcnt]) {\n+ if (OVS_UNLIKELY(!pkts[txcnt])) {\n dropped += cnt - i;\n break;\n }\n \n /* We have to do a copy for now */\n memcpy(rte_pktmbuf_mtod(pkts[txcnt], void *),\n- dp_packet_data(batch->packets[i]), size);\n-\n- rte_pktmbuf_data_len(pkts[txcnt]) = size;\n- rte_pktmbuf_pkt_len(pkts[txcnt]) = size;\n+ dp_packet_data(packet), size);\n+ dp_packet_set_size((struct dp_packet *)pkts[txcnt], size);\n \n txcnt++;\n }\n","prefixes":["ovs-dev","03/10"]}