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 82C33A0352; Mon, 23 Dec 2019 06:17:58 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 92C511C01; Mon, 23 Dec 2019 06:17:57 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 1B2591252 for ; Mon, 23 Dec 2019 06:17:54 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Dec 2019 21:17:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,346,1571727600"; d="scan'208";a="299574535" Received: from dpdk-jiangcheng.sh.intel.com ([10.67.119.194]) by orsmga001.jf.intel.com with ESMTP; 22 Dec 2019 21:17:52 -0800 From: Cheng Jiang To: maxime.coquelin@redhat.com, tiwei.bie@intel.com, zhihong.wang@intel.com, yong.liu@intel.com, gavin.Hu@arm.com Cc: dev@dpdk.org, Cheng Jiang Date: Mon, 23 Dec 2019 05:15:43 +0000 Message-Id: <20191223051543.41579-1-Cheng1.jiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191218081711.9055-1-Cheng1.jiang@intel.com> References: <20191218081711.9055-1-Cheng1.jiang@intel.com> Subject: [dpdk-dev] [PATCH v3] net/virtio: packed ring notification data 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" This patch supports the feature that the driver passes extra data (besides identifying the virtqueue) in its device notifications, expanding the notifications to include the avail index and avail wrap counter. Signed-off-by: Cheng Jiang --- v3: * Modified the commit log to make it more detailed. * Modified the shift mode of notify_data to make it more intuitive. v2: * Removed rte_unused attribute in *hw. * Added some comments on notify_data. drivers/net/virtio/virtio_ethdev.h | 3 ++- drivers/net/virtio/virtio_pci.c | 28 ++++++++++++++++++++++++++-- drivers/net/virtio/virtio_pci.h | 6 ++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h index a10111758..cd8947656 100644 --- a/drivers/net/virtio/virtio_ethdev.h +++ b/drivers/net/virtio/virtio_ethdev.h @@ -36,7 +36,8 @@ 1ULL << VIRTIO_F_IN_ORDER | \ 1ULL << VIRTIO_F_RING_PACKED | \ 1ULL << VIRTIO_F_IOMMU_PLATFORM | \ - 1ULL << VIRTIO_F_ORDER_PLATFORM) + 1ULL << VIRTIO_F_ORDER_PLATFORM | \ + 1ULL << VIRTIO_F_NOTIFICATION_DATA) #define VIRTIO_PMD_SUPPORTED_GUEST_FEATURES \ (VIRTIO_PMD_DEFAULT_GUEST_FEATURES | \ diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c index 4468e89cb..dedd6bdda 100644 --- a/drivers/net/virtio/virtio_pci.c +++ b/drivers/net/virtio/virtio_pci.c @@ -416,9 +416,33 @@ modern_del_queue(struct virtio_hw *hw, struct virtqueue *vq) } static void -modern_notify_queue(struct virtio_hw *hw __rte_unused, struct virtqueue *vq) +modern_notify_queue(struct virtio_hw *hw, struct virtqueue *vq) { - rte_write16(vq->vq_queue_index, vq->notify_addr); + uint32_t notify_data; + + if (!vtpci_with_feature(hw, VIRTIO_F_NOTIFICATION_DATA)) { + rte_write16(vq->vq_queue_index, vq->notify_addr); + return; + } + + if (vtpci_with_feature(hw, VIRTIO_F_RING_PACKED)) { + /* + * Bit[0:15]: vq queue index + * Bit[16:30]: avail index + * Bit[31]: avail wrap counter + */ + notify_data = ((uint32_t)vq->vq_packed.used_wrap_counter << 31) | + ((uint32_t)vq->vq_avail_idx << 16) | + vq->vq_queue_index; + } else { + /* + * Bit[0:15]: vq queue index + * Bit[16:31]: avail index + */ + notify_data = ((uint32_t)vq->vq_avail_idx << 16) | + vq->vq_queue_index; + } + rte_write32(notify_data, vq->notify_addr); } const struct virtio_pci_ops modern_ops = { diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h index a38cb45ad..7433d2f08 100644 --- a/drivers/net/virtio/virtio_pci.h +++ b/drivers/net/virtio/virtio_pci.h @@ -135,6 +135,12 @@ struct virtnet_ctl; */ #define VIRTIO_F_ORDER_PLATFORM 36 +/* + * This feature indicates that the driver passes extra data (besides + * identifying the virtqueue) in its device notifications. + */ +#define VIRTIO_F_NOTIFICATION_DATA 38 + /* 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 -- 2.17.1