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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5471CC3DA4A for ; Fri, 9 Aug 2024 16:18:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=d0kI5he4gLOJUpsF87CpEeiS1FOCa69CaYI81su9df0=; b=edSHF5/yxiIyn4DvQ9nHTrcoIS YSTUDY05yThFrUFnMV/Ti2y0iUZq7ZpauohLZjsEOZvkuhyDsnNs0b3llemzDYHS0aJPk7tb2guKP ngXmXbgSwiakaXY17mxmLDO/d8QNB2FTLQefjWMHL+ZGyqGcNEh6PkfYwAZNgxr/MgOwRGHLAd3Wb NRxLrSOX9YAIyVc3buyoeZ4LH534bJZ9v5WwGejjzAVYHnIx5CodTdLhCtlZfwOONyTe5+uItJlLf KY2QAAenoi7nEgWk+OvKt9mNQ61mpjTiDc2EE7Uyi7JVGpMwrKcTry5fX5oP97v9nOMkYwRRYak6A pBrufecA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1scSJb-0000000BsKB-1ypQ; Fri, 09 Aug 2024 16:18:07 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1scSBZ-0000000Bpb1-1oTG for linux-arm-kernel@lists.infradead.org; Fri, 09 Aug 2024 16:09:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1723219788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d0kI5he4gLOJUpsF87CpEeiS1FOCa69CaYI81su9df0=; b=YFVhFEyZlAk3sG/F6MSx+BQ114LOjPsaCSOl7OHhHXCThWgGLRRHDIyyjKEWdSEo3kK9rO L9e8RrQcqJUquiDmUsWcMulNkwph/ZkRGgQTIHFdyRL3Q73hWx6n3QI1MBpXqfxTWgFKRY Ef5Ff1pbUq5KsDmbvd1fH/NUquY1MF8= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-552--mRK31t7NimjYx1S1w1OYg-1; Fri, 09 Aug 2024 12:09:47 -0400 X-MC-Unique: -mRK31t7NimjYx1S1w1OYg-1 Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-44fe28cd027so3758421cf.0 for ; Fri, 09 Aug 2024 09:09:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723219787; x=1723824587; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d0kI5he4gLOJUpsF87CpEeiS1FOCa69CaYI81su9df0=; b=bD8SkjnV0ZzXNBsIG/Zu+4azz7VrcWM6KiTp+yuKuUokm4gU/J7ElmeHe2r78e7a54 HF/EGKD7dKQz+h7wrLClLd9msadd7xQ6UBGG3LV4IOmF6TgBJxRBS43+jI1+ePJI0Ocz Qp7tCPPzk2vAeMbu3n6eiD2rqgjuQ51QXoY3sYKamOKhbPRZY8NY4hPXrrkp1XwZrvDo Ubh9NIi0kGqfDMfszQzBnfFWXo2m+AU8LKl4/U6CYLF8LyjIThsqR8qE5TY1jf/7YWk/ 1FdlNr6IMXZg76s974iG2nONCFsChf00on7cg5PxCIhkIssS7+d9DkolQRqowWKRgAiR QEzA== X-Forwarded-Encrypted: i=1; AJvYcCXwP0R2fmND7Y+SUP+94qcI4ZezhMir+jhyIGTFsards3K4anBaRhMai3eU8WlsVIWUbvoU/bRgEbMzk7Dp7QYW@lists.infradead.org X-Gm-Message-State: AOJu0YyNKHsFqmBn3ssfKOEHIZTbFdQUqVcRvtJrT/5odu7R4rU5txUY AuK7gJ8HfKovodOgcdOBSx6gYsI2HW9h4nlQAlwyWiM6sQiHPIDA0JF9TcXTrc9YCDZ8AA0VCq/ VaFwXEJlHmqzAKDOAri+nktwKoX6kVnVE6LXW/f1Mjz/E9Wd6za7PdieteqpZEcVLRd4iqxTv X-Received: by 2002:ac8:5acc:0:b0:450:26ca:9170 with SMTP id d75a77b69052e-4531255b48dmr13596521cf.5.1723219787020; Fri, 09 Aug 2024 09:09:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGxpG5xPFbbw3Y9PVyV1kJ47S21qHA1+Fquj+FmgsVP6Zo0aX1jKS3YWr/9l77XMEl3bpPFxw== X-Received: by 2002:ac8:5acc:0:b0:450:26ca:9170 with SMTP id d75a77b69052e-4531255b48dmr13596351cf.5.1723219786668; Fri, 09 Aug 2024 09:09:46 -0700 (PDT) Received: from x1n.redhat.com (pool-99-254-121-117.cpe.net.cable.rogers.com. [99.254.121.117]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-451c870016csm22526741cf.19.2024.08.09.09.09.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Aug 2024 09:09:45 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Sean Christopherson , Oscar Salvador , Jason Gunthorpe , Axel Rasmussen , linux-arm-kernel@lists.infradead.org, x86@kernel.org, peterx@redhat.com, Will Deacon , Gavin Shan , Paolo Bonzini , Zi Yan , Andrew Morton , Catalin Marinas , Ingo Molnar , Alistair Popple , Borislav Petkov , David Hildenbrand , Thomas Gleixner , kvm@vger.kernel.org, Dave Hansen , Alex Williamson , Yan Zhao Subject: [PATCH 14/19] acrn: Use the new follow_pfnmap API Date: Fri, 9 Aug 2024 12:09:04 -0400 Message-ID: <20240809160909.1023470-15-peterx@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240809160909.1023470-1-peterx@redhat.com> References: <20240809160909.1023470-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240809_090949_566088_5AF6794A X-CRM114-Status: GOOD ( 14.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use the new API that can understand huge pfn mappings. Signed-off-by: Peter Xu --- drivers/virt/acrn/mm.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/virt/acrn/mm.c b/drivers/virt/acrn/mm.c index db8ff1d0ac23..4c2f28715b70 100644 --- a/drivers/virt/acrn/mm.c +++ b/drivers/virt/acrn/mm.c @@ -177,9 +177,7 @@ int acrn_vm_ram_map(struct acrn_vm *vm, struct acrn_vm_memmap *memmap) vma = vma_lookup(current->mm, memmap->vma_base); if (vma && ((vma->vm_flags & VM_PFNMAP) != 0)) { unsigned long start_pfn, cur_pfn; - spinlock_t *ptl; bool writable; - pte_t *ptep; if ((memmap->vma_base + memmap->len) > vma->vm_end) { mmap_read_unlock(current->mm); @@ -187,16 +185,20 @@ int acrn_vm_ram_map(struct acrn_vm *vm, struct acrn_vm_memmap *memmap) } for (i = 0; i < nr_pages; i++) { - ret = follow_pte(vma, memmap->vma_base + i * PAGE_SIZE, - &ptep, &ptl); + struct follow_pfnmap_args args = { + .vma = vma, + .address = memmap->vma_base + i * PAGE_SIZE, + }; + + ret = follow_pfnmap_start(&args); if (ret) break; - cur_pfn = pte_pfn(ptep_get(ptep)); + cur_pfn = args.pfn; if (i == 0) start_pfn = cur_pfn; - writable = !!pte_write(ptep_get(ptep)); - pte_unmap_unlock(ptep, ptl); + writable = args.writable; + follow_pfnmap_end(&args); /* Disallow write access if the PTE is not writable. */ if (!writable && -- 2.45.0