From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 442B61B565 for ; Wed, 9 Jan 2019 15:50:42 +0100 (CET) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20190109145041euoutp01c8fe119991192bda058851f091fcfcf2~4NaH9W5uM2918329183euoutp01j for ; Wed, 9 Jan 2019 14:50:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20190109145041euoutp01c8fe119991192bda058851f091fcfcf2~4NaH9W5uM2918329183euoutp01j DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1547045441; bh=7xkdEKZ707TSlD+fabHzHNqdANBfHzireDOwEOjBkKQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rfk7kYcBnPbpC1jHH/JpkwaYja/H9CwEd0iFDTCI+VB16HZkmoMf4zv9jvzes4Ut3 oKbrVt1NDilWXX42hXxI6HL2gvQzn+bJQEroHxP8WkHTWMqKZ7+QLtY28coKb63KHN EAyY5rpDpPiypnoz9jXpdPXP+5GeazHDv7qLjOrE= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20190109145041eucas1p28cef453c6e7c1c655b05df349c86d395~4NaHi6zbc1647416474eucas1p2r; Wed, 9 Jan 2019 14:50:41 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 79.E4.04441.14A063C5; Wed, 9 Jan 2019 14:50:41 +0000 (GMT) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20190109145040eucas1p2d9afc678ef94986544bde07b77373e6f~4NaGpsRnM1558115581eucas1p2f; Wed, 9 Jan 2019 14:50:40 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20190109145040eusmtrp193c0189ff1443d3f5063055462822d70~4NaGoqUty0367503675eusmtrp1T; Wed, 9 Jan 2019 14:50:40 +0000 (GMT) X-AuditID: cbfec7f2-5e3ff70000001159-82-5c360a41f950 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id C7.80.04284.04A063C5; Wed, 9 Jan 2019 14:50:40 +0000 (GMT) Received: from imaximets.rnd.samsung.ru (unknown [106.109.129.180]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20190109145039eusmtip2fb844cd1422a9a2005db441224876aa7~4NaF3NDIz2072420724eusmtip2w; Wed, 9 Jan 2019 14:50:39 +0000 (GMT) From: Ilya Maximets To: dev@dpdk.org, Maxime Coquelin , "Michael S . Tsirkin" , Xiao Wang Cc: Tiwei Bie , Zhihong Wang , jfreimann@redhat.com, Jason Wang , xiaolong.ye@intel.com, alejandro.lucero@netronome.com, Ilya Maximets Date: Wed, 9 Jan 2019 17:50:15 +0300 Message-Id: <20190109145015.3010-4-i.maximets@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190109145015.3010-1-i.maximets@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprEKsWRmVeSWpSXmKPExsWy7djPc7qOXGYxBkv/s1ic+7SMyeLdp+1M Flfaf7JbLLv0mcni3JqlLBbHOvewWPz/9YrVYmvDfyaL/c8Ps1v8eWNqsfniJCYHbo9fC5ay eize85LJY3r3Q2aP9/uusnn0bVnFGMAaxWWTkpqTWZZapG+XwJXx5tZZxoI/1hU9U/vZGxg3 GHYxcnJICJhIXLtyhq2LkYtDSGAFo8SZzb3sEM4XRonfN+6xQDifGSWOTJnGCtNy5OwRqMRy RonjPT+h+n8wSkxf+osdpIpNQEfi1OojjCAJEYFuRolXTz+DVTELPGeUePHlHliVsECQxIfv M1lAbBYBVYl1F64wgdi8AlYST1afYILYJy+xesMBZhCbU8BaYtmrGWCDJAQms0s0z9jJDFHk ItHZuxuqQVji1fEt7BC2jMTpyT0sEHa9xP2Wl4wQzR1Atx76B9VgL7Hl9TmgBg6g8zQl1u/S hwg7Suy/PZcNJCwhwCdx460gSJgZyJy0bTozRJhXoqNNCKJaReL3weVQ10hJ3Hz3GeoCD4mt LdOhgXqAUWLRurfsExjlZyEsW8DIuIpRPLW0ODc9tdgwL7Vcrzgxt7g0L10vOT93EyMwpZz+ d/zTDsavl5IOMQpwMCrx8Cb8M40RYk0sK67MPcQowcGsJMKrfsckRog3JbGyKrUoP76oNCe1 +BCjNAeLkjhvNcODaCGB9MSS1OzU1ILUIpgsEwenVAOjcreO9dM+M9NvVdKZn24fyt+dv3P1 hD+Rn1efd/Hr+LeHRbfjYtiXR0s5ThYm8sjZxF5tOad9Ndq3xMf7cH5G2acwva05u61Mbptl S0lOab988OLOi37mc+Ue2z8MDFr37dKFfa16LPt1WhjWVP8/uvH6cRarhVEiHxyemLGL5Evl +HGqpC1TYinOSDTUYi4qTgQAzINaISUDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrELMWRmVeSWpSXmKPExsVy+t/xe7oOXGYxBu+7xSzOfVrGZPHu03Ym iyvtP9ktll36zGRxbs1SFotjnXtYLP7/esVqsbXhP5PF/ueH2S3+vDG12HxxEpMDt8evBUtZ PRbvecnkMb37IbPH+31X2Tz6tqxiDGCN0rMpyi8tSVXIyC8usVWKNrQw0jO0tNAzMrHUMzQ2 j7UyMlXSt7NJSc3JLEst0rdL0Mt4c+ssY8Ef64qeqf3sDYwbDLsYOTkkBEwkjpw9wtLFyMUh JLCUUaJtUwcLREJK4sevC6wQtrDEn2tdbCC2kMA3RomO94wgNpuAjsSp1UcYQZpFBPoZJXZf v8kM4jALvGWU6Jt0gx2kSlggQOLTiUlg3SwCqhLrLlxhArF5Bawknqw+wQSxQV5i9YYDzCA2 p4C1xLJXM6C25Ugc+rKVfQIj3wJGhlWMIqmlxbnpucWGesWJucWleel6yfm5mxiB4b3t2M/N OxgvbQw+xCjAwajEw5vwzzRGiDWxrLgy9xCjBAezkgiv+h2TGCHelMTKqtSi/Pii0pzU4kOM pkBHTWSWEk3OB8ZeXkm8oamhuYWlobmxubGZhZI473mDyighgfTEktTs1NSC1CKYPiYOTqkG Rt9Hvq+OZBy4a+v5O+Qh45JPngtDGi75zG5YOnPO44pXZxduW979Q1qEL02l8ivrOxfDnTMm 8laxs04u/3EgNnhz/7GjZd1O33sPqLjJHvGaKHOy6GZ2krOgzhKBAsVLT3hEPScc+TZtO+cb 4fV/PbL+vj8yi2uJySVZ0/0ngs6lsmRPvXu7+osSS3FGoqEWc1FxIgDzIE3nhQIAAA== X-CMS-MailID: 20190109145040eucas1p2d9afc678ef94986544bde07b77373e6f X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20190109145040eucas1p2d9afc678ef94986544bde07b77373e6f X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20190109145040eucas1p2d9afc678ef94986544bde07b77373e6f References: <20181226163712.31596-1-i.maximets@samsung.com> <20190109145015.3010-1-i.maximets@samsung.com> Subject: [dpdk-dev] [PATCH v3 3/3] net/virtio: add platform memory ordering feature support 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: , X-List-Received-Date: Wed, 09 Jan 2019 14:50:42 -0000 VIRTIO_F_ORDER_PLATFORM is required to use proper memory barriers in case of HW vhost implementations like vDPA. DMA barriers (rte_cio_*) are sufficent for that purpose. Previously known as VIRTIO_F_IO_BARRIER. Signed-off-by: Ilya Maximets --- drivers/net/virtio/virtio_ethdev.c | 2 ++ drivers/net/virtio/virtio_ethdev.h | 3 ++- drivers/net/virtio/virtio_pci.h | 7 +++++ drivers/net/virtio/virtio_rxtx.c | 16 ++++++------ drivers/net/virtio/virtqueue.h | 41 ++++++++++++++++++++++++------ 5 files changed, 52 insertions(+), 17 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 446c338fc..6d461180c 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1613,6 +1613,8 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) if (virtio_negotiate_features(hw, req_features) < 0) return -1; + hw->weak_barriers = !vtpci_with_feature(hw, VIRTIO_F_ORDER_PLATFORM); + if (!hw->virtio_user_dev) { pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev); rte_eth_copy_pci_info(eth_dev, pci_dev); diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h index f8d8a56ab..b8aab7da4 100644 --- a/drivers/net/virtio/virtio_ethdev.h +++ b/drivers/net/virtio/virtio_ethdev.h @@ -35,7 +35,8 @@ 1ULL << VIRTIO_F_VERSION_1 | \ 1ULL << VIRTIO_F_IN_ORDER | \ 1ULL << VIRTIO_F_RING_PACKED | \ - 1ULL << VIRTIO_F_IOMMU_PLATFORM) + 1ULL << VIRTIO_F_IOMMU_PLATFORM | \ + 1ULL << VIRTIO_F_ORDER_PLATFORM) #define VIRTIO_PMD_SUPPORTED_GUEST_FEATURES \ (VIRTIO_PMD_DEFAULT_GUEST_FEATURES | \ diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h index b22b62dad..38a0261da 100644 --- a/drivers/net/virtio/virtio_pci.h +++ b/drivers/net/virtio/virtio_pci.h @@ -129,6 +129,12 @@ struct virtnet_ctl; */ #define VIRTIO_F_IN_ORDER 35 +/* + * This feature indicates that memory accesses by the driver and the device + * are ordered in a way described by the platform. + */ +#define VIRTIO_F_ORDER_PLATFORM 36 + /* The Guest publishes the used index for which it expects an interrupt * at the end of the avail ring. Host should ignore the avail->flags field. */ /* The Host publishes the avail index for which it expects a kick @@ -241,6 +247,7 @@ struct virtio_hw { uint8_t use_simple_rx; uint8_t use_inorder_rx; uint8_t use_inorder_tx; + uint8_t weak_barriers; bool has_tx_offload; bool has_rx_offload; uint16_t port_id; diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index 2309b71d6..ebb86ef70 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -1152,7 +1152,7 @@ virtio_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) nb_used = VIRTQUEUE_NUSED(vq); - virtio_rmb(); + virtio_rmb(hw->weak_barriers); num = likely(nb_used <= nb_pkts) ? nb_used : nb_pkts; if (unlikely(num > VIRTIO_MBUF_BURST_SZ)) @@ -1361,7 +1361,7 @@ virtio_recv_pkts_inorder(void *rx_queue, nb_used = RTE_MIN(nb_used, nb_pkts); nb_used = RTE_MIN(nb_used, VIRTIO_MBUF_BURST_SZ); - virtio_rmb(); + virtio_rmb(hw->weak_barriers); PMD_RX_LOG(DEBUG, "used:%d", nb_used); @@ -1549,7 +1549,7 @@ virtio_recv_mergeable_pkts(void *rx_queue, nb_used = VIRTQUEUE_NUSED(vq); - virtio_rmb(); + virtio_rmb(hw->weak_barriers); PMD_RX_LOG(DEBUG, "used:%d", nb_used); @@ -1940,7 +1940,7 @@ virtio_xmit_pkts_packed(void *tx_queue, struct rte_mbuf **tx_pkts, /* Positive value indicates it need free vring descriptors */ if (unlikely(need > 0)) { - virtio_rmb(); + virtio_rmb(hw->weak_barriers); need = RTE_MIN(need, (int)nb_pkts); virtio_xmit_cleanup_packed(vq, need); need = slots - vq->vq_free_cnt; @@ -1988,7 +1988,7 @@ virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) PMD_TX_LOG(DEBUG, "%d packets to xmit", nb_pkts); nb_used = VIRTQUEUE_NUSED(vq); - virtio_rmb(); + virtio_rmb(hw->weak_barriers); if (likely(nb_used > vq->vq_nentries - vq->vq_free_thresh)) virtio_xmit_cleanup(vq, nb_used); @@ -2030,7 +2030,7 @@ virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) /* Positive value indicates it need free vring descriptors */ if (unlikely(need > 0)) { nb_used = VIRTQUEUE_NUSED(vq); - virtio_rmb(); + virtio_rmb(hw->weak_barriers); need = RTE_MIN(need, (int)nb_used); virtio_xmit_cleanup(vq, need); @@ -2086,7 +2086,7 @@ virtio_xmit_pkts_inorder(void *tx_queue, PMD_TX_LOG(DEBUG, "%d packets to xmit", nb_pkts); nb_used = VIRTQUEUE_NUSED(vq); - virtio_rmb(); + virtio_rmb(hw->weak_barriers); if (likely(nb_used > vq->vq_nentries - vq->vq_free_thresh)) virtio_xmit_cleanup_inorder(vq, nb_used); @@ -2134,7 +2134,7 @@ virtio_xmit_pkts_inorder(void *tx_queue, need = slots - vq->vq_free_cnt; if (unlikely(need > 0)) { nb_used = VIRTQUEUE_NUSED(vq); - virtio_rmb(); + virtio_rmb(hw->weak_barriers); need = RTE_MIN(need, (int)nb_used); virtio_xmit_cleanup_inorder(vq, need); diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h index 53aeac238..123bec34f 100644 --- a/drivers/net/virtio/virtqueue.h +++ b/drivers/net/virtio/virtqueue.h @@ -19,15 +19,40 @@ struct rte_mbuf; /* - * Per virtio_config.h in Linux. + * Per virtio_ring.h in Linux. * For virtio_pci on SMP, we don't need to order with respect to MMIO * accesses through relaxed memory I/O windows, so smp_mb() et al are * sufficient. * + * For using virtio to talk to real devices (eg. vDPA) we do need real + * barriers. */ -#define virtio_mb() rte_smp_mb() -#define virtio_rmb() rte_smp_rmb() -#define virtio_wmb() rte_smp_wmb() +static inline void +virtio_mb(uint8_t weak_barriers) +{ + if (weak_barriers) + rte_smp_mb(); + else + rte_mb(); +} + +static inline void +virtio_rmb(uint8_t weak_barriers) +{ + if (weak_barriers) + rte_smp_rmb(); + else + rte_cio_rmb(); +} + +static inline void +virtio_wmb(uint8_t weak_barriers) +{ + if (weak_barriers) + rte_smp_wmb(); + else + rte_cio_wmb(); +} #ifdef RTE_PMD_PACKET_PREFETCH #define rte_packet_prefetch(p) rte_prefetch1(p) @@ -325,7 +350,7 @@ virtqueue_enable_intr_packed(struct virtqueue *vq) if (vq->event_flags_shadow == RING_EVENT_FLAGS_DISABLE) { - virtio_wmb(); + virtio_wmb(vq->hw->weak_barriers); vq->event_flags_shadow = RING_EVENT_FLAGS_ENABLE; *event_flags = vq->event_flags_shadow; } @@ -391,7 +416,7 @@ void vq_ring_free_inorder(struct virtqueue *vq, uint16_t desc_idx, static inline void vq_update_avail_idx(struct virtqueue *vq) { - virtio_wmb(); + virtio_wmb(vq->hw->weak_barriers); vq->vq_ring.avail->idx = vq->vq_avail_idx; } @@ -419,7 +444,7 @@ virtqueue_kick_prepare(struct virtqueue *vq) * Ensure updated avail->idx is visible to vhost before reading * the used->flags. */ - virtio_mb(); + virtio_mb(vq->hw->weak_barriers); return !(vq->vq_ring.used->flags & VRING_USED_F_NO_NOTIFY); } @@ -431,7 +456,7 @@ virtqueue_kick_prepare_packed(struct virtqueue *vq) /* * Ensure updated data is visible to vhost before reading the flags. */ - virtio_mb(); + virtio_mb(vq->hw->weak_barriers); flags = vq->ring_packed.device_event->desc_event_flags; return flags != RING_EVENT_FLAGS_DISABLE; -- 2.17.1