From patchwork Thu Oct 5 15:05:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 821875 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 3y7GQN1F1Gz9sNw for ; Fri, 6 Oct 2017 02:09:32 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 5B827A85; Thu, 5 Oct 2017 15:06:32 +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 D29E0A59 for ; Thu, 5 Oct 2017 15:06:30 +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 68838367 for ; Thu, 5 Oct 2017 15:06:30 +0000 (UTC) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20171005150628euoutp0103343e60fefc2e32594a879a04d56864~qtPSrmh471770317703euoutp01D; Thu, 5 Oct 2017 15:06:28 +0000 (GMT) Received: from eusmges1.samsung.com (unknown [203.254.199.239]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20171005150627eucas1p25c8afb9fdf873f1424f7cd2f7e7985d3~qtPSCE4Fm2619726197eucas1p2t; Thu, 5 Oct 2017 15:06:27 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1.samsung.com (EUCPMTA) with SMTP id 8A.14.12576.37A46D95; Thu, 5 Oct 2017 16:06:27 +0100 (BST) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20171005150626eucas1p232290df4b9d3129f3e304dedf877e54b~qtPRUeEt82867728677eucas1p2t; Thu, 5 Oct 2017 15:06:26 +0000 (GMT) X-AuditID: cbfec7ef-f79ee6d000003120-3a-59d64a73c03c Received: from eusync2.samsung.com ( [203.254.199.212]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 60.12.18832.27A46D95; Thu, 5 Oct 2017 16:06:26 +0100 (BST) Received: from imaximets.rnd.samsung.ru ([106.109.129.180]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OXC0096ZVA4TQ80@eusync2.samsung.com>; Thu, 05 Oct 2017 16:06:26 +0100 (BST) From: Ilya Maximets To: ovs-dev@openvswitch.org, Bhanuprakash Bodireddy Date: Thu, 05 Oct 2017 18:05:59 +0300 Message-id: <1507215962-17692-5-git-send-email-i.maximets@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1507215962-17692-1-git-send-email-i.maximets@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPIsWRmVeSWpSXmKPExsWy7djPc7rFXtciDQ68E7RY/YvTYuczZYuW /pnMFs9fLGS2uHPlJ5vFtM+32S2utP9ktzjy/TSjxdpDH9gt5n56zujA5fHr61U2j8V7XjJ5 PLv5n9Hj/T4gt2/LKkaPd/PfsgWwRXHZpKTmZJalFunbJXBlfD++nrngi0zFzLezGBsY34t2 MXJySAiYSPz+e58JwhaTuHBvPVsXIxeHkMAyRokTC3czgiSEBD4zSuz+HQ3T8OLoRVa4onnX 57BAOM1MErdeg7RzcrAJ6EicWn0ErFtEIELiwfdZ7CA2s8BJJolnc0NBbGEBM4mpu/6xgNgs AqoS/192AU3l4OAVcJN41ZkFsUxO4ua5TmYQm1PAXeLCjs+MEPE1bBJbblpA2C4SC77MZIWw hSVeHd/CDmHLSHR2HGQCuU1CoJlRomHVJUYIZwKjxJfm5VA/20ucunmVCeI4PolJ26Yzgxwh IcAr0dEmBFHiIXH0JkzYUeJYRynEv7MYJWYebmCawCi9gJFhFaNIamlxbnpqsaFecWJucWle ul5yfu4mRmA0n/53/P0OxqfNIYcYBTgYlXh4GR5ciRRiTSwrrsw9xCjBwawkwtvoei1SiDcl sbIqtSg/vqg0J7X4EKM0B4uSOK9tVFukkEB6YklqdmpqQWoRTJaJg1OqgbGe0ZifpcOxqWPv p7fmWoL2Hw1uHAjLMuMU+fSi9NDDPV/jWp/as1yfMFeg0JPlq5H5qp95r4QlLl1fLa6nv6Q3 /8gqy4uWLYLNL4WcM1+tMgsP+nF8cW7K+kvHbslcvXGfze/kGYmaae37vuRtuvRGLyogbPks cd+ZMWyLFW+q3hZS+tW+nlOJpTgj0VCLuag4EQCbwD4j4gIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGLMWRmVeSWpSXmKPExsVy+t/xK7pFXtciDTY1K1qs/sVpsfOZskVL /0xmi+cvFjJb3Lnyk81i2ufb7BZX2n+yWxz5fprRYu2hD+wWcz89Z3Tg8vj19Sqbx+I9L5k8 nt38z+jxfh+Q27dlFaPHu/lv2QLYorhsUlJzMstSi/TtErgyvh9fz1zwRaZi5ttZjA2M70W7 GDk5JARMJF4cvcgKYYtJXLi3nq2LkYtDSGAJo8SJhoesEE4rk8SSuedYQKrYBHQkTq0+wghi iwhESLTMWc8IUsQscJpJon/xebBRwgJmElN3/QNrYBFQlfj/sgsozsHBK+Am8aozC2KbnMTN c53MIDangLvEhR2fwWYKAZVMX9TGNIGRdwEjwypGkdTS4tz03GJDveLE3OLSvHS95PzcTYzA 0Nt27OfmHYyXNgYfYhTgYFTi4fXYejVSiDWxrLgy9xCjBAezkghvo+u1SCHelMTKqtSi/Pii 0pzU4kOM0hwsSuK8vXtWRwoJpCeWpGanphakFsFkmTg4pRoYF8S7/T6yyoyVyfu8L//R9Ljj bkxPbS6Fzjypy+1/90yqdlNob5nX2QfKAh1Tn/53uG6Q+b178bfZpi/mTPtgfbtZWVsvwUnT /ESKhHWw6dq8ifsmBB50LPm696nWK4FZRi6mytqN7QycDWs2OLQsexdzrSGz8avbknwR3U+m uyVb3FU2KtYqsRRnJBpqMRcVJwIAkUUsMjkCAAA= X-CMS-MailID: 20171005150626eucas1p232290df4b9d3129f3e304dedf877e54b X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?utf-8?q?Ilya_Maximets=1BSRR-Virtualization_Lab=1B?= =?utf-8?b?7IK87ISx7KCE7J6QG0xlYWRpbmcgRW5naW5lZXI=?= X-Global-Sender: =?utf-8?q?Ilya_Maximets=1BSRR-Virtualization_Lab=1BSamsu?= =?utf-8?q?ng_Electronics=1BLeading_Engineer?= X-Sender-Code: =?utf-8?q?C10=1BCISHQ=1BC10GD01GD010154?= CMS-TYPE: 201P X-CMS-RootMailID: 20171005150626eucas1p232290df4b9d3129f3e304dedf877e54b X-RootMTR: 20171005150626eucas1p232290df4b9d3129f3e304dedf877e54b References: <1507215962-17692-1-git-send-email-i.maximets@samsung.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 Cc: Heetae Ahn , Ilya Maximets Subject: [ovs-dev] [PATCH v4 4/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. Signed-off-by: Ilya Maximets Acked-by: Eelco Chaudron --- 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 4f243b5..7454d03 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 011c6f7..300a0ae 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -1851,8 +1851,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); - for (uint32_t i = 0; i < cnt; i++) { struct dp_packet *packet = batch->packets[i]; uint32_t size = dp_packet_size(packet); @@ -1905,7 +1903,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; @@ -1936,8 +1933,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); dropped = batch_cnt - tx_cnt; diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c index 57ef13f..1f846b5 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 aaf4899..e70cef3 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -1197,7 +1197,7 @@ netdev_linux_sock_batch_send(int sock, int ifindex, for (int i = 0; i < batch->count; i++) { struct dp_packet *packet = batch->packets[i]; 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], @@ -1234,7 +1234,7 @@ netdev_linux_tap_batch_send(struct netdev *netdev_, struct netdev_linux *netdev = netdev_linux_cast(netdev_); for (int i = 0; i < batch->count; i++) { struct dp_packet *packet = batch->packets[i]; - size_t size = dp_packet_get_send_len(packet); + size_t size = dp_packet_size(packet); ssize_t retval; int error;