From patchwork Fri Aug 9 16:09:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13758975 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 9E401C52D7C for ; Fri, 9 Aug 2024 16:17:42 +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=HLBqit68L/U2mdwYaFkydFK3txHa+LkmL8n2YTQXnnw=; b=kgdRDY3FxKIZdGztTYnhSNYfE/ eXKwMzrcU71mskepsZnBI0TMN5WX3vINIgBGLUlDPLAFDSAxVp0O0nsiIU8tzCVrRkzCBRGBmmXlL SpbJSbkfU6uXIbE4mX4sypxX680xwpJ1on0Xs6fKLKz9O8qCBt1AbzChroRLyR9yNSRQugnpheJ9y V00LxkB3bu2N9p0Wkn0vjPw8jNPhyupoZGRHftTIlVhD8F5gw9dasZxT3O6yI5PIeLl7T1FEO8csf fq8lc02hvudmYj3cqpWfe65SFMOmukRxhj0nZ5Qra402CeAa/fotGx9EO6LP1FvwkCnqBw6LHhJ6a vZiAhAwA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1scSJ3-0000000BsAc-2vq4; Fri, 09 Aug 2024 16:17:33 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1scSBY-0000000BpaE-45C4 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=HLBqit68L/U2mdwYaFkydFK3txHa+LkmL8n2YTQXnnw=; b=VYVATtrlnw5KmuwEBRbTmIJvpSCUa1nZGITHn/Vwkhc9bhxQ0/WNP2pIZnPcGgbRX9v78j qoMrw3TCF3S5G3J6UB6B6jSYJuUw0S39shv3VZEw2uNQp+nR0W1UCL8RObJJTDhCa/a+Ph o6N/qJUiDRNbxcOFDAPkRT9MMyjWsV0= 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-247-C_Bn9SnBPvS0RRNCl5wO_w-1; Fri, 09 Aug 2024 12:09:45 -0400 X-MC-Unique: C_Bn9SnBPvS0RRNCl5wO_w-1 Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-44fea369811so4530381cf.0 for ; Fri, 09 Aug 2024 09:09:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723219784; x=1723824584; 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=HLBqit68L/U2mdwYaFkydFK3txHa+LkmL8n2YTQXnnw=; b=sDB5hnllDmc1l2mMeGcjsna8jxBCmZmrBCjd3O0oDfNIoMWu0U05ydB0cM6wIoc7FG edwp0ZmNwWIswDs55W7FP1CUhRzCPqaX5EmNI4gNdTTbBFyvO2JVqL7OjTDzUvR6xvca 5Jh4VcIAY+IfJEoRVdixPLud6c66lOoExAQIkEkrhZJd3Y7gEuxL7Sfb1Ne1naU0nxSn JsveMh6qB5iCfnYkBfFTJabFHOxVP8aUghXawbxHtgaxJFhUl+tikpJNUwkB8SBOdpl4 /byY/Nsufo1p2sJ+K8EWPdzuHQVN3pO00w75lOAkr0fU8alfDaNXfoHyB1X6qCNPYpy9 g7GQ== X-Forwarded-Encrypted: i=1; AJvYcCXdH7G2vyNRF8/L4WqdVOP8UxO3Tnljzc96QuLlPpDPyzOznI2c/KE4usRPIff6QVZzFw4tFanPi5V7O9ycTj7NYNlDhivLZGPhcFJ4fiy6ugwcmhQ= X-Gm-Message-State: AOJu0Yxsb2k91fHSMsXpyOGCguKtjFKIshS6fzbCBNAuBcwVjRdhwZgz N6NIn9xutKDUX5GgmWdT4zrTmWz9pLTkNrkR2cs3Dpzh20ay5HuFJOwil4cHwjC+TZCchSYFcKE 4TiUzdaDJOeMMKF+1kkk61c+EBwGyNg4iwVa79Krt4kRaHvbEe2PsXD41isl+cMgWhVRs3dHH X-Received: by 2002:ac8:5f10:0:b0:450:349:1170 with SMTP id d75a77b69052e-4531255c62dmr14745471cf.6.1723219784599; Fri, 09 Aug 2024 09:09:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEFbC3kPrc0fRPufwvcIMbfwNKbDcEyDmf8f6qiGpsAJzwvtAb4AIbgx0osGWWLWwEBOAE+Pw== X-Received: by 2002:ac8:5f10:0:b0:450:349:1170 with SMTP id d75a77b69052e-4531255c62dmr14745171cf.6.1723219784295; Fri, 09 Aug 2024 09:09:44 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Aug 2024 09:09:43 -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 13/19] vfio: Use the new follow_pfnmap API Date: Fri, 9 Aug 2024 12:09:03 -0400 Message-ID: <20240809160909.1023470-14-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_090949_123983_18C75A50 X-CRM114-Status: GOOD ( 14.20 ) 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. Cc: Alex Williamson Cc: Jason Gunthorpe Signed-off-by: Peter Xu --- drivers/vfio/vfio_iommu_type1.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 0960699e7554..bf391b40e576 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -513,12 +513,10 @@ static int follow_fault_pfn(struct vm_area_struct *vma, struct mm_struct *mm, unsigned long vaddr, unsigned long *pfn, bool write_fault) { - pte_t *ptep; - pte_t pte; - spinlock_t *ptl; + struct follow_pfnmap_args args = { .vma = vma, .address = vaddr }; int ret; - ret = follow_pte(vma, vaddr, &ptep, &ptl); + ret = follow_pfnmap_start(&args); if (ret) { bool unlocked = false; @@ -532,19 +530,17 @@ static int follow_fault_pfn(struct vm_area_struct *vma, struct mm_struct *mm, if (ret) return ret; - ret = follow_pte(vma, vaddr, &ptep, &ptl); + ret = follow_pfnmap_start(&args); if (ret) return ret; } - pte = ptep_get(ptep); - - if (write_fault && !pte_write(pte)) + if (write_fault && !args.writable) ret = -EFAULT; else - *pfn = pte_pfn(pte); + *pfn = args.pfn; - pte_unmap_unlock(ptep, ptl); + follow_pfnmap_end(&args); return ret; }