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 3543CA00C2; Fri, 24 Apr 2020 14:30:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E39BA1BF75; Fri, 24 Apr 2020 14:30:09 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 7CF0D1BF3C for ; Fri, 24 Apr 2020 14:30:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587731407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc: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=EriocW2tqQmNsHgVk6MW1pyOt6OGsjkXxbdXjr+DSRY=; b=GCQ0bhLYahd2+8shlmHltB9POp8/MVdOCkTcgAWMwjYirZJ+xb49/fpnJf7jYQBuqdW1YU c6hPi95B0NxN1xXC5Km5O3DTsWTBaqaXzoSJ5Idfg2V4Fr0LimxdqIAISwRmWZFZBGFiXm xBYcI2LWdjbrcZu/ZcWZAsOVWuTmEjQ= 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-49-yHEaVsI8O6CLPbZE2phUTA-1; Fri, 24 Apr 2020 08:30:04 -0400 X-MC-Unique: yHEaVsI8O6CLPbZE2phUTA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DC377835B8B; Fri, 24 Apr 2020 12:30:02 +0000 (UTC) Received: from [10.36.110.30] (unknown [10.36.110.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0EF3018A48; Fri, 24 Apr 2020 12:30:00 +0000 (UTC) To: Marvin Liu , xiaolong.ye@intel.com, zhihong.wang@intel.com Cc: dev@dpdk.org, harry.van.haaren@intel.com References: <20200313174230.74661-1-yong.liu@intel.com> <20200424092445.44693-1-yong.liu@intel.com> <20200424092445.44693-8-yong.liu@intel.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= Message-ID: <94281b4c-2b05-4cca-7df8-93cbdf6a4f74@redhat.com> Date: Fri, 24 Apr 2020 14:29:59 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <20200424092445.44693-8-yong.liu@intel.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Subject: Re: [dpdk-dev] [PATCH v9 7/9] net/virtio: add vectorized packed ring Tx path 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 4/24/20 11:24 AM, Marvin Liu wrote: > Optimize packed ring Tx path alike Rx path. Split Tx path into batch and s/alike/like/ ? > single Tx functions. Batch function is further optimized by AVX512 > instructions. >=20 > Signed-off-by: Marvin Liu >=20 > diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virt= io_ethdev.h > index 5c112cac7..b7d52d497 100644 > --- a/drivers/net/virtio/virtio_ethdev.h > +++ b/drivers/net/virtio/virtio_ethdev.h > @@ -108,6 +108,9 @@ uint16_t virtio_recv_pkts_vec(void *rx_queue, struct = rte_mbuf **rx_pkts, > uint16_t virtio_recv_pkts_packed_vec(void *rx_queue, struct rte_mbuf **r= x_pkts, > =09=09uint16_t nb_pkts); > =20 > +uint16_t virtio_xmit_pkts_packed_vec(void *tx_queue, struct rte_mbuf **t= x_pkts, > +=09=09uint16_t nb_pkts); > + > int eth_virtio_dev_init(struct rte_eth_dev *eth_dev); > =20 > void virtio_interrupt_handler(void *param); > diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio= _rxtx.c > index cf18fe564..f82fe8d64 100644 > --- a/drivers/net/virtio/virtio_rxtx.c > +++ b/drivers/net/virtio/virtio_rxtx.c > @@ -2175,3 +2175,11 @@ virtio_recv_pkts_packed_vec(void *rx_queue __rte_u= nused, > { > =09return 0; > } > + > +__rte_weak uint16_t > +virtio_xmit_pkts_packed_vec(void *tx_queue __rte_unused, > +=09=09=09 struct rte_mbuf **tx_pkts __rte_unused, > +=09=09=09 uint16_t nb_pkts __rte_unused) > +{ > +=09return 0; > +} > diff --git a/drivers/net/virtio/virtio_rxtx_packed_avx.c b/drivers/net/vi= rtio/virtio_rxtx_packed_avx.c > index 8a7b459eb..c023ace4e 100644 > --- a/drivers/net/virtio/virtio_rxtx_packed_avx.c > +++ b/drivers/net/virtio/virtio_rxtx_packed_avx.c > @@ -23,6 +23,24 @@ > #define PACKED_FLAGS_MASK ((0ULL | VRING_PACKED_DESC_F_AVAIL_USED) << \ > =09FLAGS_BITS_OFFSET) > =20 > +/* reference count offset in mbuf rearm data */ > +#define REFCNT_BITS_OFFSET ((offsetof(struct rte_mbuf, refcnt) - \ > +=09offsetof(struct rte_mbuf, rearm_data)) * BYTE_SIZE) > +/* segment number offset in mbuf rearm data */ > +#define SEG_NUM_BITS_OFFSET ((offsetof(struct rte_mbuf, nb_segs) - \ > +=09offsetof(struct rte_mbuf, rearm_data)) * BYTE_SIZE) > + > +/* default rearm data */ > +#define DEFAULT_REARM_DATA (1ULL << SEG_NUM_BITS_OFFSET | \ > +=091ULL << REFCNT_BITS_OFFSET) > + > +/* id bits offset in packed ring desc higher 64bits */ > +#define ID_BITS_OFFSET ((offsetof(struct vring_packed_desc, id) - \ > +=09offsetof(struct vring_packed_desc, len)) * BYTE_SIZE) > + > +/* net hdr short size mask */ > +#define NET_HDR_MASK 0x3F > + > #define PACKED_BATCH_SIZE (RTE_CACHE_LINE_SIZE / \ > =09sizeof(struct vring_packed_desc)) > #define PACKED_BATCH_MASK (PACKED_BATCH_SIZE - 1) > @@ -47,6 +65,48 @@ > =09for (iter =3D val; iter < num; iter++) > #endif > =20 > +static inline void > +virtio_xmit_cleanup_packed_vec(struct virtqueue *vq) > +{ > +=09struct vring_packed_desc *desc =3D vq->vq_packed.ring.desc; > +=09struct vq_desc_extra *dxp; > +=09uint16_t used_idx, id, curr_id, free_cnt =3D 0; > +=09uint16_t size =3D vq->vq_nentries; > +=09struct rte_mbuf *mbufs[size]; > +=09uint16_t nb_mbuf =3D 0, i; > + > +=09used_idx =3D vq->vq_used_cons_idx; > + > +=09if (!desc_is_used(&desc[used_idx], vq)) > +=09=09return; > + > +=09id =3D desc[used_idx].id; > + > +=09do { > +=09=09curr_id =3D used_idx; > +=09=09dxp =3D &vq->vq_descx[used_idx]; > +=09=09used_idx +=3D dxp->ndescs; > +=09=09free_cnt +=3D dxp->ndescs; > + > +=09=09if (dxp->cookie !=3D NULL) { > +=09=09=09mbufs[nb_mbuf] =3D dxp->cookie; > +=09=09=09dxp->cookie =3D NULL; > +=09=09=09nb_mbuf++; > +=09=09} > + > +=09=09if (used_idx >=3D size) { > +=09=09=09used_idx -=3D size; > +=09=09=09vq->vq_packed.used_wrap_counter ^=3D 1; > +=09=09} > +=09} while (curr_id !=3D id); > + > +=09for (i =3D 0; i < nb_mbuf; i++) > +=09=09rte_pktmbuf_free(mbufs[i]); > + > +=09vq->vq_used_cons_idx =3D used_idx; > +=09vq->vq_free_cnt +=3D free_cnt; > +} > + I think you can re-use the inlined non-vectorized cleanup function here. Or use your implementation in non-vectorized path. BTW, do you know we have to pass the num argument in non-vectorized case? I'm not sure to remember. Maxime