From patchwork Wed Jan 9 14:50:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 49545 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 08E9C1B54D; Wed, 9 Jan 2019 15:50:30 +0100 (CET) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 2DA241B483 for ; Wed, 9 Jan 2019 15:50:29 +0100 (CET) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20190109145029euoutp012c32c5518147c31a2ab9c8d22f112ec0~4NZ7-JpG32916829168euoutp01W for ; Wed, 9 Jan 2019 14:50:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20190109145029euoutp012c32c5518147c31a2ab9c8d22f112ec0~4NZ7-JpG32916829168euoutp01W DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1547045429; bh=ACb/KwxvwG1hvivxOMf1qwvTHPXL3TEWz7TpZID/2Z4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lGbqli21sZJO4CNfQ4Pv7B1XZRAHFBLmeLCwzxGfIoX/j9fnqW0ldMQXcQ789z1Bh 0Q+91jDXAv/rl5eF/LRIxyqcK1NvwNVZ9GFdryPxE7WVWUUJlHKC4kkbcCZ6e8rN+E XZyXzadj8O77KxuqcGjapyIr8e++RqdtjTXEpAgM= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20190109145028eucas1p1b03163ffd673d9404d972caf19c92072~4NZ7ce9nU2850028500eucas1p1O; Wed, 9 Jan 2019 14:50:28 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 24.40.04806.43A063C5; Wed, 9 Jan 2019 14:50:28 +0000 (GMT) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20190109145027eucas1p2437215de0df4c691eb84d4e84bfc71e5~4NZ6s0UGs1641816418eucas1p2_; Wed, 9 Jan 2019 14:50:27 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20190109145027eusmtrp10fbf3b12488adaf89b2339c5bd3ce828~4NZ6d_ObL0362703627eusmtrp1d; Wed, 9 Jan 2019 14:50:27 +0000 (GMT) X-AuditID: cbfec7f5-367ff700000012c6-c5-5c360a34c9ca Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id A0.80.04284.33A063C5; Wed, 9 Jan 2019 14:50:27 +0000 (GMT) Received: from imaximets.rnd.samsung.ru (unknown [106.109.129.180]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20190109145026eusmtip239b51d7326abed050299e54503b0af36~4NZ5nkydu2099420994eusmtip2T; Wed, 9 Jan 2019 14:50:26 +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 , stable@dpdk.org Date: Wed, 9 Jan 2019 17:50:13 +0300 Message-Id: <20190109145015.3010-2-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+NgFprKKsWRmVeSWpSXmKPExsWy7djP87omXGYxBufnclmc+7SMyeLdp+1M Flfaf7JbLLv0mcni3JqlLBbHOvewWPz/9YrV4l/HH3aLrQ3/mSz2Pz/MbvHnjanF5ouTmBx4 PH4tWMrqsXjPSyaP6d0PmT3e77vK5tG3ZRVjAGsUl01Kak5mWWqRvl0CV8a87W3sBct5KpZe b2JuYGzh6mLk5JAQMJE4uOUwexcjF4eQwApGiZ2bZjFCOF8YJdbt3sgG4XxmlJg2+T8TTMvj bUegEssZJdavOsoMkhAS+MEocXoPJ4jNJqAjcWr1EbBRIgLdjBKvnn4G62AGKZqwsZkVpEpY IEjiV+8csG4WAVWJrd8esIDYvAJWEk0Nk6HWyUus3nAArIZTwFpi2asZbBDx6ewSH28IQ9gu Ev1nm1ghbGGJV8e3sEPYMhKnJ/ewQNj1EvdbXoJdJCHQwSgx/dA/qAX2EltenwNq4AC6TlNi /S59iLCjROfGXcwgYQkBPokbbwVBwsxA5qRt06HCvBIdbUIQ1SoSvw8uZ4awpSRuvvsMdYGH xPF/i5kggXWAUWL2qsWMExjlZyEsW8DIuIpRPLW0ODc9tdg4L7Vcrzgxt7g0L10vOT93EyMw sZz+d/zrDsZ9f5IOMQpwMCrx8Cb8M40RYk0sK67MPcQowcGsJMKrfsckRog3JbGyKrUoP76o NCe1+BCjNAeLkjhvNcODaCGB9MSS1OzU1ILUIpgsEwenVANjb47ahYbZkvL7+85GMh9dXn/6 Vc/LdQHJdmLm+0sntjkyae/+wGBUXaNYVLHzVf/THr9PJ5neKUpPfh/GoiN8mU+uQfjNx+Xb OHiC7rlle/swxOa7/FK8q8hcVWek2Mte4R8jfDVbcWF0uAf/TOG+K9JBjNPmPmjj+XrgbMXy lMAFszfURCuxFGckGmoxFxUnAgBrriA5KAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRmVeSWpSXmKPExsVy+t/xe7rGXGYxBj+/iVic+7SMyeLdp+1M Flfaf7JbLLv0mcni3JqlLBbHOvewWPz/9YrV4l/HH3aLrQ3/mSz2Pz/MbvHnjanF5ouTmBx4 PH4tWMrqsXjPSyaP6d0PmT3e77vK5tG3ZRVjAGuUnk1RfmlJqkJGfnGJrVK0oYWRnqGlhZ6R iaWeobF5rJWRqZK+nU1Kak5mWWqRvl2CXsa87W3sBct5KpZeb2JuYGzh6mLk5JAQMJF4vO0I WxcjF4eQwFJGiUvnmlghElISP35dgLKFJf5c64Iq+sYosfbdYUaQBJuAjsSp1UcYQRIiAv2M Eruv32QGcZgFGpgkZszczQJSJSwQIDF5xmF2EJtFQFVi67cHYHFeASuJpobJTBAr5CVWbzjA DGJzClhLLHs1gw3EFhLIkTj0ZSv7BEa+BYwMqxhFUkuLc9Nziw31ihNzi0vz0vWS83M3MQJD fduxn5t3MF7aGHyIUYCDUYmHN+GfaYwQa2JZcWXuIUYJDmYlEV71OyYxQrwpiZVVqUX58UWl OanFhxhNgY6ayCwlmpwPjMO8knhDU0NzC0tDc2NzYzMLJXHe8waVUUIC6YklqdmpqQWpRTB9 TBycUg2MGm1v7FUuNzSncuosC2grbufK3Z+74m3APaMDl5b6PJlSISgSPvng6r2KL6T8Gjfy 8PoV/6r6LPZL5mVOpfqLOUbO0k7O8t/qmh7sOZV99+AJL8OdnRc3qhVLzitjEq/KXDSv+0qX PP/kvSzzfmf41CSuKIiQzd9rfo3NKSz3SeuMhtqtp1iVWIozEg21mIuKEwH7+xM5iwIAAA== X-CMS-MailID: 20190109145027eucas1p2437215de0df4c691eb84d4e84bfc71e5 X-Msg-Generator: CA X-RootMTR: 20190109145027eucas1p2437215de0df4c691eb84d4e84bfc71e5 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20190109145027eucas1p2437215de0df4c691eb84d4e84bfc71e5 References: <20181226163712.31596-1-i.maximets@samsung.com> <20190109145015.3010-1-i.maximets@samsung.com> Subject: [dpdk-dev] [PATCH v3 1/3] net/virtio: add missing barrier before reading the flags 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" Reading the used->flags could be reordered with avail->idx update. vhost in kernel disables notifications for the time of packets receiving, like this: 1. disable notify 2. process packets 3. enable notify 4. has more packets ? goto 1 In case of reordering, virtio driver could read the flags on step 2 while notifications disabled and update avail->idx after the step 4, i.e. vhost will exit the loop on step 4 with notifications enabled, but virtio will not notify. Fixes: c1f86306a026 ("virtio: add new driver") CC: stable@dpdk.org Reported-by: Shahaf Shuler Signed-off-by: Ilya Maximets Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtqueue.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h index d8ae5cdec..dffa03669 100644 --- a/drivers/net/virtio/virtqueue.h +++ b/drivers/net/virtio/virtqueue.h @@ -415,6 +415,11 @@ vq_update_avail_ring(struct virtqueue *vq, uint16_t desc_idx) static inline int virtqueue_kick_prepare(struct virtqueue *vq) { + /* + * Ensure updated avail->idx is visible to vhost before reading + * the used->flags. + */ + virtio_mb(); return !(vq->vq_ring.used->flags & VRING_USED_F_NO_NOTIFY); } @@ -423,6 +428,9 @@ virtqueue_kick_prepare_packed(struct virtqueue *vq) { uint16_t flags; + /* + * Ensure updated data is visible to vhost before reading the flags. + */ virtio_mb(); flags = vq->ring_packed.device_event->desc_event_flags; From patchwork Wed Jan 9 14:50:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 49546 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BEA761B53E; Wed, 9 Jan 2019 15:50:36 +0100 (CET) Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by dpdk.org (Postfix) with ESMTP id 1F4871B4A6 for ; Wed, 9 Jan 2019 15:50:36 +0100 (CET) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20190109145035euoutp024594be5f43ada3854a6a00fe182037cc~4NaCf7jgX1813018130euoutp02i for ; Wed, 9 Jan 2019 14:50:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20190109145035euoutp024594be5f43ada3854a6a00fe182037cc~4NaCf7jgX1813018130euoutp02i DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1547045436; bh=O8HAL1CjeaeTqFl4UcftYR9Ke98ArQ0qrAfISJLVLwY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rjOJsVOlfOB1J3DfZ7rMEdhkV26OmrMhzt8ccwNRDdgD0DfK5WeCMMektGA+7Qcia dbo+spnMjaIG/tHF7/NiSDgysmMsSg6Ptg38YHb4+oziVnQQA9uGbuexRvnM5zBRTI 6QVJQ5jdhOWXSaLesmJQ2RS3Knl4NAlNZxLHXRDA= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20190109145035eucas1p1c6fb89dbd5c02e31d933c78e705c69d7~4NaCIpoCb2852328523eucas1p1I; Wed, 9 Jan 2019 14:50:35 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id B8.40.04806.B3A063C5; Wed, 9 Jan 2019 14:50:35 +0000 (GMT) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20190109145034eucas1p2183e275e316b87917b96fa184fc7d7cb~4NaBc_xUD1577015770eucas1p2q; Wed, 9 Jan 2019 14:50:34 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20190109145034eusmtrp107344abdf3f4ce3451a4b533bc1ec677~4NaBNtCED0367503675eusmtrp1C; Wed, 9 Jan 2019 14:50:34 +0000 (GMT) X-AuditID: cbfec7f5-34dff700000012c6-da-5c360a3b8dd9 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 13.80.04284.A3A063C5; Wed, 9 Jan 2019 14:50:34 +0000 (GMT) Received: from imaximets.rnd.samsung.ru (unknown [106.109.129.180]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20190109145033eusmtip2247ae9e9f359908279fcc5e7423b553d~4NaAP9u1z2020620206eusmtip24; Wed, 9 Jan 2019 14:50:33 +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:14 +0300 Message-Id: <20190109145015.3010-3-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+NgFupjleLIzCtJLcpLzFFi42LZduzneV1rLrMYgwmNohbnPi1jsnj3aTuT xZX2n+wWyy59ZrI4t2Ypi8Wxzj0sFv9/vWK12Nrwn8li//PD7BZ/3phabL44icmB2+PXgqWs Hov3vGTymN79kNnj/b6rbB59W1YxBrBGcdmkpOZklqUW6dslcGWs2/WJqWAdR8XNXbeZGhg/ sHUxcnJICJhILLjygaWLkYtDSGAFo8Snr38ZIZwvjBJ9J3axglQJCXxmlNj7MhOm48erHVAd yxkljr56zgxR9INR4vKhVBCbTUBH4tTqI2CTRAS6GSVePf3MBuIwCzxnlHjx5R47SJWwQJDE +qmrwLpZBFQl7r/dCHYUr4CVxMKjExkh1slLrN5wAKyGU8BaYtmrGWCDJAT62SWuT13EAlHk IvFx+XsoW1ji1fEt7BC2jMTpyT1Q8XqJ+y0vGSGaOxglph/6xwSRsJfY8vocUAMH0HmaEut3 6UOEHSXuPD3JBhKWEOCTuPFWECTMDGRO2jadGSLMK9HRJgRRrSLx++ByZghbSuLmu8/sECUe EmsP8ULC5wCjxL537hMY5WchrFrAyLiKUTy1tDg3PbXYOC+1XK84Mbe4NC9dLzk/dxMjMJWc /nf86w7GfX+SDjEKcDAq8fAm/DONEWJNLCuuzD3EKMHBrCTCq37HJEaINyWxsiq1KD++qDQn tfgQozQHi5I4bzXDg2ghgfTEktTs1NSC1CKYLBMHp1QDo/bJUMufHBOSn31Xft1q/F39lqBd 6N3Pz2Jnvr2zx9L3yOaWyVcZ/kw+q5imcOuiu7GR9Xbxe6euB/ZJPvESfzBlt1y/27bDb+b/ tT9psOXTl2X8U3IL5jcI3k/mW88bxvxF3oKl+bNl4q+dEcq3/aqLN4SZ9y5bKa2092xjQHTb oRLjqJCLd5RYijMSDbWYi4oTAeKoWQIhAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrMLMWRmVeSWpSXmKPExsVy+t/xe7pWXGYxBjNmKlic+7SMyeLdp+1M Flfaf7JbLLv0mcni3JqlLBbHOvewWPz/9YrVYmvDfyaL/c8Ps1v8eWNqsfniJCYHbo9fC5ay eize85LJY3r3Q2aP9/uusnn0bVnFGMAapWdTlF9akqqQkV9cYqsUbWhhpGdoaaFnZGKpZ2hs HmtlZKqkb2eTkpqTWZZapG+XoJexbtcnpoJ1HBU3d91mamD8wNbFyMkhIWAi8ePVDpYuRi4O IYGljBJfLu9nhEhISfz4dYEVwhaW+HOtiw2i6BujxN8bvWAJNgEdiVOrjzCCJEQE+hkldl+/ yQziMAu8ZZTom3SDHaRKWCBAYvKrfcwgNouAqsT9txvBdvMKWEksPDoRap28xOoNB8BqOAWs JZa9mgFWIySQI3Hoy1b2CYx8CxgZVjGKpJYW56bnFhvqFSfmFpfmpesl5+duYgQG+LZjPzfv YLy0MfgQowAHoxIPb8I/0xgh1sSy4srcQ4wSHMxKIrzqd0xihHhTEiurUovy44tKc1KLDzGa Ah01kVlKNDkfGH15JfGGpobmFpaG5sbmxmYWSuK85w0qo4QE0hNLUrNTUwtSi2D6mDg4pRoY JZeWnr37/4nfJu1vx5O92LsvVxcLfXpaVqmR+kpk/kLjsouKrwLflaT480fZzV6VJ254JEze 6u96De/PJz7KGVfOE7GS/LFs5TXBtw+XJ5f0ztxWOe8Jh/fGf/abbhe3zF58zH+72USZdx6d 8zZfV16+Ld5E6YrTFS6n9xoXuTX64+9PkZm6QImlOCPRUIu5qDgRAIfL78CGAgAA X-CMS-MailID: 20190109145034eucas1p2183e275e316b87917b96fa184fc7d7cb X-Msg-Generator: CA X-RootMTR: 20190109145034eucas1p2183e275e316b87917b96fa184fc7d7cb X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20190109145034eucas1p2183e275e316b87917b96fa184fc7d7cb References: <20181226163712.31596-1-i.maximets@samsung.com> <20190109145015.3010-1-i.maximets@samsung.com> Subject: [dpdk-dev] [PATCH v3 2/3] net/virtio: update memory ordering comment for vq notify 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" We're not using io ports in case of modern device even on IA. Also, this comment useless for other architectures. Signed-off-by: Ilya Maximets Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtqueue.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h index dffa03669..53aeac238 100644 --- a/drivers/net/virtio/virtqueue.h +++ b/drivers/net/virtio/virtqueue.h @@ -437,14 +437,13 @@ virtqueue_kick_prepare_packed(struct virtqueue *vq) return flags != RING_EVENT_FLAGS_DISABLE; } +/* + * virtqueue_kick_prepare*() or the virtio_wmb() should be called + * before this function to be sure that all the data is visible to vhost. + */ static inline void virtqueue_notify(struct virtqueue *vq) { - /* - * Ensure updated avail->idx is visible to host. - * For virtio on IA, the notificaiton is through io port operation - * which is a serialization instruction itself. - */ VTPCI_OPS(vq->hw)->notify_queue(vq->hw, vq); } From patchwork Wed Jan 9 14:50:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 49547 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0B5E51B569; Wed, 9 Jan 2019 15:50:43 +0100 (CET) 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 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Reviewed-by: Maxime Coquelin --- 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;