From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A7F1BA0583 for ; Thu, 19 Mar 2020 00:01:52 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9C284CF3; Thu, 19 Mar 2020 00:01:52 +0100 (CET) Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [63.128.21.74]) by dpdk.org (Postfix) with ESMTP id 4747DCF3 for ; Thu, 19 Mar 2020 00:01:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584572510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=cscjr/IAjo+jbhtVP7db4Ht3+UziCb8PF1zHQxTEDNU=; b=BYpj2xetbrrzVkJTs6Y9tZOpmF7vYg84MCLnpXyGOBrg+pK4UEsyFrVVqRCq49E86APAfW xvSY/H6hVJb9RW8xugZF32PkZVUn3yZF3hi5k9ongcq4Db/v2cUfQAjB+Adbt9DqeOCzRR GzcWEcxmG4IEpX/0pOOF/uqoGfum5J4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-210-yyR9W3drPq-pCot8-bCMxA-1; Wed, 18 Mar 2020 19:01:49 -0400 X-MC-Unique: yyR9W3drPq-pCot8-bCMxA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2A959DB60; Wed, 18 Mar 2020 23:01:48 +0000 (UTC) Received: from [10.33.36.217] (unknown [10.33.36.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 536FB1001938; Wed, 18 Mar 2020 23:01:47 +0000 (UTC) To: Marvin Liu , stable@dpdk.org References: <20200316123544.33536-1-yong.liu@intel.com> From: Kevin Traynor Autocrypt: addr=ktraynor@redhat.com; keydata= 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 Message-ID: Date: Wed, 18 Mar 2020 23:01:46 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200316123544.33536-1-yong.liu@intel.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-stable] [PATCH 18.11] net/virtio: cleanup on demand when in-order Tx X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On 16/03/2020 12:35, Marvin Liu wrote: > [ upstream commit e76097f8489a0c4c8044f3382ad81452c4771624 ] > > Check whether space are enough before burst enqueue operation. If more > space is needed, will try to clean up used descriptors for space on > demand. It can give more chances to free used descriptors, thus will > help RFC2544 performance. Also deduct failed xmit packets from total > xmit number. > > Fixes: e5f456a98d3c ("net/virtio: support in-order Rx and Tx") > > Signed-off-by: Marvin Liu > Reviewed-by: Maxime Coquelin > > diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c > index 306009d96..2bbda8525 100644 > --- a/drivers/net/virtio/virtio_rxtx.c > +++ b/drivers/net/virtio/virtio_rxtx.c > @@ -1471,6 +1471,21 @@ virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) > return nb_tx; > } > > +static __rte_always_inline int > +virtio_xmit_try_cleanup_inorder(struct virtqueue *vq, uint16_t need) > +{ > + uint16_t nb_used, nb_clean, nb_descs; > + > + nb_descs = vq->vq_free_cnt + need; > + nb_used = VIRTQUEUE_NUSED(vq); > + virtio_rmb(); > + nb_clean = RTE_MIN(need, (int)nb_used); > + > + virtio_xmit_cleanup_inorder(vq, nb_clean); > + > + return nb_descs - vq->vq_free_cnt; > +} > + > uint16_t > virtio_xmit_pkts_inorder(void *tx_queue, > struct rte_mbuf **tx_pkts, > @@ -1480,8 +1495,9 @@ virtio_xmit_pkts_inorder(void *tx_queue, > struct virtqueue *vq = txvq->vq; > struct virtio_hw *hw = vq->hw; > uint16_t hdr_size = hw->vtnet_hdr_size; > - uint16_t nb_used, nb_avail, nb_tx = 0, nb_inorder_pkts = 0; > + uint16_t nb_used, nb_tx = 0, nb_inorder_pkts = 0; > struct rte_mbuf *inorder_pkts[nb_pkts]; > + int need; > > if (unlikely(hw->started == 0 && tx_pkts != hw->inject_pkts)) > return nb_tx; > @@ -1497,14 +1513,9 @@ virtio_xmit_pkts_inorder(void *tx_queue, > if (likely(nb_used > vq->vq_nentries - vq->vq_free_thresh)) > virtio_xmit_cleanup_inorder(vq, nb_used); > > - if (unlikely(!vq->vq_free_cnt)) > - virtio_xmit_cleanup_inorder(vq, nb_used); > - > - nb_avail = RTE_MIN(vq->vq_free_cnt, nb_pkts); > - > - for (nb_tx = 0; nb_tx < nb_avail; nb_tx++) { > + for (nb_tx = 0; nb_tx < nb_pkts; nb_tx++) { > struct rte_mbuf *txm = tx_pkts[nb_tx]; > - int slots, need; > + int slots; > > /* optimize ring usage */ > if ((vtpci_with_feature(hw, VIRTIO_F_ANY_LAYOUT) || > @@ -1524,6 +1535,17 @@ virtio_xmit_pkts_inorder(void *tx_queue, > } > > if (nb_inorder_pkts) { > + need = nb_inorder_pkts - vq->vq_free_cnt; > + if (unlikely(need > 0)) { > + need = virtio_xmit_try_cleanup_inorder(vq, > + need); > + if (unlikely(need > 0)) { > + PMD_TX_LOG(ERR, > + "No free tx descriptors to " > + "transmit"); > + break; > + } > + } > virtqueue_enqueue_xmit_inorder(txvq, inorder_pkts, > nb_inorder_pkts); > nb_inorder_pkts = 0; > @@ -1532,13 +1554,7 @@ virtio_xmit_pkts_inorder(void *tx_queue, > slots = txm->nb_segs + 1; > need = slots - vq->vq_free_cnt; > if (unlikely(need > 0)) { > - nb_used = VIRTQUEUE_NUSED(vq); > - virtio_rmb(); > - need = RTE_MIN(need, (int)nb_used); > - > - virtio_xmit_cleanup_inorder(vq, need); > - > - need = slots - vq->vq_free_cnt; > + need = virtio_xmit_try_cleanup_inorder(vq, slots); > > if (unlikely(need > 0)) { > PMD_TX_LOG(ERR, > @@ -1554,9 +1570,21 @@ virtio_xmit_pkts_inorder(void *tx_queue, > } > > /* Transmit all inorder packets */ > - if (nb_inorder_pkts) > + if (nb_inorder_pkts) { > + need = nb_inorder_pkts - vq->vq_free_cnt; > + if (unlikely(need > 0)) { > + need = virtio_xmit_try_cleanup_inorder(vq, need); > + if (unlikely(need > 0)) { > + PMD_TX_LOG(ERR, > + "No free tx descriptors to transmit"); > + nb_inorder_pkts = vq->vq_free_cnt; > + nb_tx -= need; > + } > + } > + > virtqueue_enqueue_xmit_inorder(txvq, inorder_pkts, > nb_inorder_pkts); > + } > > txvq->stats.packets += nb_tx; > > Applied, thanks.