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 From patchwork Tue Mar 7 02:26:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mawupeng X-Patchwork-Id: 65196 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2199663wrd; Mon, 6 Mar 2023 18:36:56 -0800 (PST) X-Google-Smtp-Source: AK7set8V/GA9sA84p8F2YeCj9Wdqkr9GqNakFjIb5yWoztau0tjPEMNh6Hq0CwlmEn7z7GwUFa0N X-Received: by 2002:a17:90b:3881:b0:234:409:9752 with SMTP id mu1-20020a17090b388100b0023404099752mr13363920pjb.25.1678156616701; Mon, 06 Mar 2023 18:36:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678156616; cv=none; d=google.com; s=arc-20160816; b=GWnP0dT7t2NvoIv0vXiSQ2fAAnhDfFMIrp1vg/At71B3jelsypLREnNOMNe4hntx2B orY3w1iI/Nl92QBbeQ3yDwSOb7JfTE80WREIacuLpye8c9IQUVTMyPtKCAJTi5Fb8xSU ucD4fi8S9NUrE97RDqGW2Y2A7IcWU4zoVT5NAKWChgPaZMH1ncVrpPegfyX2yKs7xOT5 nzKrQfJy3PP0dwH/rTBqis5wADiqZRJ47FBlJmPVZnYZ7IbXPzg7SRyUg5QO1xShmvEM P3jUdEirfXeepyaQdFflxeUHPj1JgsygjvclCe+bbTjttsjpdoKluwdb+4DsNmArSNtz n7iw== 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=bGjeafQIRwkq/qsZcqxDuivLLXTSZvYIx8jXvFu4JxY=; b=zID/iVMHkjxCKa5R+gkX+z0ge2H05U8+wKLvjLaE4MT/Zr2yb0igJIExgSTkdMdYVG 14fV2A/RTd5TRCHQUjuosNVYjAgAWUzqfd9fOj1iU52Bq6TEKr56qRMa9eDdaX+JXvrF +W5r3xGnBj+KesVXyWf83fcqHLjQ7M5lDQSSO1dhXOJuJmEmvFpjxP+7/7wpJ8S8v8pE I2hxDl3o5DnSc+vbYJ/d5NNfIa2ZL2rM/YdKR73x4Jv6vcGKnOeN+rkFk+n2oLEMYdhX Tl9+9HAVCWruCS45WP+qkZ4t3pIZDjmKWDHC6/VmwRgGYiCVq8jYMOTPxk7KZ/iAkIdv 2vrw== 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 co12-20020a17090afe8c00b00233d4df537asi13351095pjb.158.2023.03.06.18.36.44; Mon, 06 Mar 2023 18:36:56 -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 S229995AbjCGC0d (ORCPT + 99 others); Mon, 6 Mar 2023 21:26:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229914AbjCGC02 (ORCPT ); Mon, 6 Mar 2023 21:26:28 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59CDF4D606 for ; Mon, 6 Mar 2023 18:26:13 -0800 (PST) Received: from dggpemm500014.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PVzl115ntz16PDB; Tue, 7 Mar 2023 10:23:25 +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 2/3] x86/mm/pat: Cleanup unused parameter in follow_phys Date: Tue, 7 Mar 2023 10:26:05 +0800 Message-ID: <20230307022606.2367399-3-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, RCVD_IN_MSPIKE_H2,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?1759674752367557836?= X-GMAIL-MSGID: =?utf-8?q?1759674752367557836?= From: Ma Wupeng Parameter flags is always zero in caller untrack_pfn() and track_pfn_copy(). let's drop it. Signed-off-by: Ma Wupeng --- arch/x86/mm/pat/memtype.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c index 4fb1e89f32e4..3ec025011c90 100644 --- a/arch/x86/mm/pat/memtype.c +++ b/arch/x86/mm/pat/memtype.c @@ -951,8 +951,7 @@ static void free_pfn_range(u64 paddr, unsigned long size) } static int follow_phys(struct vm_area_struct *vma, unsigned long address, - unsigned int flags, unsigned long *prot, - resource_size_t *phys) + unsigned long *prot, resource_size_t *phys) { int ret = -EINVAL; pte_t *ptep, pte; @@ -965,9 +964,6 @@ static int follow_phys(struct vm_area_struct *vma, unsigned long address, 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; @@ -997,7 +993,7 @@ int track_pfn_copy(struct vm_area_struct *vma) * reserve the whole chunk covered by vma. We need the * starting address and protection from pte. */ - if (follow_phys(vma, vma->vm_start, 0, &prot, &paddr)) { + if (follow_phys(vma, vma->vm_start, &prot, &paddr)) { WARN_ON_ONCE(1); return -EINVAL; } @@ -1084,7 +1080,7 @@ void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn, /* free the chunk starting from pfn or the whole chunk */ paddr = (resource_size_t)pfn << PAGE_SHIFT; if (!paddr && !size) { - if (follow_phys(vma, vma->vm_start, 0, &prot, &paddr)) { + if (follow_phys(vma, vma->vm_start, &prot, &paddr)) { WARN_ON_ONCE(1); return; } From patchwork Tue Mar 7 02:26:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mawupeng X-Patchwork-Id: 65205 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2202916wrd; Mon, 6 Mar 2023 18:48:32 -0800 (PST) X-Google-Smtp-Source: AK7set9HOVMDh6FlmBAKmTDqoAPhiBrbxHMWffqG7+w0BoqoKRDcwqKozf2veQcE/4McMLHf2bLB X-Received: by 2002:a17:906:fe08:b0:881:23a:aba5 with SMTP id wy8-20020a170906fe0800b00881023aaba5mr17460713ejb.11.1678157312198; Mon, 06 Mar 2023 18:48:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678157312; cv=none; d=google.com; s=arc-20160816; b=t/4Uqxgn78xSB4fracrHP6gNCuMXTPgIFuF6puIwCQJsDXzb/YJxdFjdk6c80GxBGM wJ9HzhdE0Fs2YLdX0RwtvIYnIJV/SBpDDZGWt9qpJM6wAvBNfIX3qiCO/m3TD54ZuHXc YCit+wyV/IFafiU7FPKx3tTQWfiIwGcHul8wm3FDAt2mbqphcD1cvmLBcQiEUhGf3N7d csW6yZgS93WmS2TZZWBR+MBHhUNQA/tgvEkcUkfU5HGYzNyg4d6PBB5o1M/EwWmaKAQ9 hpctThCe+Zgsyd9XaytvOT0hNbwRZzw0V1f8oe+Yxk9Dkp9MWxXm+yUGB7zt00owCWSM xnXg== 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=OSHjpogGIgSp2Sh4MrhIUIR0Lz7PxX+seRacD9UGHaY=; b=hHfJdGfjMHXxeJxM4tNtJAfsVPow5DSn1CakjwoLeLA7oMLHf/yB50fx8c6y1XqKcH 44cCGk83du3p5CuAAFd+mFYQ67IMZ7Fd5kMI744fWR7MT3oSRRPiRouha/sIfCKNR642 iMUeiKHFq93GncOcm6UkH97BYeSxiX8Byb7kGiG+/bILPglSBPJFU9ombLXdrVnKfkHw /viSl4Ad/p4nkJd60EmmhSppIWIsmALZf23D6OsbG7ha9TODp79372Uk/kGjNv7HLLRx p9Q2fHc2jjHh3S/bLq3PGwkUKUvamYQ8b4rAEDz5BfdPHRHFb6UqKZW4vcvITWN/khAd Mbww== 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 b15-20020a17090636cf00b008d92efb7984si933455ejc.999.2023.03.06.18.48.07; Mon, 06 Mar 2023 18:48:32 -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 S229998AbjCGC0f (ORCPT + 99 others); Mon, 6 Mar 2023 21:26:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229976AbjCGC03 (ORCPT ); Mon, 6 Mar 2023 21:26:29 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B17466A428 for ; Mon, 6 Mar 2023 18:26:13 -0800 (PST) Received: from dggpemm500014.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4PVzl062xwznWTK; Tue, 7 Mar 2023 10:23:24 +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:11 +0800 From: Wupeng Ma To: , , , CC: , , , Subject: [PATCH v2 -next 3/3] x86/mm/pat: Remove WARN_ON_ONCE if follow_phys fails Date: Tue, 7 Mar 2023 10:26:06 +0800 Message-ID: <20230307022606.2367399-4-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?1759675481926390479?= X-GMAIL-MSGID: =?utf-8?q?1759675481926390479?= From: Ma Wupeng WARN_ON_ONCE here is not useful for solving problem since why this PA is not valid is still unknown if follow_phys fails in track_pfn_copy/untrack_pfn, Drop it. Signed-off-by: Ma Wupeng --- arch/x86/mm/pat/memtype.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c index 3ec025011c90..bda4b6b910c2 100644 --- a/arch/x86/mm/pat/memtype.c +++ b/arch/x86/mm/pat/memtype.c @@ -993,10 +993,9 @@ int track_pfn_copy(struct vm_area_struct *vma) * reserve the whole chunk covered by vma. We need the * starting address and protection from pte. */ - if (follow_phys(vma, vma->vm_start, &prot, &paddr)) { - WARN_ON_ONCE(1); + if (follow_phys(vma, vma->vm_start, &prot, &paddr)) return -EINVAL; - } + pgprot = __pgprot(prot); return reserve_pfn_range(paddr, vma_size, &pgprot, 1); } @@ -1080,10 +1079,8 @@ void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn, /* free the chunk starting from pfn or the whole chunk */ paddr = (resource_size_t)pfn << PAGE_SHIFT; if (!paddr && !size) { - if (follow_phys(vma, vma->vm_start, &prot, &paddr)) { - WARN_ON_ONCE(1); + if (follow_phys(vma, vma->vm_start, &prot, &paddr)) return; - } size = vma->vm_end - vma->vm_start; }