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 A2F79A00C2; Fri, 24 Apr 2020 13:51:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 85F5D1C1EC; Fri, 24 Apr 2020 13:51:55 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id D22431C1CA for ; Fri, 24 Apr 2020 13:51:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587729113; 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=wZHzIStADaeuBSXKeZ2uIX+bb+5pNYoGsimgLPANUQM=; b=iAsNYRjJt8X/ZVvXgyMb9wOXUa9X8bi+xCGHIT3OQTnt0TnjxHI+hoB4/4AaBjFZ5SaceL mfp9XnaBShi/afWEx4YScdIP0auxGwvjszZRL76oh6sWYMz8L1+dLuvkd6vsaMr8z2Cdxq 94nbqn+wtvKtOeXGfn/HVDxntQx12qU= 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-372-S3O3rHGcPba3aFwTW6uPKA-1; Fri, 24 Apr 2020 07:51:51 -0400 X-MC-Unique: S3O3rHGcPba3aFwTW6uPKA-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 47D3B800D24; Fri, 24 Apr 2020 11:51:50 +0000 (UTC) Received: from [10.36.110.30] (unknown [10.36.110.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 58D7C60FB9; Fri, 24 Apr 2020 11:51:48 +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-6-yong.liu@intel.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= Message-ID: <8d024d70-21b2-19cb-ee72-0bd036f0816f@redhat.com> Date: Fri, 24 Apr 2020 13:51:45 +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-6-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 5/9] net/virtio: add vectorized packed ring Rx 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 Rx path with SIMD instructions. Solution of > optimization is pretty like vhost, is that split path into batch and > single functions. Batch function is further optimized by AVX512 > instructions. Also pad desc extra structure to 16 bytes aligned, thus > four elements will be saved in one batch. >=20 > Signed-off-by: Marvin Liu >=20 > diff --git a/drivers/net/virtio/Makefile b/drivers/net/virtio/Makefile > index c9edb84ee..102b1deab 100644 > --- a/drivers/net/virtio/Makefile > +++ b/drivers/net/virtio/Makefile > @@ -36,6 +36,41 @@ else ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG= _RTE_ARCH_ARM64)),) > SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) +=3D virtio_rxtx_simple_neon.c > endif > =20 > +ifneq ($(FORCE_DISABLE_AVX512), y) > +=09CC_AVX512_SUPPORT=3D\ > +=09$(shell $(CC) -march=3Dnative -dM -E - &1 | \ > +=09sed '/./{H;$$!d} ; x ; /AVX512F/!d; /AVX512BW/!d; /AVX512VL/!d' | \ > +=09grep -q AVX512 && echo 1) > +endif > + > +ifeq ($(CC_AVX512_SUPPORT), 1) > +CFLAGS +=3D -DCC_AVX512_SUPPORT > +SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) +=3D virtio_rxtx_packed_avx.c > + > +ifeq ($(RTE_TOOLCHAIN), gcc) > +ifeq ($(shell test $(GCC_VERSION) -ge 83 && echo 1), 1) > +CFLAGS +=3D -DVIRTIO_GCC_UNROLL_PRAGMA > +endif > +endif > + > +ifeq ($(RTE_TOOLCHAIN), clang) > +ifeq ($(shell test $(CLANG_MAJOR_VERSION)$(CLANG_MINOR_VERSION) -ge 37 &= & echo 1), 1) > +CFLAGS +=3D -DVIRTIO_CLANG_UNROLL_PRAGMA > +endif > +endif > + > +ifeq ($(RTE_TOOLCHAIN), icc) > +ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 16 && echo 1), 1) > +CFLAGS +=3D -DVIRTIO_ICC_UNROLL_PRAGMA > +endif > +endif > + > +CFLAGS_virtio_rxtx_packed_avx.o +=3D -mavx512f -mavx512bw -mavx512vl > +ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1) > +CFLAGS_virtio_rxtx_packed_avx.o +=3D -Wno-zero-length-bounds > +endif > +endif > + > ifeq ($(CONFIG_RTE_VIRTIO_USER),y) > SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) +=3D virtio_user/vhost_user.c > SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) +=3D virtio_user/vhost_kernel.c > diff --git a/drivers/net/virtio/meson.build b/drivers/net/virtio/meson.bu= ild > index 15150eea1..8e68c3039 100644 > --- a/drivers/net/virtio/meson.build > +++ b/drivers/net/virtio/meson.build > @@ -9,6 +9,20 @@ sources +=3D files('virtio_ethdev.c', > deps +=3D ['kvargs', 'bus_pci'] > =20 > if arch_subdir =3D=3D 'x86' > +=09if '-mno-avx512f' not in machine_args > +=09=09if cc.has_argument('-mavx512f') and cc.has_argument('-mavx512vl') = and cc.has_argument('-mavx512bw') > +=09=09=09cflags +=3D ['-mavx512f', '-mavx512bw', '-mavx512vl'] > +=09=09=09cflags +=3D ['-DCC_AVX512_SUPPORT'] > +=09=09=09if (toolchain =3D=3D 'gcc' and cc.version().version_compare('>= =3D8.3.0')) > +=09=09=09=09cflags +=3D '-DVHOST_GCC_UNROLL_PRAGMA' > +=09=09=09elif (toolchain =3D=3D 'clang' and cc.version().version_compare= ('>=3D3.7.0')) > +=09=09=09=09cflags +=3D '-DVHOST_CLANG_UNROLL_PRAGMA' > +=09=09=09elif (toolchain =3D=3D 'icc' and cc.version().version_compare('= >=3D16.0.0')) > +=09=09=09=09cflags +=3D '-DVHOST_ICC_UNROLL_PRAGMA' > +=09=09=09endif > +=09=09=09sources +=3D files('virtio_rxtx_packed_avx.c') > +=09=09endif > +=09endif > =09sources +=3D files('virtio_rxtx_simple_sse.c') > elif arch_subdir =3D=3D 'ppc' > =09sources +=3D files('virtio_rxtx_simple_altivec.c') > diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virt= io_ethdev.h > index febaf17a8..5c112cac7 100644 > --- a/drivers/net/virtio/virtio_ethdev.h > +++ b/drivers/net/virtio/virtio_ethdev.h > @@ -105,6 +105,9 @@ uint16_t virtio_xmit_pkts_inorder(void *tx_queue, str= uct rte_mbuf **tx_pkts, > uint16_t virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, > =09=09uint16_t nb_pkts); > =20 > +uint16_t virtio_recv_pkts_packed_vec(void *rx_queue, struct rte_mbuf **r= 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 84f4cf946..c9b6e7844 100644 > --- a/drivers/net/virtio/virtio_rxtx.c > +++ b/drivers/net/virtio/virtio_rxtx.c > @@ -2329,3 +2329,11 @@ virtio_xmit_pkts_inorder(void *tx_queue, > =20 > =09return nb_tx; > } > + > +__rte_weak uint16_t > +virtio_recv_pkts_packed_vec(void *rx_queue __rte_unused, > +=09=09=09 struct rte_mbuf **rx_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 > new file mode 100644 > index 000000000..8a7b459eb > --- /dev/null > +++ b/drivers/net/virtio/virtio_rxtx_packed_avx.c > @@ -0,0 +1,374 @@ > +/* SPDX-License-Identifier: BSD-3-Clause > + * Copyright(c) 2010-2020 Intel Corporation > + */ > + > +#include > +#include > +#include > +#include > +#include > + > +#include > + > +#include "virtio_logs.h" > +#include "virtio_ethdev.h" > +#include "virtio_pci.h" > +#include "virtqueue.h" > + > +#define BYTE_SIZE 8 > +/* flag bits offset in packed ring desc higher 64bits */ > +#define FLAGS_BITS_OFFSET ((offsetof(struct vring_packed_desc, flags) - = \ > +=09offsetof(struct vring_packed_desc, len)) * BYTE_SIZE) > + > +#define PACKED_FLAGS_MASK ((0ULL | VRING_PACKED_DESC_F_AVAIL_USED) << \ > +=09FLAGS_BITS_OFFSET) > + > +#define PACKED_BATCH_SIZE (RTE_CACHE_LINE_SIZE / \ > +=09sizeof(struct vring_packed_desc)) > +#define PACKED_BATCH_MASK (PACKED_BATCH_SIZE - 1) > + > +#ifdef VIRTIO_GCC_UNROLL_PRAGMA > +#define virtio_for_each_try_unroll(iter, val, size) _Pragma("GCC unroll = 4") \ > +=09for (iter =3D val; iter < size; iter++) > +#endif > + > +#ifdef VIRTIO_CLANG_UNROLL_PRAGMA > +#define virtio_for_each_try_unroll(iter, val, size) _Pragma("unroll 4") = \ > +=09for (iter =3D val; iter < size; iter++) > +#endif > + > +#ifdef VIRTIO_ICC_UNROLL_PRAGMA > +#define virtio_for_each_try_unroll(iter, val, size) _Pragma("unroll (4)"= ) \ > +=09for (iter =3D val; iter < size; iter++) > +#endif > + > +#ifndef virtio_for_each_try_unroll > +#define virtio_for_each_try_unroll(iter, val, num) \ > +=09for (iter =3D val; iter < num; iter++) > +#endif > + > +static inline void > +virtio_update_batch_stats(struct virtnet_stats *stats, > +=09=09=09 uint16_t pkt_len1, > +=09=09=09 uint16_t pkt_len2, > +=09=09=09 uint16_t pkt_len3, > +=09=09=09 uint16_t pkt_len4) > +{ > +=09stats->bytes +=3D pkt_len1; > +=09stats->bytes +=3D pkt_len2; > +=09stats->bytes +=3D pkt_len3; > +=09stats->bytes +=3D pkt_len4; > +} > + > +/* Optionally fill offload information in structure */ > +static inline int > +virtio_vec_rx_offload(struct rte_mbuf *m, struct virtio_net_hdr *hdr) > +{ > +=09struct rte_net_hdr_lens hdr_lens; > +=09uint32_t hdrlen, ptype; > +=09int l4_supported =3D 0; > + > +=09/* nothing to do */ > +=09if (hdr->flags =3D=3D 0) > +=09=09return 0; IIUC, the only difference with the non-vectorized version is the GSO support removed here. gso_type being in the same cacheline as flags in virtio_net_hdr, I don't think checking the performance gain is worth the added maintainance effort due to code duplication. Please prove I'm wrong, otherwise please move virtio_rx_offload() in a header and use it here. Alternative if it really imapcts performance is to put all the shared code in a dedicated function that can be re-used by both implementations. > + > +=09/* GSO not support in vec path, skip check */ > +=09m->ol_flags |=3D PKT_RX_IP_CKSUM_UNKNOWN; > + > +=09ptype =3D rte_net_get_ptype(m, &hdr_lens, RTE_PTYPE_ALL_MASK); > +=09m->packet_type =3D ptype; > +=09if ((ptype & RTE_PTYPE_L4_MASK) =3D=3D RTE_PTYPE_L4_TCP || > +=09 (ptype & RTE_PTYPE_L4_MASK) =3D=3D RTE_PTYPE_L4_UDP || > +=09 (ptype & RTE_PTYPE_L4_MASK) =3D=3D RTE_PTYPE_L4_SCTP) > +=09=09l4_supported =3D 1; > + > +=09if (hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) { > +=09=09hdrlen =3D hdr_lens.l2_len + hdr_lens.l3_len + hdr_lens.l4_len; > +=09=09if (hdr->csum_start <=3D hdrlen && l4_supported) { > +=09=09=09m->ol_flags |=3D PKT_RX_L4_CKSUM_NONE; > +=09=09} else { > +=09=09=09/* Unknown proto or tunnel, do sw cksum. We can assume > +=09=09=09 * the cksum field is in the first segment since the > +=09=09=09 * buffers we provided to the host are large enough. > +=09=09=09 * In case of SCTP, this will be wrong since it's a CRC > +=09=09=09 * but there's nothing we can do. > +=09=09=09 */ > +=09=09=09uint16_t csum =3D 0, off; > + > +=09=09=09rte_raw_cksum_mbuf(m, hdr->csum_start, > +=09=09=09=09rte_pktmbuf_pkt_len(m) - hdr->csum_start, > +=09=09=09=09&csum); > +=09=09=09if (likely(csum !=3D 0xffff)) > +=09=09=09=09csum =3D ~csum; > +=09=09=09off =3D hdr->csum_offset + hdr->csum_start; > +=09=09=09if (rte_pktmbuf_data_len(m) >=3D off + 1) > +=09=09=09=09*rte_pktmbuf_mtod_offset(m, uint16_t *, > +=09=09=09=09=09off) =3D csum; > +=09=09} > +=09} else if (hdr->flags & VIRTIO_NET_HDR_F_DATA_VALID && l4_supported) = { > +=09=09m->ol_flags |=3D PKT_RX_L4_CKSUM_GOOD; > +=09} > + > +=09return 0; > +} Otherwise, the patch looks okay to me. Thanks, Maxime