From patchwork Wed Jul 26 15:21:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 793981 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 3xHf5Z35rTz9s7M for ; Thu, 27 Jul 2017 01:23:46 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C3F52BBD; Wed, 26 Jul 2017 15:21:34 +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 EAFF7BAA for ; Wed, 26 Jul 2017 15:21:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 769DE12C for ; Wed, 26 Jul 2017 15:21:31 +0000 (UTC) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OTP00GFRENT4820@mailout2.w1.samsung.com> for ovs-dev@openvswitch.org; Wed, 26 Jul 2017 16:21:29 +0100 (BST) Received: from eusmges1.samsung.com (unknown [203.254.199.239]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170726152128eucas1p2ae8a4fbabc2e55eecacf3204ddbacdb2~U6pH9xkFw1853418534eucas1p2M; Wed, 26 Jul 2017 15:21:28 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1.samsung.com (EUCPMTA) with SMTP id 51.F4.14140.A73B8795; Wed, 26 Jul 2017 16:21:30 +0100 (BST) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170726152127eucas1p14d6737a68c74fc9f87c51338fc389af5~U6pHBAlzK0960809608eucas1p1T; Wed, 26 Jul 2017 15:21:27 +0000 (GMT) X-AuditID: cbfec7ef-f796a6d00000373c-0c-5978b37a7c25 Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id C1.0F.20206.773B8795; Wed, 26 Jul 2017 16:21:27 +0100 (BST) Received: from imaximets.rnd.samsung.ru ([106.109.129.180]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OTP0072GENAYM00@eusync4.samsung.com>; Wed, 26 Jul 2017 16:21:27 +0100 (BST) From: Ilya Maximets To: ovs-dev@openvswitch.org, Bhanuprakash Bodireddy Date: Wed, 26 Jul 2017 18:21:07 +0300 Message-id: <1501082468-22006-4-git-send-email-i.maximets@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1501082468-22006-1-git-send-email-i.maximets@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrLIsWRmVeSWpSXmKPExsWy7djP87pVmysiDeZv0LFY/YvTYuczZYtX kxsYLVr6ZzJbPH+xkNnizpWfbBbTPt9mt7jS/pPdYu2hD+wWcz89Z3Tg8li85yWTx7Ob/xk9 nl/rYfF4v+8qm0ffllWMHu/mv2ULYIvisklJzcksSy3St0vgyrj36S5jwVTxiv7XHxkbGPcI djFyckgImEjcmriWBcIWk7hwbz1bFyMXh5DAMkaJts47UM5nRon1/5azw3RM3NLBCGKDVe04 Hg5R1MwkseTnBjaQBJuAjsSp1UfAikQEIiQefJ/FDlLELLANqOjxJLCEsICZxMnuY2ANLAKq Eu0P7oDFeQXcJG6t+8cIsU1O4ua5TuYuRg4OTgF3idOXFUDmSAh0s0vsWzWDESQuISArsekA M0S5i0Tv46tsELawxKvjW6COlpG4PLmbBaK3mVGiYdUlRghnAqPEl+blTBBV9hKnbl4Fs5kF +CQmbZvODLGAV6KjTQiixEPizo5zULc5Stw9NoUV4vtZjBIv9x1imsAos4CRYRWjSGppcW56 arGhXnFibnFpXrpecn7uJkZgpJ/+d/z9DsanzSGHGAU4GJV4eFdMqYgUYk0sK67MPcQowcGs JMKb2AkU4k1JrKxKLcqPLyrNSS0+xCjNwaIkzst76lqEkEB6YklqdmpqQWoRTJaJg1OqgVHT YMtExqjLvBt/fVl4RuHT1ami0wq2mOc5RbEnXj9wfPmk47WX79hdSEpbJBCrO1t0dv0x3w0+ bEcez2rLnR4nVGF//H6p0P0PQufDOP4UbTUu35FXeL0o4ODhjz+f3v5cpPY6yf/5Nz+uC5Z3 N2ZcvyVt3F465/Qnx8Pl/5Qk3hv/YvgkLJatxFKckWioxVxUnAgAjefN9fACAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRmVeSWpSXmKPExsVy+t/xa7rlmysiDY7OE7JY/YvTYuczZYtX kxsYLVr6ZzJbPH+xkNnizpWfbBbTPt9mt7jS/pPdYu2hD+wWcz89Z3Tg8li85yWTx7Ob/xk9 nl/rYfF4v+8qm0ffllWMHu/mv2ULYItys8lITUxJLVJIzUvOT8nMS7dVCg1x07VQUshLzE21 VYrQ9Q0JUlIoS8wpBfKMDNCAg3OAe7CSvl2CW8a9T3cZC6aKV/S//sjYwLhHsIuRk0NCwERi 4pYORghbTOLCvfVsXYxcHEICSxglNmy+CeW0Mkk8mrKaBaSKTUBH4tTqI2AdIgIREi1z1jOC FDELbGOSeHzhE1iRsICZxMnuY2wgNouAqkT7gztgDbwCbhK31v2DWicncfNcJ3MXIwcHp4C7 xOnLCiBhIaCS26vesExg5F3AyLCKUSS1tDg3PbfYSK84Mbe4NC9dLzk/dxMjMOS3Hfu5ZQdj 17vgQ4wCHIxKPLwBkyoihVgTy4orcw8xSnAwK4nwJnYChXhTEiurUovy44tKc1KLDzGaAt00 kVlKNDkfGI95JfGGJobmloZGxhYW5kZGSuK8Uz9cCRcSSE8sSc1OTS1ILYLpY+LglGpgXP35 U1iYfMGaG6ZinjcNaifwTp5V68eS7P6jL3tdG3NoD+f8gmfX3ZdFldgLJc1YHH3r6rIL7bnc XNM+vv6yfzEvy++lj6f4rz9Ta83QUxG3Ytpjnth/MoEvnFKU2M2ELHzEJrdLz/rksihGucFL /smVLUazT+h/91ISddFTTyhZy3xj94RmJZbijERDLeai4kQAQfZwU48CAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170726152127eucas1p14d6737a68c74fc9f87c51338fc389af5 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?UTF-8?B?SWx5YSBNYXhpbWV0cxtTUlItVmlydHVhbGl6YXRpb24gTGFi?= =?UTF-8?B?G+yCvOyEseyghOyekBtMZWFkaW5nIEVuZ2luZWVy?= X-Global-Sender: =?UTF-8?B?SWx5YSBNYXhpbWV0cxtTUlItVmlydHVhbGl6YXRpb24gTGFi?= =?UTF-8?B?G1NhbXN1bmcgRWxlY3Ryb25pY3MbTGVhZGluZyBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0NJU0hRG0MxMEdEMDFHRDAxMDE1NA==?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170726152127eucas1p14d6737a68c74fc9f87c51338fc389af5 X-RootMTR: 20170726152127eucas1p14d6737a68c74fc9f87c51338fc389af5 References: <1501082468-22006-1-git-send-email-i.maximets@samsung.com> X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 v2 3/4] 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. Signed-off-by: Ilya Maximets --- lib/netdev-bsd.c | 3 --- lib/netdev-dpdk.c | 5 ----- lib/netdev-dummy.c | 2 -- lib/netdev-linux.c | 3 --- 4 files changed, 13 deletions(-) diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c index dfc4225..7454d03 100644 --- a/lib/netdev-bsd.c +++ b/lib/netdev-bsd.c @@ -699,9 +699,6 @@ netdev_bsd_send(struct netdev *netdev_, int qid OVS_UNUSED, const void *data = dp_packet_data(batch->packets[i]); size_t size = dp_packet_size(batch->packets[i]); - /* Truncate the packet if it is configured. */ - size -= dp_packet_get_cutlen(batch->packets[i]); - while (!error) { ssize_t retval; if (dev->tap_fd >= 0) { diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index 581442d..46334b4 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -1757,8 +1757,6 @@ dpdk_do_tx_copy(struct netdev *netdev, int qid, struct dp_packet_batch *batch) int newcnt = 0; int i; - dp_packet_batch_apply_cutlen(batch); - for (i = 0; i < batch->count; i++) { int size = dp_packet_size(batch->packets[i]); @@ -1817,7 +1815,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; @@ -1848,8 +1845,6 @@ netdev_dpdk_send__(struct netdev_dpdk *dev, int qid, int cnt = batch->count; struct rte_mbuf **pkts = (struct rte_mbuf **) batch->packets; - dp_packet_batch_apply_cutlen(batch); - cnt = netdev_dpdk_filter_packet_len(dev, pkts, cnt); cnt = netdev_dpdk_qos_run(dev, pkts, cnt); dropped = batch->count - cnt; diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c index a39246a..9c61f74 100644 --- a/lib/netdev-dummy.c +++ b/lib/netdev-dummy.c @@ -1072,8 +1072,6 @@ netdev_dummy_send(struct netdev *netdev, int qid OVS_UNUSED, break; } - size -= dp_packet_get_cutlen(packet); - if (size < ETH_HEADER_LEN) { error = EMSGSIZE; break; diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index a8b3b7f..30575fb 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -1234,9 +1234,6 @@ netdev_linux_send(struct netdev *netdev_, int qid OVS_UNUSED, size_t size = dp_packet_size(batch->packets[i]); ssize_t retval; - /* Truncate the packet if it is configured. */ - size -= dp_packet_get_cutlen(batch->packets[i]); - if (!is_tap_netdev(netdev_)) { /* Use our AF_PACKET socket to send to this device. */ struct iovec iov;