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 CC040A04F9; Wed, 18 Dec 2019 09:19:11 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F0D321C01; Wed, 18 Dec 2019 09:19:10 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 052ECF90 for ; Wed, 18 Dec 2019 09:19:08 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Dec 2019 00:19:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,328,1571727600"; d="scan'208";a="365674572" Received: from dpdk-jiangcheng.sh.intel.com ([10.67.119.194]) by orsmga004.jf.intel.com with ESMTP; 18 Dec 2019 00:19:06 -0800 From: Cheng Jiang To: maxime.coquelin@redhat.com, tiwei.bie@intel.com, zhihong.wang@intel.com, yong.liu@intel.com Cc: dev@dpdk.org, Cheng Jiang Date: Wed, 18 Dec 2019 08:17:11 +0000 Message-Id: <20191218081711.9055-1-Cheng1.jiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191204150312.32697-1-Cheng1.jiang@intel.com> References: <20191204150312.32697-1-Cheng1.jiang@intel.com> Subject: [dpdk-dev] [PATCH v2] 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. Signed-off-by: Cheng Jiang --- 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 | 27 +++++++++++++++++++++++++-- drivers/net/virtio/virtio_pci.h | 6 ++++++ 3 files changed, 33 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..8b4e001a1 100644 --- a/drivers/net/virtio/virtio_pci.c +++ b/drivers/net/virtio/virtio_pci.c @@ -416,9 +416,32 @@ 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 << 15) | + 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