From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29496C7618F for ; Thu, 18 Jul 2019 18:39:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E1F2720873 for ; Thu, 18 Jul 2019 18:39:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=nvidia.com header.i=@nvidia.com header.b="pX9LNe3Y" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E1F2720873 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nvidia.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoBJh-0000J9-3K for qemu-devel@archiver.kernel.org; Thu, 18 Jul 2019 14:39:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49290) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoBJW-0008LG-UE for qemu-devel@nongnu.org; Thu, 18 Jul 2019 14:39:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hoBJU-0005NF-9n for qemu-devel@nongnu.org; Thu, 18 Jul 2019 14:39:33 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:17799) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hoBJT-0005JZ-UD for qemu-devel@nongnu.org; Thu, 18 Jul 2019 14:39:32 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Thu, 18 Jul 2019 11:39:23 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Thu, 18 Jul 2019 11:39:25 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Thu, 18 Jul 2019 11:39:25 -0700 Received: from [10.24.71.22] (10.124.1.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Thu, 18 Jul 2019 18:39:15 +0000 To: Yan Zhao References: <1562665760-26158-1-git-send-email-kwankhede@nvidia.com> <1562665760-26158-12-git-send-email-kwankhede@nvidia.com> <20190712003328.GF9176@joy-OptiPlex-7040> X-Nvconfidentiality: public From: Kirti Wankhede Message-ID: <70fd135d-4719-e39c-09fe-d5a012520ea8@nvidia.com> Date: Fri, 19 Jul 2019 00:09:10 +0530 MIME-Version: 1.0 In-Reply-To: <20190712003328.GF9176@joy-OptiPlex-7040> X-Originating-IP: [10.124.1.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1563475163; bh=Gn4WfeXvu6SUkQBC1l0oWEpF93ImAxfmWuT5lYddvzQ=; h=X-PGP-Universal:Subject:To:CC:References:X-Nvconfidentiality:From: Message-ID:Date:MIME-Version:In-Reply-To:X-Originating-IP: X-ClientProxiedBy:Content-Type:Content-Language: Content-Transfer-Encoding; b=pX9LNe3YkllehhbAG/oSRd3pzMPS81eRbATS3luNXwYZ0jAtSPcuCShMvDFFnP1aK saMGxqBODpuYmibZZoDf0LfJGR4sB/99MXT9GW2r4MzORyTveGCHMWxELzdkBKRRc+ 0PFdsUbnE5scNx1qua0lwI7JXsuLSPjak1vHHIU/w33JP1K5v1hMjRH9+IfO7anbcG /jt4Y8XSOfTWpveo5VzFev6mlGNeLlOwJ4nfqEkdgZbNO+UTwo1N7VM85WUoolqlcF s7+7HwXgmTWZhvm+SVwfDM1e65Dqm2AH/vRW+AbGDgSfem7qnFGzpY72RVUAgPcDJf yJlvl3wmJP76w== X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 216.228.121.65 Subject: Re: [Qemu-devel] [PATCH v7 11/13] vfio: Add function to get dirty page list X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Zhengxiao.zx@Alibaba-inc.com" , "Tian, Kevin" , "Liu, Yi L" , "cjia@nvidia.com" , "eskultet@redhat.com" , "Yang, Ziye" , "qemu-devel@nongnu.org" , "cohuck@redhat.com" , "shuangtai.tst@alibaba-inc.com" , "dgilbert@redhat.com" , "Wang, Zhi A" , "mlevitsk@redhat.com" , "pasic@linux.ibm.com" , "aik@ozlabs.ru" , "alex.williamson@redhat.com" , "eauger@redhat.com" , "felipe@nutanix.com" , "jonathan.davies@nutanix.com" , "Liu, Changpeng" , "Ken.Xue@amd.com" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 7/12/2019 6:03 AM, Yan Zhao wrote: > On Tue, Jul 09, 2019 at 05:49:18PM +0800, Kirti Wankhede wrote: >> Dirty page tracking (.log_sync) is part of RAM copying state, where >> vendor driver provides the bitmap of pages which are dirtied by vendor >> driver through migration region and as part of RAM copy, those pages >> gets copied to file stream. >> >> To get dirty page bitmap: >> - write start address, page_size and pfn count. >> - read count of pfns copied. >> - Vendor driver should return 0 if driver doesn't have any page to >> report dirty in given range. >> - Vendor driver should return -1 to mark all pages dirty for given range. >> - read data_offset, where vendor driver has written bitmap. >> - read bitmap from the region or mmaped part of the region. >> - Iterate above steps till page bitmap for all requested pfns are copied. >> >> Signed-off-by: Kirti Wankhede >> Reviewed-by: Neo Jia >> --- >> hw/vfio/migration.c | 123 ++++++++++++++++++++++++++++++++++++++++++ >> hw/vfio/trace-events | 1 + >> include/hw/vfio/vfio-common.h | 2 + >> 3 files changed, 126 insertions(+) >> >> diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c >> index 5fb4c5329ede..ca1a8c0f5f1f 100644 >> --- a/hw/vfio/migration.c >> +++ b/hw/vfio/migration.c >> @@ -269,6 +269,129 @@ static int vfio_load_device_config_state(QEMUFile *f, void *opaque) >> return qemu_file_get_error(f); >> } >> >> +void vfio_get_dirty_page_list(VFIODevice *vbasedev, >> + uint64_t start_pfn, >> + uint64_t pfn_count, >> + uint64_t page_size) >> +{ >> + VFIOMigration *migration = vbasedev->migration; >> + VFIORegion *region = &migration->region.buffer; >> + uint64_t count = 0; >> + int64_t copied_pfns = 0; >> + int64_t total_pfns = pfn_count; >> + int ret; >> + >> + qemu_mutex_lock(&migration->lock); >> + >> + while (total_pfns > 0) { >> + uint64_t bitmap_size, data_offset = 0; >> + uint64_t start = start_pfn + count; >> + void *buf = NULL; >> + bool buffer_mmaped = false; >> + >> + ret = pwrite(vbasedev->fd, &start, sizeof(start), >> + region->fd_offset + offsetof(struct vfio_device_migration_info, >> + start_pfn)); >> + if (ret < 0) { >> + error_report("%s: Failed to set dirty pages start address %d %s", >> + vbasedev->name, ret, strerror(errno)); >> + goto dpl_unlock; >> + } >> + >> + ret = pwrite(vbasedev->fd, &page_size, sizeof(page_size), >> + region->fd_offset + offsetof(struct vfio_device_migration_info, >> + page_size)); >> + if (ret < 0) { >> + error_report("%s: Failed to set dirty page size %d %s", >> + vbasedev->name, ret, strerror(errno)); >> + goto dpl_unlock; >> + } >> + >> + ret = pwrite(vbasedev->fd, &total_pfns, sizeof(total_pfns), >> + region->fd_offset + offsetof(struct vfio_device_migration_info, >> + total_pfns)); >> + if (ret < 0) { >> + error_report("%s: Failed to set dirty page total pfns %d %s", >> + vbasedev->name, ret, strerror(errno)); >> + goto dpl_unlock; >> + } >> + >> + /* Read copied dirty pfns */ >> + ret = pread(vbasedev->fd, &copied_pfns, sizeof(copied_pfns), >> + region->fd_offset + offsetof(struct vfio_device_migration_info, >> + copied_pfns)); >> + if (ret < 0) { >> + error_report("%s: Failed to get dirty pages bitmap count %d %s", >> + vbasedev->name, ret, strerror(errno)); >> + goto dpl_unlock; >> + } >> + >> + if (copied_pfns == VFIO_DEVICE_DIRTY_PFNS_NONE) { >> + /* >> + * copied_pfns could be 0 if driver doesn't have any page to >> + * report dirty in given range >> + */ >> + break; >> + } else if (copied_pfns == VFIO_DEVICE_DIRTY_PFNS_ALL) { >> + /* Mark all pages dirty for this range */ >> + cpu_physical_memory_set_dirty_range(start_pfn * page_size, >> + pfn_count * page_size, >> + DIRTY_MEMORY_MIGRATION); > seesm pfn_count here is not right Changing it to total_pfns in next version Thanks, Kirti >> + break; >> + } >> + >> + bitmap_size = (BITS_TO_LONGS(copied_pfns) + 1) * sizeof(unsigned long); >> + >> + ret = pread(vbasedev->fd, &data_offset, sizeof(data_offset), >> + region->fd_offset + offsetof(struct vfio_device_migration_info, >> + data_offset)); >> + if (ret != sizeof(data_offset)) { >> + error_report("%s: Failed to get migration buffer data offset %d", >> + vbasedev->name, ret); >> + goto dpl_unlock; >> + } >> + >> + if (region->mmaps) { >> + buf = find_data_region(region, data_offset, bitmap_size); >> + } >> + >> + buffer_mmaped = (buf != NULL) ? true : false; >> + >> + if (!buffer_mmaped) { >> + buf = g_try_malloc0(bitmap_size); >> + if (!buf) { >> + error_report("%s: Error allocating buffer ", __func__); >> + goto dpl_unlock; >> + } >> + >> + ret = pread(vbasedev->fd, buf, bitmap_size, >> + region->fd_offset + data_offset); >> + if (ret != bitmap_size) { >> + error_report("%s: Failed to get dirty pages bitmap %d", >> + vbasedev->name, ret); >> + g_free(buf); >> + goto dpl_unlock; >> + } >> + } >> + >> + cpu_physical_memory_set_dirty_lebitmap((unsigned long *)buf, >> + (start_pfn + count) * page_size, >> + copied_pfns); >> + count += copied_pfns; >> + total_pfns -= copied_pfns; >> + >> + if (!buffer_mmaped) { >> + g_free(buf); >> + } >> + } >> + >> + trace_vfio_get_dirty_page_list(vbasedev->name, start_pfn, pfn_count, >> + page_size); >> + >> +dpl_unlock: >> + qemu_mutex_unlock(&migration->lock); >> +} >> + >> /* ---------------------------------------------------------------------- */ >> >> static int vfio_save_setup(QEMUFile *f, void *opaque) >> diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events >> index ac065b559f4e..414a5e69ec5e 100644 >> --- a/hw/vfio/trace-events >> +++ b/hw/vfio/trace-events >> @@ -160,3 +160,4 @@ vfio_save_complete_precopy(char *name) " (%s)" >> vfio_load_device_config_state(char *name) " (%s)" >> vfio_load_state(char *name, uint64_t data) " (%s) data 0x%"PRIx64 >> vfio_load_state_device_data(char *name, uint64_t data_offset, uint64_t data_size) " (%s) Offset 0x%"PRIx64" size 0x%"PRIx64 >> +vfio_get_dirty_page_list(char *name, uint64_t start, uint64_t pfn_count, uint64_t page_size) " (%s) start 0x%"PRIx64" pfn_count 0x%"PRIx64 " page size 0x%"PRIx64 >> diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h >> index a022484d2636..dc1b83a0b4ef 100644 >> --- a/include/hw/vfio/vfio-common.h >> +++ b/include/hw/vfio/vfio-common.h >> @@ -222,5 +222,7 @@ int vfio_spapr_remove_window(VFIOContainer *container, >> >> int vfio_migration_probe(VFIODevice *vbasedev, Error **errp); >> void vfio_migration_finalize(VFIODevice *vbasedev); >> +void vfio_get_dirty_page_list(VFIODevice *vbasedev, uint64_t start_pfn, >> + uint64_t pfn_count, uint64_t page_size); >> >> #endif /* HW_VFIO_VFIO_COMMON_H */ >> -- >> 2.7.0 >>