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 5924CA2EFC for ; Wed, 18 Sep 2019 04:37:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5A4DF1BEE9; Wed, 18 Sep 2019 04:37:20 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 1651A1BEBA for ; Wed, 18 Sep 2019 04:37:18 +0200 (CEST) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Sep 2019 19:37:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,519,1559545200"; d="scan'208";a="189119826" Received: from dpdk-virtio-tbie-2.sh.intel.com (HELO ___) ([10.67.104.71]) by orsmga003.jf.intel.com with ESMTP; 17 Sep 2019 19:37:16 -0700 Date: Wed, 18 Sep 2019 10:34:33 +0800 From: Tiwei Bie To: Marvin Liu Cc: maxime.coquelin@redhat.com, dev@dpdk.org Message-ID: <20190918023433.GA20995@___> References: <20190827102407.65106-1-yong.liu@intel.com> <20190910161446.36361-1-yong.liu@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20190910161446.36361-1-yong.liu@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [dpdk-dev] [PATCH v2 1/2] net/virtio: update stats when in order xmit done X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Wed, Sep 11, 2019 at 12:14:45AM +0800, Marvin Liu wrote: > When doing xmit in-order enqueue, packets are buffered and then flushed > into avail ring. Buffered packets can be dropped due to insufficient > space. Moving stats update action just after successful avail ring > updates can guarantee correctness. > > Signed-off-by: Marvin Liu > --- > drivers/net/virtio/virtio_rxtx.c | 87 ++++++++++++++++---------------- > 1 file changed, 44 insertions(+), 43 deletions(-) > > diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c > index 27ead19fb..d3ca36831 100644 > --- a/drivers/net/virtio/virtio_rxtx.c > +++ b/drivers/net/virtio/virtio_rxtx.c > @@ -106,6 +106,48 @@ vq_ring_free_id_packed(struct virtqueue *vq, uint16_t id) > dxp->next = VQ_RING_DESC_CHAIN_END; > } > > +static inline void > +virtio_update_packet_stats(struct virtnet_stats *stats, struct rte_mbuf *mbuf) > +{ > + uint32_t s = mbuf->pkt_len; > + struct rte_ether_addr *ea; > + > + stats->bytes += s; > + > + if (s == 64) { > + stats->size_bins[1]++; > + } else if (s > 64 && s < 1024) { > + uint32_t bin; > + > + /* count zeros, and offset into correct bin */ > + bin = (sizeof(s) * 8) - __builtin_clz(s) - 5; > + stats->size_bins[bin]++; > + } else { > + if (s < 64) > + stats->size_bins[0]++; > + else if (s < 1519) > + stats->size_bins[6]++; > + else > + stats->size_bins[7]++; > + } > + > + ea = rte_pktmbuf_mtod(mbuf, struct rte_ether_addr *); > + if (rte_is_multicast_ether_addr(ea)) { > + if (rte_is_broadcast_ether_addr(ea)) > + stats->broadcast++; > + else > + stats->multicast++; > + } > +} > + > +static inline void > +virtio_rx_stats_updated(struct virtnet_rx *rxvq, struct rte_mbuf *m) > +{ > + VIRTIO_DUMP_PACKET(m, m->data_len); > + > + virtio_update_packet_stats(&rxvq->stats, m); > +} > + > static uint16_t > virtqueue_dequeue_burst_rx_packed(struct virtqueue *vq, > struct rte_mbuf **rx_pkts, > @@ -317,7 +359,7 @@ virtio_xmit_cleanup(struct virtqueue *vq, uint16_t num) > } > > /* Cleanup from completed inorder transmits. */ > -static void > +static __rte_always_inline void > virtio_xmit_cleanup_inorder(struct virtqueue *vq, uint16_t num) > { > uint16_t i, idx = vq->vq_used_cons_idx; > @@ -596,6 +638,7 @@ virtqueue_enqueue_xmit_inorder(struct virtnet_tx *txvq, > dxp = &vq->vq_descx[vq->vq_avail_idx & (vq->vq_nentries - 1)]; > dxp->cookie = (void *)cookies[i]; > dxp->ndescs = 1; > + virtio_update_packet_stats(&txvq->stats, cookies[i]); The virtio_update_packet_stats() call in virtio_xmit_pkts_inorder() should be removed. > > hdr = (struct virtio_net_hdr *) > rte_pktmbuf_prepend(cookies[i], head_size); > @@ -1083,48 +1126,6 @@ virtio_discard_rxbuf_inorder(struct virtqueue *vq, struct rte_mbuf *m) > } > } > > -static inline void > -virtio_update_packet_stats(struct virtnet_stats *stats, struct rte_mbuf *mbuf) > -{ > - uint32_t s = mbuf->pkt_len; > - struct rte_ether_addr *ea; > - > - stats->bytes += s; > - > - if (s == 64) { > - stats->size_bins[1]++; > - } else if (s > 64 && s < 1024) { > - uint32_t bin; > - > - /* count zeros, and offset into correct bin */ > - bin = (sizeof(s) * 8) - __builtin_clz(s) - 5; > - stats->size_bins[bin]++; > - } else { > - if (s < 64) > - stats->size_bins[0]++; > - else if (s < 1519) > - stats->size_bins[6]++; > - else > - stats->size_bins[7]++; > - } > - > - ea = rte_pktmbuf_mtod(mbuf, struct rte_ether_addr *); > - if (rte_is_multicast_ether_addr(ea)) { > - if (rte_is_broadcast_ether_addr(ea)) > - stats->broadcast++; > - else > - stats->multicast++; > - } > -} > - > -static inline void > -virtio_rx_stats_updated(struct virtnet_rx *rxvq, struct rte_mbuf *m) > -{ > - VIRTIO_DUMP_PACKET(m, m->data_len); > - > - virtio_update_packet_stats(&rxvq->stats, m); > -} > - > /* Optionally fill offload information in structure */ > static inline int > virtio_rx_offload(struct rte_mbuf *m, struct virtio_net_hdr *hdr) > -- > 2.17.1 >