From patchwork Fri Aug 9 16:09:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13758972 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 0438CC3DA4A for ; Fri, 9 Aug 2024 16:15:57 +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=XgMG3z25w/FU4W74BEAmfGyy8QhkBSj3TNUPa/vYriM=; b=QscG85F89KPmc5IKkbNaYETqRm 5jl+Ccutkj/8WjLMiUdn1PazsVPVpS+GiWVCj/2RUqOlNyxxLPsUmjqZbW4/74v4Keel5PAMchKQp m+qxQAkKdHNL50X3qPQAmnAW+9HzV4NMiZLfOk4M0+Whklp43PqWyMoGinrQCJUl7ZlmPGY4aJziJ AKDl/N17iepUJoSAJ4btu3BWJZTwU7xgPG6RY4r10PrgEQTj2GYc1MHWh+CWiAkoEnom20cDfcaw6 2SYt+lnxrSJzXSpQUpNwFaHfd5IVfByQRTD5xBwBcsuBknDDJgE2GNpOxVPD2qt0EMOYn5gSaLNKs k8tMW2VA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1scSHJ-0000000BrXE-1xsw; Fri, 09 Aug 2024 16:15:45 +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 1scSBR-0000000BpVR-15eD for linux-arm-kernel@lists.infradead.org; Fri, 09 Aug 2024 16:09:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1723219780; 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=XgMG3z25w/FU4W74BEAmfGyy8QhkBSj3TNUPa/vYriM=; b=YPhU4q7vBmE+shzeD+qcwbh8e578X+hGr3vuwNeBm5qYqMxsMBnME+zKlxZN7JnCarnqL2 yTKc1TIdFJl2CKURUSHheXT3gTeIMavlJlMCO1vMsS7VtZKDZ4ZLtL6g1VrU9fF135a2D6 YhTZ1Ot52w7rd8XGzCds6VOcOi3H04U= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-232-yF-pRAuMNYKq1fjWMX8bUw-1; Fri, 09 Aug 2024 12:09:38 -0400 X-MC-Unique: yF-pRAuMNYKq1fjWMX8bUw-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7a1e41eda5aso5457885a.3 for ; Fri, 09 Aug 2024 09:09:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723219778; x=1723824578; 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=XgMG3z25w/FU4W74BEAmfGyy8QhkBSj3TNUPa/vYriM=; b=D13J1l4pWMgGFOyNSxJghdJKLzmbVYZwhjaCu/Ub8HtX8RaYlrfAuFtP/6Na4khJmj ZeWV4qVDSHf6fw6mKdOxgXjDJbwh1VQ9LcIRfLd9YeA4ap5Vi83pO3eztyJMd61wS6G3 d+H4b2+p5JIkljBbdIu4QUgdPXwJf0DYVGTd6X8/H2LyYluKWSiveeV+z1NICP1ZjNbj Mg4074v0K2OEXGFs2RjH1vLVer3h9CjDmS3XdLK9jCpVlQ2nOBTqgHmgpGpQlVLd7nSE iP5+IWoNj0sALMOJFOKYS7JR5y8aNxDH/sKrfMUT+NyX+G9juT3F+1HqsZou0TXWlR5B XmCg== X-Forwarded-Encrypted: i=1; AJvYcCUtzqs3d8sfd0DoZXOa3eNyuf2m3/mlQBD+7eus3Ye37AmSoR7peyy+8ngI6V7JZt2Bkw+HS3fsZraciGVZpXvBlLZcndWv8itcO4+VYG2lIvfgYQQ= X-Gm-Message-State: AOJu0YxE7izvKiC8Ym1olwpBjSdLeIvWwDAUBxTMthvZMTH97Ybfgf5d jdQ42xN0iVssnAXcOtz0JD5OXl3CT7zgZg3e8sgwRiPMxJR0Hvdy1OHWOqI3BmdKaTB4HSYTQEw FP8tB4FBna25hBoQ9rDBhQKibX9LCS5aIIisWm4JQ0tfrnXGpWOAoQbLKfc2AyPpUEe1OYYGF X-Received: by 2002:ac8:5dd3:0:b0:447:dfa0:283e with SMTP id d75a77b69052e-4531251fe34mr11225391cf.1.1723219777984; Fri, 09 Aug 2024 09:09:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6MoN+Dd8Hdt5Y2cXuQIqSY6AztxI8VpmGorOFfK4YC2KlFlbKhz5m1DVHT1NSvONycoblfw== X-Received: by 2002:ac8:5dd3:0:b0:447:dfa0:283e with SMTP id d75a77b69052e-4531251fe34mr11225161cf.1.1723219777518; Fri, 09 Aug 2024 09:09:37 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Aug 2024 09:09:36 -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 10/19] KVM: Use follow_pfnmap API Date: Fri, 9 Aug 2024 12:09:00 -0400 Message-ID: <20240809160909.1023470-11-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240809_090941_451637_01A553E4 X-CRM114-Status: GOOD ( 15.29 ) 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 pfnmap API to allow huge MMIO mappings for VMs. The rest work is done perfectly on the other side (host_pfn_mapping_level()). Cc: Paolo Bonzini Cc: Sean Christopherson Signed-off-by: Peter Xu --- virt/kvm/kvm_main.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index d0788d0a72cc..9fb1c527a8e1 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2862,13 +2862,11 @@ static int hva_to_pfn_remapped(struct vm_area_struct *vma, unsigned long addr, bool write_fault, bool *writable, kvm_pfn_t *p_pfn) { + struct follow_pfnmap_args args = { .vma = vma, .address = addr }; kvm_pfn_t pfn; - pte_t *ptep; - pte_t pte; - spinlock_t *ptl; int r; - r = follow_pte(vma, addr, &ptep, &ptl); + r = follow_pfnmap_start(&args); if (r) { /* * get_user_pages fails for VM_IO and VM_PFNMAP vmas and does @@ -2883,21 +2881,19 @@ static int hva_to_pfn_remapped(struct vm_area_struct *vma, if (r) return r; - r = follow_pte(vma, addr, &ptep, &ptl); + r = follow_pfnmap_start(&args); if (r) return r; } - pte = ptep_get(ptep); - - if (write_fault && !pte_write(pte)) { + if (write_fault && !args.writable) { pfn = KVM_PFN_ERR_RO_FAULT; goto out; } if (writable) - *writable = pte_write(pte); - pfn = pte_pfn(pte); + *writable = args.writable; + pfn = args.pfn; /* * Get a reference here because callers of *hva_to_pfn* and @@ -2918,9 +2914,8 @@ static int hva_to_pfn_remapped(struct vm_area_struct *vma, */ if (!kvm_try_get_pfn(pfn)) r = -EFAULT; - out: - pte_unmap_unlock(ptep, ptl); + follow_pfnmap_end(&args); *p_pfn = pfn; return r;