From patchwork Fri Dec 1 15:44:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 843556 X-Patchwork-Delegate: ian.stokes@intel.com 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=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="vbjo+7FJ"; dkim-atps=neutral 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 3ypJbX20vrz9s9Y for ; Sat, 2 Dec 2017 02:48:56 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 06736C88; Fri, 1 Dec 2017 15:44:59 +0000 (UTC) X-Original-To: ovs-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 4F2D9C8D for ; Fri, 1 Dec 2017 15:44:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id C951E47E for ; Fri, 1 Dec 2017 15:44:57 +0000 (UTC) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20171201154455euoutp01104862e1e1b8d40366ea237c43762b96~8NiI-L2s91301513015euoutp01b; Fri, 1 Dec 2017 15:44:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20171201154455euoutp01104862e1e1b8d40366ea237c43762b96~8NiI-L2s91301513015euoutp01b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1512143095; bh=aOL/BrIjYkEjUbqF3c9F/yRPzA2F4ZxKHlBnxhk/vkM=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=vbjo+7FJKqrRQ/OhHK/8iA6dOT+9DaObpmqI4rSD1h+40DGTAWSTALHIvyuSixIHj LFz6ntG/qIaLPQ4gr+b/d2rGlWUDpKrElZkxal6AHpZoR4x5kg4rekdDCpEUgQllfc nDJsLxXsh7W3vbrm8T+wv7MAd3+cbWB5VhQVeTcc= Received: from eusmges3.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20171201154454eucas1p22dc34ecbaf64ff287abacf24f4fa568d~8NiIWxxVf1818618186eucas1p2S; Fri, 1 Dec 2017 15:44:54 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3.samsung.com (EUCPMTA) with SMTP id 03.58.12867.6F8712A5; Fri, 1 Dec 2017 15:44:54 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20171201154454eucas1p221e2df9d695cc98ec267b262743c932d~8NiHu-x5Q1773517735eucas1p22; Fri, 1 Dec 2017 15:44:54 +0000 (GMT) X-AuditID: cbfec7f2-f793b6d000003243-c0-5a2178f60a69 Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 71.82.18832.6F8712A5; Fri, 1 Dec 2017 15:44:54 +0000 (GMT) Received: from imaximets.rnd.samsung.ru ([106.109.129.180]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0P0A00BWSH2B5A50@eusync3.samsung.com>; Fri, 01 Dec 2017 15:44:54 +0000 (GMT) From: Ilya Maximets To: ovs-dev@openvswitch.org, Bhanuprakash Bodireddy Date: Fri, 01 Dec 2017 18:44:31 +0300 Message-id: <1512143073-22347-6-git-send-email-i.maximets@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1512143073-22347-1-git-send-email-i.maximets@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNIsWRmVeSWpSXmKPExsWy7djP87rfKhSjDFbd0bBY/YvTYuczZYuW /pnMFneu/GSzmPb5NrvFlfaf7BYbH55ltTjy/TSjxdpDH9gt5n56zujA5fHr61U2j8V7XjJ5 PLv5n9Hj/T4gt2/LKsYA1igum5TUnMyy1CJ9uwSujJ5u2YKNMhUzvp5ib2A8J9rFyMkhIWAi sabzMxOELSZx4d56ti5GLg4hgaWMEvu+XWGHcD4zSrTcO8IG0/Hh3WNGiMQyRomOibegnGYm iYMrD7CAVLEJ6EicWn2EEcQWEYiQePB9FtgoZoHTTBJvNi1iBkkIC5hJ7F3/DWwsi4CqxNJZ f8BsXgE3iZn9S6GOkpO4ea4TqJ6Dg1PAXeLIb3GQORICS9gkrs88zgISlxBwkbj7wwqiXFji 1fEt7BC2jERnx0EmiPpmRomGVZcYIZwJjBJfmpdDLbCXOHXzKpjNLMAnMWnbdGaIobwSHW1C ECUeErM334B631Hix/UZYLaQwCxGiRMrtCcwSi9gZFjFKJJaWpybnlpsrFecmFtcmpeul5yf u4kRGMWn/x3/tIPx6wmrQ4wCHIxKPLwM4YpRQqyJZcWVuYcYJTiYlUR4s0qAQrwpiZVVqUX5 8UWlOanFhxilOViUxHlto9oihQTSE0tSs1NTC1KLYLJMHJxSDYxK1jHFD5yNQ2dYHta+JnEm N+HYk/d1SzffS5t0wM5O7rXU4rrGBSqf8+ovbn3yKa3kF3e3udPmFy7qm4z4ucW13+fvWW56 PMz+wRSLGaVWkUw/Er0kQ1UXfAt+8sfktlnPK+Xvrq5TCv1ivW1nrnh6rkxys9V57V0J/leO 3P6mpvaK5WpdWrESS3FGoqEWc1FxIgA/P5i+3gIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrALMWRmVeSWpSXmKPExsVy+t/xq7rfKhSjDBpv8lms/sVpsfOZskVL /0xmiztXfrJZTPt8m93iSvtPdouND8+yWhz5fprRYu2hD+wWcz89Z3Tg8vj19Sqbx+I9L5k8 nt38z+jxfh+Q27dlFWMAaxSXTUpqTmZZapG+XQJXRk+3bMFGmYoZX0+xNzCeE+1i5OSQEDCR +PDuMSOELSZx4d56ti5GLg4hgSWMEhNXXmWBcFqZJH69ecQOUsUmoCNxavURsA4RgQiJljnr GUGKmAXOMkm0nj7OBpIQFjCT2Lv+G5jNIqAqsXTWHzCbV8BNYmb/UiaIdXISN891MncxcnBw CrhLHPktDhIWAirZv3sH4wRG3gWMDKsYRVJLi3PTc4sN9YoTc4tL89L1kvNzNzECw23bsZ+b dzBe2hh8iFGAg1GJh3dFiGKUEGtiWXFl7iFGCQ5mJRHerBKgEG9KYmVValF+fFFpTmrxIUZp DhYlcd7ePasjhQTSE0tSs1NTC1KLYLJMHJxSDYz9b99+uXrF9VPebKE7UwsV5xmmPlLgOZp2 cmaogqO51f+vImsOZG60s2u7p+LA7eF+M8jf4+GKmY/S1ix+5jo1MSP3+eu6ReU/tj2tqDre sb+mq37u4b2FlbGtpmzH+liKDToTl3asyF5aZRSWNk3faMf3CsO0CXtXhS6ZNCfgyhWJgLhr mv+VWIozEg21mIuKEwGEfk3dMwIAAA== X-CMS-MailID: 20171201154454eucas1p221e2df9d695cc98ec267b262743c932d X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20171201154454eucas1p221e2df9d695cc98ec267b262743c932d X-RootMTR: 20171201154454eucas1p221e2df9d695cc98ec267b262743c932d References: <1512143073-22347-1-git-send-email-i.maximets@samsung.com> X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Heetae Ahn , Ilya Maximets Subject: [ovs-dev] [PATCH v6 5/7] netdev: Remove useless cutlen. 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 Cutlen already applied while processing OVS_ACTION_ATTR_OUTPUT. Acked-by: Eelco Chaudron Signed-off-by: Ilya Maximets --- lib/netdev-bsd.c | 2 +- lib/netdev-dpdk.c | 5 ----- lib/netdev-dummy.c | 2 +- lib/netdev-linux.c | 4 ++-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c index 658a5bc..05974c1 100644 --- a/lib/netdev-bsd.c +++ b/lib/netdev-bsd.c @@ -697,7 +697,7 @@ netdev_bsd_send(struct netdev *netdev_, int qid OVS_UNUSED, for (i = 0; i < batch->count; i++) { const void *data = dp_packet_data(batch->packets[i]); - size_t size = dp_packet_get_send_len(batch->packets[i]); + size_t size = dp_packet_size(batch->packets[i]); while (!error) { ssize_t retval; diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index 47cf2dd..7454451 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -1825,8 +1825,6 @@ dpdk_do_tx_copy(struct netdev *netdev, int qid, struct dp_packet_batch *batch) dropped += batch_cnt - cnt; } - dp_packet_batch_apply_cutlen(batch); - uint32_t txcnt = 0; for (uint32_t i = 0; i < cnt; i++) { @@ -1881,7 +1879,6 @@ netdev_dpdk_vhost_send(struct netdev *netdev, int qid, dpdk_do_tx_copy(netdev, qid, batch); dp_packet_delete_batch(batch, true); } else { - dp_packet_batch_apply_cutlen(batch); __netdev_dpdk_vhost_send(netdev, qid, batch->packets, batch->count); } return 0; @@ -1912,8 +1909,6 @@ netdev_dpdk_send__(struct netdev_dpdk *dev, int qid, int batch_cnt = dp_packet_batch_size(batch); struct rte_mbuf **pkts = (struct rte_mbuf **) batch->packets; - dp_packet_batch_apply_cutlen(batch); - tx_cnt = netdev_dpdk_filter_packet_len(dev, pkts, batch_cnt); tx_cnt = netdev_dpdk_qos_run(dev, pkts, tx_cnt, true); dropped = batch_cnt - tx_cnt; diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c index 140e08d..40086a3 100644 --- a/lib/netdev-dummy.c +++ b/lib/netdev-dummy.c @@ -1071,7 +1071,7 @@ netdev_dummy_send(struct netdev *netdev, int qid OVS_UNUSED, struct dp_packet *packet; DP_PACKET_BATCH_FOR_EACH(packet, batch) { const void *buffer = dp_packet_data(packet); - size_t size = dp_packet_get_send_len(packet); + size_t size = dp_packet_size(packet); if (batch->packets[i]->packet_type != htonl(PT_ETH)) { error = EPFNOSUPPORT; diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index 634ff6f..e767567 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -1198,7 +1198,7 @@ netdev_linux_sock_batch_send(int sock, int ifindex, struct dp_packet *packet; DP_PACKET_BATCH_FOR_EACH (packet, batch) { iov[i].iov_base = dp_packet_data(packet); - iov[i].iov_len = dp_packet_get_send_len(packet); + iov[i].iov_len = dp_packet_size(packet); mmsg[i].msg_hdr = (struct msghdr) { .msg_name = &sll, .msg_namelen = sizeof sll, .msg_iov = &iov[i], @@ -1235,7 +1235,7 @@ netdev_linux_tap_batch_send(struct netdev *netdev_, struct netdev_linux *netdev = netdev_linux_cast(netdev_); struct dp_packet *packet; DP_PACKET_BATCH_FOR_EACH (packet, batch) { - size_t size = dp_packet_get_send_len(packet); + size_t size = dp_packet_size(packet); ssize_t retval; int error;