From patchwork Thu Jun 29 22:39:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Bodireddy, Bhanuprakash" X-Patchwork-Id: 782498 X-Patchwork-Delegate: dlu998@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3wzFGk6hFsz9s82 for ; Fri, 30 Jun 2017 08:49:50 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 498B3AF5; Thu, 29 Jun 2017 22:48:15 +0000 (UTC) X-Original-To: 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 70FB69EE for ; Thu, 29 Jun 2017 22:48:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id BB4E21E2 for ; Thu, 29 Jun 2017 22:48:08 +0000 (UTC) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jun 2017 15:48:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.40,283,1496127600"; d="scan'208"; a="1188756652" Received: from silpixa00393942.ir.intel.com (HELO silpixa00393942.ger.corp.intel.com) ([10.237.223.42]) by fmsmga002.fm.intel.com with ESMTP; 29 Jun 2017 15:48:07 -0700 From: Bhanuprakash Bodireddy To: dev@openvswitch.org Date: Thu, 29 Jun 2017 23:39:31 +0100 Message-Id: <1498775976-4142-2-git-send-email-bhanuprakash.bodireddy@intel.com> X-Mailer: git-send-email 2.4.11 In-Reply-To: <1498775976-4142-1-git-send-email-bhanuprakash.bodireddy@intel.com> References: <1498775976-4142-1-git-send-email-bhanuprakash.bodireddy@intel.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 Subject: [ovs-dev] [PATCH v3 1/6] netdev: Add netdev_txq_flush function. 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 Add netdev_txq_flush(), that flush packets on a queue. This is needed to transmit packets on the intermediate queue. Signed-off-by: Bhanuprakash Bodireddy Signed-off-by: Antonio Fischetti Co-authored-by: Antonio Fischetti Signed-off-by: Markus Magnusson Co-authored-by: Markus Magnusson Acked-by: Eelco Chaudron --- lib/netdev-bsd.c | 1 + lib/netdev-dpdk.c | 26 +++++++++++++++++++++----- lib/netdev-dummy.c | 1 + lib/netdev-linux.c | 1 + lib/netdev-provider.h | 8 ++++++++ lib/netdev-vport.c | 2 +- lib/netdev.c | 9 +++++++++ lib/netdev.h | 1 + 8 files changed, 43 insertions(+), 6 deletions(-) diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c index 6cc83d3..6305852 100644 --- a/lib/netdev-bsd.c +++ b/lib/netdev-bsd.c @@ -1549,6 +1549,7 @@ netdev_bsd_update_flags(struct netdev *netdev_, enum netdev_flags off, netdev_bsd_rxq_recv, \ netdev_bsd_rxq_wait, \ netdev_bsd_rxq_drain, \ + NULL, \ \ NO_OFFLOAD_API \ } diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index 5ad9244..9ca4433 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -1892,6 +1892,17 @@ netdev_dpdk_send__(struct netdev_dpdk *dev, int qid, } } +/* Flush tx queues + * This is done periodically to empty the intermediate queue in case of + * few packets (< INTERIM_QUEUE_BURST_THRESHOLD) buffered in the queue. + */ +static int +netdev_dpdk_txq_flush(struct netdev *netdev OVS_UNUSED, + int qid OVS_UNUSED, bool concurrent_txq OVS_UNUSED) +{ + return 0; +} + static int netdev_dpdk_eth_send(struct netdev *netdev, int qid, struct dp_packet_batch *batch, bool may_steal, @@ -3241,7 +3252,7 @@ unlock: SET_CONFIG, SET_TX_MULTIQ, SEND, \ GET_CARRIER, GET_STATS, \ GET_FEATURES, GET_STATUS, \ - RECONFIGURE, RXQ_RECV) \ + RECONFIGURE, RXQ_RECV, TXQ_FLUSH) \ { \ NAME, \ true, /* is_pmd */ \ @@ -3309,6 +3320,7 @@ unlock: RXQ_RECV, \ NULL, /* rx_wait */ \ NULL, /* rxq_drain */ \ + TXQ_FLUSH, /* txq_flush */ \ NO_OFFLOAD_API \ } @@ -3326,7 +3338,8 @@ static const struct netdev_class dpdk_class = netdev_dpdk_get_features, netdev_dpdk_get_status, netdev_dpdk_reconfigure, - netdev_dpdk_rxq_recv); + netdev_dpdk_rxq_recv, + netdev_dpdk_txq_flush); static const struct netdev_class dpdk_ring_class = NETDEV_DPDK_CLASS( @@ -3342,7 +3355,8 @@ static const struct netdev_class dpdk_ring_class = netdev_dpdk_get_features, netdev_dpdk_get_status, netdev_dpdk_reconfigure, - netdev_dpdk_rxq_recv); + netdev_dpdk_rxq_recv, + NULL); static const struct netdev_class dpdk_vhost_class = NETDEV_DPDK_CLASS( @@ -3358,7 +3372,8 @@ static const struct netdev_class dpdk_vhost_class = NULL, NULL, netdev_dpdk_vhost_reconfigure, - netdev_dpdk_vhost_rxq_recv); + netdev_dpdk_vhost_rxq_recv, + NULL); static const struct netdev_class dpdk_vhost_client_class = NETDEV_DPDK_CLASS( "dpdkvhostuserclient", @@ -3373,7 +3388,8 @@ static const struct netdev_class dpdk_vhost_client_class = NULL, NULL, netdev_dpdk_vhost_client_reconfigure, - netdev_dpdk_vhost_rxq_recv); + netdev_dpdk_vhost_rxq_recv, + NULL); void netdev_dpdk_register(void) diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c index 51d29d5..a9e69d3 100644 --- a/lib/netdev-dummy.c +++ b/lib/netdev-dummy.c @@ -1415,6 +1415,7 @@ netdev_dummy_update_flags(struct netdev *netdev_, netdev_dummy_rxq_recv, \ netdev_dummy_rxq_wait, \ netdev_dummy_rxq_drain, \ + NULL, \ \ NO_OFFLOAD_API \ } diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index e1d8701..8e08ed5 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -2876,6 +2876,7 @@ netdev_linux_update_flags(struct netdev *netdev_, enum netdev_flags off, netdev_linux_rxq_recv, \ netdev_linux_rxq_wait, \ netdev_linux_rxq_drain, \ + NULL, \ \ FLOW_OFFLOAD_API \ } diff --git a/lib/netdev-provider.h b/lib/netdev-provider.h index 3c3c181..af010b3 100644 --- a/lib/netdev-provider.h +++ b/lib/netdev-provider.h @@ -343,6 +343,11 @@ struct netdev_class { * If the function returns a non-zero value, some of the packets might have * been sent anyway. * + * Some netdev provider - like in case of 'dpdk' - may buffer the batch + * of packets into an intermediate queue. Buffered packets shall be + * transmitted when the packet count exceeds a threshold (or) by the + * periodic call to the flush function. + * * If 'may_steal' is false, the caller retains ownership of all the * packets. If 'may_steal' is true, the caller transfers ownership of all * the packets to the network device, regardless of success. @@ -784,6 +789,9 @@ struct netdev_class { /* Discards all packets waiting to be received from 'rx'. */ int (*rxq_drain)(struct netdev_rxq *rx); + /* Flush all packets waiting to be sent on 'qid' queue. */ + int (*txq_flush)(struct netdev *netdev, int qid, bool concurrent_txq); + /* ## -------------------------------- ## */ /* ## netdev flow offloading functions ## */ /* ## -------------------------------- ## */ diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index 7de58b8..bc9f78d 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -950,10 +950,10 @@ netdev_vport_get_ifindex(const struct netdev *netdev_) NULL, /* rx_recv */ \ NULL, /* rx_wait */ \ NULL, /* rx_drain */ \ + NULL, /* tx_flush */ \ \ NETDEV_FLOW_OFFLOAD_API - #define TUNNEL_CLASS(NAME, DPIF_PORT, BUILD_HEADER, PUSH_HEADER, POP_HEADER, \ GET_IFINDEX) \ { DPIF_PORT, \ diff --git a/lib/netdev.c b/lib/netdev.c index a7840a8..b3fa0dd 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -700,6 +700,15 @@ netdev_rxq_drain(struct netdev_rxq *rx) : 0); } +/* Flush packets on the 'qid' queue. */ +int +netdev_txq_flush(struct netdev *netdev, int qid, bool netdev_txq_flush) +{ + return (netdev->netdev_class->txq_flush + ? netdev->netdev_class->txq_flush(netdev, qid, netdev_txq_flush) + : EOPNOTSUPP); +} + /* Configures the number of tx queues of 'netdev'. Returns 0 if successful, * otherwise a positive errno value. * diff --git a/lib/netdev.h b/lib/netdev.h index 998f942..5032e38 100644 --- a/lib/netdev.h +++ b/lib/netdev.h @@ -183,6 +183,7 @@ int netdev_rxq_drain(struct netdev_rxq *); int netdev_send(struct netdev *, int qid, struct dp_packet_batch *, bool may_steal, bool concurrent_txq); void netdev_send_wait(struct netdev *, int qid); +int netdev_txq_flush(struct netdev *, int qid, bool concurrent_txq); /* Flow offloading. */ struct offload_info {