From patchwork Tue Mar 7 02:26:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mawupeng X-Patchwork-Id: 65207 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2203805wrd; Mon, 6 Mar 2023 18:51:33 -0800 (PST) X-Google-Smtp-Source: AK7set+M5zopRQ/1YcaxNPyp749KZ0Adjy+fzwZBWH+SQq/ozF+OAVYRF/J/UbJDZmhuPWhqQtMC X-Received: by 2002:a05:6a20:2a0a:b0:cc:d44a:bec3 with SMTP id e10-20020a056a202a0a00b000ccd44abec3mr11354529pzh.18.1678157493134; Mon, 06 Mar 2023 18:51:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678157493; cv=none; d=google.com; s=arc-20160816; b=Ju8hZvJo5tODvkYtYSoCWHlWiUYfATZXIJ0b7lNwxnhnIxrdCyPvKA9VpBNK1Tq5aX gslNWm5YkDloFB3F8un3InU/bd3jDYMfWM9b8GfBSfbp2qvU8s8+gc5UBQsmezelmcGi sejvb6C1n8OYmg1DFMvON3KUjB9kGXTj4A2KJQFn6bpawYho/t8rfT4GKLuGIYW/nu47 qFh1RzCXvq1TmiVY+eJycRBEXXjhwuvP/dZPC0yGhtruuD0YXnlZjtSF/jLk0Sqea5CL IbKdJz27vGxBf6jiOJhi8C0UPhvQoHNSK3Iaj5rPm7aU85T8OMKBQcteAa8CKD+llHCr f9eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=bldxJApvm+gQ4QSyNjs1ywaf9iWGxY6CeZ60abuyvIo=; b=qCnB1WSfYupxv08G2fG6KYFGlCnHkst+qojjQr9W8GpbQr9HmhUxtVa+9XDt25vvfV gFs7HhMoG4FBysy9+ukT+ZHYTnk79wMGQbhU09jfSGsnXPJD5nevoKpMJTAF+EGSTI0P K8QNgb59d2mO5M7+o9mb+7u/rgbqx5mYQCGjwAxYJ7FA2tdblK1NZb7/sdgj46rDnZ+K 0yFwgs31nQpadpfgrf/6m0jnaQJzizJfMw7xIqKNjW2bOAIn6jgf2r37k3LtAhqpXpc+ dATK5O/CiH95bNdFTUpalm9O5YUfJ7BJ9ibKxAwMML+CwZdO9xmcytWJPB1ikr+WseIj uaaQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j191-20020a6380c8000000b0050373058436si11205432pgd.647.2023.03.06.18.51.19; Mon, 06 Mar 2023 18:51:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229871AbjCGC0b (ORCPT + 99 others); Mon, 6 Mar 2023 21:26:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229653AbjCGC02 (ORCPT ); Mon, 6 Mar 2023 21:26:28 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 177425CC23 for ; Mon, 6 Mar 2023 18:26:12 -0800 (PST) Received: from dggpemm500014.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4PVzlp5YjczKqKs; Tue, 7 Mar 2023 10:24:06 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemm500014.china.huawei.com (7.185.36.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Tue, 7 Mar 2023 10:26:10 +0800 From: Wupeng Ma To: , , , CC: , , , Subject: [PATCH v2 -next 1/3] x86/mm/pat: Move follow_phys to pat-related file Date: Tue, 7 Mar 2023 10:26:04 +0800 Message-ID: <20230307022606.2367399-2-mawupeng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307022606.2367399-1-mawupeng1@huawei.com> References: <20230307022606.2367399-1-mawupeng1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500014.china.huawei.com (7.185.36.153) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759675671185149731?= X-GMAIL-MSGID: =?utf-8?q?1759675671185149731?= From: Ma Wupeng Since only PAT in x86 use follow_phys(), move this to from memory.c to memtype.c and make it static. Since config HAVE_IOREMAP_PROT is selected by x86, drop this config macro. Signed-off-by: Ma Wupeng --- arch/x86/mm/pat/memtype.c | 28 ++++++++++++++++++++++++++++ include/linux/mm.h | 2 -- mm/memory.c | 28 ---------------------------- 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c index de10800cd4dd..4fb1e89f32e4 100644 --- a/arch/x86/mm/pat/memtype.c +++ b/arch/x86/mm/pat/memtype.c @@ -950,6 +950,34 @@ static void free_pfn_range(u64 paddr, unsigned long size) memtype_free(paddr, paddr + size); } +static int follow_phys(struct vm_area_struct *vma, unsigned long address, + unsigned int flags, unsigned long *prot, + resource_size_t *phys) +{ + int ret = -EINVAL; + pte_t *ptep, pte; + spinlock_t *ptl; + + if (!(vma->vm_flags & (VM_IO | VM_PFNMAP))) + goto out; + + if (follow_pte(vma->vm_mm, address, &ptep, &ptl)) + goto out; + pte = *ptep; + + if ((flags & FOLL_WRITE) && !pte_write(pte)) + goto unlock; + + *prot = pgprot_val(pte_pgprot(pte)); + *phys = (resource_size_t)pte_pfn(pte) << PAGE_SHIFT; + + ret = 0; +unlock: + pte_unmap_unlock(ptep, ptl); +out: + return ret; +} + /* * track_pfn_copy is called when vma that is covering the pfnmap gets * copied through copy_page_range(). diff --git a/include/linux/mm.h b/include/linux/mm.h index 5f16263d176d..226f2f7cefd7 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2311,8 +2311,6 @@ int follow_pte(struct mm_struct *mm, unsigned long address, pte_t **ptepp, spinlock_t **ptlp); int follow_pfn(struct vm_area_struct *vma, unsigned long address, unsigned long *pfn); -int follow_phys(struct vm_area_struct *vma, unsigned long address, - unsigned int flags, unsigned long *prot, resource_size_t *phys); int generic_access_phys(struct vm_area_struct *vma, unsigned long addr, void *buf, int len, int write); diff --git a/mm/memory.c b/mm/memory.c index 0adf23ea5416..93ad6b45f426 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5454,34 +5454,6 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address, EXPORT_SYMBOL(follow_pfn); #ifdef CONFIG_HAVE_IOREMAP_PROT -int follow_phys(struct vm_area_struct *vma, - unsigned long address, unsigned int flags, - unsigned long *prot, resource_size_t *phys) -{ - int ret = -EINVAL; - pte_t *ptep, pte; - spinlock_t *ptl; - - if (!(vma->vm_flags & (VM_IO | VM_PFNMAP))) - goto out; - - if (follow_pte(vma->vm_mm, address, &ptep, &ptl)) - goto out; - pte = *ptep; - - if ((flags & FOLL_WRITE) && !pte_write(pte)) - goto unlock; - - *prot = pgprot_val(pte_pgprot(pte)); - *phys = (resource_size_t)pte_pfn(pte) << PAGE_SHIFT; - - ret = 0; -unlock: - pte_unmap_unlock(ptep, ptl); -out: - return ret; -} - /** * generic_access_phys - generic implementation for iomem mmap access * @vma: the vma to access