From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4A399A00BE for ; Tue, 15 Mar 2022 08:28:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1CB704014F; Tue, 15 Mar 2022 08:28:57 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 94F2F4014F for ; Tue, 15 Mar 2022 08:28:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647329335; x=1678865335; h=from:to:cc:subject:date:message-id; bh=mqyKarBzbU1QmqyAebSLd73VhWFhwS/JDKz7Y3cKPYk=; b=MzYgarYpyOvUrYPx/BMwXHtPGSJh2UTcn425SA+o1ftdbTPgIsJ+Lk2V +yI2+wGU7XkVcKyzg9KeiqAdDyUrkdG6EYkyZ/UNh0OFyXWtUSnjOlYSn 4PwjQKSVVcikSQ4eszxsA3mHjJprjseR3inObQdVYnMgks8Tdl6aHMbpC 1O3lwMdFF0ZgJ5QrrkYDARVDfTAMEHcn3XPDFIsr0v+Pv/qTrMSrRnbtO bYIPouBF+r0uqieS7k8DxJrHLJpKlWnVnniQ2vxDFQ6kmG+kZ8KLPf0fP Nzyors9hl/zrPfdH1lCf4bsT0c7hx6APNXPBqwcGAa+PHLgDUFq1tEP0r g==; X-IronPort-AV: E=McAfee;i="6200,9189,10286"; a="255961987" X-IronPort-AV: E=Sophos;i="5.90,182,1643702400"; d="scan'208";a="255961987" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2022 00:28:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,182,1643702400"; d="scan'208";a="556801962" Received: from npg-dpdk-xuan-cbdma.sh.intel.com ([10.67.110.228]) by orsmga008.jf.intel.com with ESMTP; 15 Mar 2022 00:28:53 -0700 From: xuan.ding@intel.com To: christian.ehrhardt@canonical.com Cc: stable@dpdk.org, Xuan Ding Subject: [PATCH 19.11] vhost: fix field naming in guest page struct Date: Tue, 15 Mar 2022 07:26:26 +0000 Message-Id: <20220315072626.82825-1-xuan.ding@intel.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org From: Xuan Ding [ upstream commit 2ec359747e61db15ab18a78fa35f503a4f647463 ] This patch renames the host_phys_addr to host_iova in guest_page struct. The host_phys_addr is iova, it depends on the DPDK IOVA mode. Fixes: e246896178e6 ("vhost: get guest/host physical address mappings") Signed-off-by: Xuan Ding Reviewed-by: Maxime Coquelin --- lib/librte_vhost/vhost.h | 4 ++-- lib/librte_vhost/vhost_user.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index deeca18f8..5611d0959 100644 --- a/lib/librte_vhost/vhost.h +++ b/lib/librte_vhost/vhost.h @@ -310,7 +310,7 @@ struct vring_packed_desc_event { struct guest_page { uint64_t guest_phys_addr; - uint64_t host_phys_addr; + uint64_t host_iova; uint64_t size; }; @@ -536,7 +536,7 @@ gpa_to_hpa(struct virtio_net *dev, uint64_t gpa, uint64_t size) if (gpa >= page->guest_phys_addr && gpa + size < page->guest_phys_addr + page->size) { return gpa - page->guest_phys_addr + - page->host_phys_addr; + page->host_iova; } } diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index af44d1e69..3264bf7dd 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -931,7 +931,7 @@ vhost_user_set_vring_base(struct virtio_net **pdev, static int add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr, - uint64_t host_phys_addr, uint64_t size) + uint64_t host_iova, uint64_t size) { struct guest_page *page, *last_page; struct guest_page *old_pages; @@ -952,7 +952,7 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr, if (dev->nr_guest_pages > 0) { last_page = &dev->guest_pages[dev->nr_guest_pages - 1]; /* merge if the two pages are continuous */ - if (host_phys_addr == last_page->host_phys_addr + + if (host_iova == last_page->host_iova + last_page->size) { last_page->size += size; return 0; @@ -961,7 +961,7 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr, page = &dev->guest_pages[dev->nr_guest_pages++]; page->guest_phys_addr = guest_phys_addr; - page->host_phys_addr = host_phys_addr; + page->host_iova = host_iova; page->size = size; return 0; @@ -974,14 +974,14 @@ add_guest_pages(struct virtio_net *dev, struct rte_vhost_mem_region *reg, uint64_t reg_size = reg->size; uint64_t host_user_addr = reg->host_user_addr; uint64_t guest_phys_addr = reg->guest_phys_addr; - uint64_t host_phys_addr; + uint64_t host_iova; uint64_t size; - host_phys_addr = rte_mem_virt2iova((void *)(uintptr_t)host_user_addr); + host_iova = rte_mem_virt2iova((void *)(uintptr_t)host_user_addr); size = page_size - (guest_phys_addr & (page_size - 1)); size = RTE_MIN(size, reg_size); - if (add_one_guest_page(dev, guest_phys_addr, host_phys_addr, size) < 0) + if (add_one_guest_page(dev, guest_phys_addr, host_iova, size) < 0) return -1; host_user_addr += size; @@ -990,10 +990,10 @@ add_guest_pages(struct virtio_net *dev, struct rte_vhost_mem_region *reg, while (reg_size > 0) { size = RTE_MIN(reg_size, page_size); - host_phys_addr = rte_mem_virt2iova((void *)(uintptr_t) + host_iova = rte_mem_virt2iova((void *)(uintptr_t) host_user_addr); - if (add_one_guest_page(dev, guest_phys_addr, host_phys_addr, - size) < 0) + if (add_one_guest_page(dev, guest_phys_addr, + host_iova, size) < 0) return -1; host_user_addr += size; @@ -1018,11 +1018,11 @@ dump_guest_pages(struct virtio_net *dev) RTE_LOG(INFO, VHOST_CONFIG, "guest physical page region %u\n" "\t guest_phys_addr: %" PRIx64 "\n" - "\t host_phys_addr : %" PRIx64 "\n" + "\t host_iova : %" PRIx64 "\n" "\t size : %" PRIx64 "\n", i, page->guest_phys_addr, - page->host_phys_addr, + page->host_iova, page->size); } } -- 2.17.1