From patchwork Tue Feb 20 03:48:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mawupeng X-Patchwork-Id: 203396 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp176728dyc; Mon, 19 Feb 2024 19:49:08 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU3Tww0zDXS+Pxk4vCccGMXucLqotZmkdeMGiwa9lQROlV17VzWRZSUK0WSVIKNJfhGMTlKojxQdSCt9frZc6oY158HNw== X-Google-Smtp-Source: AGHT+IHnyuycBhbeiO560LWl56egBbvjuB1CR3m2wjbejKyLODZohi4eGP95syaQcG1LZoyICP93 X-Received: by 2002:a05:622a:216:b0:42d:ae52:76a3 with SMTP id b22-20020a05622a021600b0042dae5276a3mr16501626qtx.1.1708400947855; Mon, 19 Feb 2024 19:49:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708400947; cv=pass; d=google.com; s=arc-20160816; b=tBEQUtNDrlzbUEOs3HyPDttwGiLOqhLSZjNBlrkYrO/Sy0B//APVIjS37i+NxS2Cm/ IPAf1bdp3TEDB9eCkBlJC1NRXpmiG+EYCGhk8I0GKgQqbrbgGZB966YskHGFLWSHMpBV SptsDdYDK7Io1gpZwvxyxv7ZlFZLefJREhYtKeVoUiVYAsJ5ukTTvCPAN1/D61/Wdgey zuz0CooFDPxG6Yh0zyATTDw+XLdT57ghvgrWv2lxhvEGJUUYQ8RmF+feLefwxQo+DNnJ 6aFZVBY+k7KuMoVqTrE7hlEKB2ggihZdHmCYRL07eJG94RJznJiJvMIXP1CeZr5fF/vm tfOQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=fr65SOWCv23X2MiY+qvdBo27LS6DAuaxHnQjCbyPxrg=; fh=zpgpHhi7NFRm0UrQnwLzLdFqTpbxRncqQ6HhcVWeB8c=; b=VlPLgWOwZJqzXiPfrAVdyZOb0J0SZMwr9GoKTg6rPFGfU8mOBnh3zxEVFUJS7jcXBy FdYVHD5TBYjyKILiBhUO7dfPFSrVSOdtWPJFDiVMbqp1hAY0yS0NxfYuRx0KYINrbuYc oNyaplpt/IUTFbMe5j/OEqjX1BD1YV2RMc0XrButqhOqFjLosmFGMs2TzTf7cZHzX0f6 LXAxYn2jYcBcRy4Zv/QlDtI3dUgsnLZhxwdWLQgdnVvLpGb4Ys1//5rr3lvmAjDWFCK/ pIT/xZ1K1Vys1g887cjxj0OZyHSQQA1d9HxUy+iX2IuFACWXzG+xAPvFO8AOZ0HHD/W8 Bqpw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-72285-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72285-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id k7-20020ac84787000000b0042ddba98debsi7392957qtq.179.2024.02.19.19.49.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 19:49:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-72285-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-72285-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72285-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 9EA241C21393 for ; Tue, 20 Feb 2024 03:49:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3C93856B81; Tue, 20 Feb 2024 03:48:47 +0000 (UTC) Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D53891C2E for ; Tue, 20 Feb 2024 03:48:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.191 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708400925; cv=none; b=SeUpQSKFPRTRwOZyUI2+uLhOB/vUGReNzEIg+fgrdpiUiQJ5vsqxhNnGIZ1onh3GWuXfFUIBf7X8oVRSLaGnvP0lbIP6E4PRlmtwcnRM1hgCXprlj4FT+1YC7IlSVriLHLyrKIFoFPsdw3nX6Ob5vJlz9FR1hKVbbMVRteDRdio= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708400925; c=relaxed/simple; bh=HZH4hKQzxLHFZ1M195Fil/k9uUanGNnlf5EBFb/dF+8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LnVTWssaRwKSYk6yQ5IeKLTPrBZogdlgTjvgi4Je5V8s6w8OUqczj/swJCC4ft8E4eNZqJhJluSPru2RgS15V4xKiwYne9sM3D80SpE91Bm0HTui2MT2RhvjDjNuLN6TI9dQGmcVCln3OmWdr9NJ5VGNAEjSdWTCrCxkMO0eHQA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.191 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.234]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Tf4yF70nMz1FKnT; Tue, 20 Feb 2024 11:43:49 +0800 (CST) Received: from dggpemd200001.china.huawei.com (unknown [7.185.36.224]) by mail.maildlp.com (Postfix) with ESMTPS id 50EA11402DE; Tue, 20 Feb 2024 11:48:40 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemd200001.china.huawei.com (7.185.36.224) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1258.28; Tue, 20 Feb 2024 11:48:39 +0800 From: Wupeng Ma To: , , , , , CC: , , , , , , , Subject: [PATCH v4 1/3] x86/mm/pat: Move follow_phys to pat-related file Date: Tue, 20 Feb 2024 11:48:33 +0800 Message-ID: <20240220034835.507022-2-mawupeng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240220034835.507022-1-mawupeng1@huawei.com> References: <20240220034835.507022-1-mawupeng1@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemd200001.china.huawei.com (7.185.36.224) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791388232670594365 X-GMAIL-MSGID: 1791388232670594365 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 0904d7e8e126..d8c37aaaf041 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_get(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 f5a97dec5169..75c683f2f5ae 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2375,8 +2375,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 15f8b10ea17c..86ad7f1ca3af 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5802,34 +5802,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_get(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 Feb 20 03:48:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mawupeng X-Patchwork-Id: 203398 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp176778dyc; Mon, 19 Feb 2024 19:49:26 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWavI6oH2kqOHcwXPi8lb3zug/3SycO4vANR+vH05W6bwOdSjVWN7+SkOIWHopzuIZ5Dj03MEnQVHcvzE05QUbPebmLsQ== X-Google-Smtp-Source: AGHT+IFAOHOe4TNFfAj+0qXv8Xohpb4ejfW4+7d50M6eBjcqjYlFoDBG45NAXtp1HCcV9g1Kd7dn X-Received: by 2002:a81:7184:0:b0:607:75e7:80db with SMTP id m126-20020a817184000000b0060775e780dbmr12531220ywc.13.1708400966461; Mon, 19 Feb 2024 19:49:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708400966; cv=pass; d=google.com; s=arc-20160816; b=AsRk9WJFfnu6RH3y7eUlA9NkCl3ef6CESJwoSBPIqvCDfzrwTzHr7btAgv/06oft4J GUDsG5fgvtIF8IK/HDEX50KFNydRpwyLuvatBij3ONuFHeJLGSc9B76tHtDuoQy/GOvn OtBQzSKwmYd7o4F3EHC8Xu3lxeoR7+zKdDpDxYFlXPpcCG5ncflrosMtk6dpiF4iLWZe V59R6Ve2V0ce5F9EcFBxmLAAgxjYRi63GGCmLp5D6s0P+RNaG+hypmd+QdZyfqnD6aZR WckO3um5BIQ801Yp1UIjH5/71uyYmHr6Fu/W1r9sJBBRUuspcBkCWr6QroeCgtuX5bCt Wxtg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=1y5FaYj1i+odH+owYs3noPuKxt5kmgxCeslWrccCwcI=; fh=zpgpHhi7NFRm0UrQnwLzLdFqTpbxRncqQ6HhcVWeB8c=; b=d55eTJvzWSG8aVNwsF2jfxNDPMbrQMRaztvluO6K+isdfkVMIfnb8hSUa0d9ES3/Er JgXOBAS2tvjiGNPaaQhY5TBRsJ1BdBql+R1zGbpnLU1Cx0crRlVtCX4VdcbRlle4nZHm WMlo+SwcpyX0u4KbwWoqDXqExCXLOAPNYWja+pzjp0o68PZOCdsMadIAb8tzymL+TnRg Xb8xaqowj3odbZmg9ZS5ur2yXCIL1GK09+Tkss/Zaz7E9WhaHsBSlO0Jk+AZs57zL6K+ MMMj02qyQ9xLdfwrYcfcS8ZtlgJUTFdMiQL5F9si4K3R1c7T1e7guJ9JfRX7WCs482rg iNRg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-72288-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72288-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id h12-20020ac87d4c000000b0042db63f4a4fsi8056998qtb.591.2024.02.19.19.49.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 19:49:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-72288-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-72288-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72288-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 442C21C211F2 for ; Tue, 20 Feb 2024 03:49:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A6EF85813A; Tue, 20 Feb 2024 03:48:48 +0000 (UTC) Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 41A6242A90 for ; Tue, 20 Feb 2024 03:48:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.190 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708400927; cv=none; b=eJp6U82BvTfIONAlhKLgL89qA6sfILTkxb3JlIauoKuoxjZg9x+Q018BA0xKzK2dyauuaZWaax7ihipRjnIuu8A4Qhoi9uM9FBXxDBTd9XPfehpDamNUK6rSpolKDAes4Glzvbp5aRkEvf6qdXeptccUdYJLwgEaC/Wtt8ANJ8s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708400927; c=relaxed/simple; bh=9zPP/06aqtEGjkcTlwLNHLTPh3CxYzxxpdU+1Cgyaso=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Uaw4Io/LwS82dcJXPKp7vKx5R/HVmnN5b3cvbZH8dipbXr+EsC+OfKib+fSohTRnMvwIxX7g3+8Jcv/FoYoFOTYS0KPR3YTXRrl3ssTMhHL4GnE67lw/wd4ibsAbUMgZyDUdm+T5EioXG65IxYtq1N3Y1NW8vjwIEHzB9OhNBn4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.190 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.234]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4Tf51P26KHz2BdDP; Tue, 20 Feb 2024 11:46:33 +0800 (CST) Received: from dggpemd200001.china.huawei.com (unknown [7.185.36.224]) by mail.maildlp.com (Postfix) with ESMTPS id 09ADB1402DE; Tue, 20 Feb 2024 11:48:41 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemd200001.china.huawei.com (7.185.36.224) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1258.28; Tue, 20 Feb 2024 11:48:40 +0800 From: Wupeng Ma To: , , , , , CC: , , , , , , , Subject: [PATCH v4 2/3] x86/mm/pat: Cleanup unused parameter in follow_phys Date: Tue, 20 Feb 2024 11:48:34 +0800 Message-ID: <20240220034835.507022-3-mawupeng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240220034835.507022-1-mawupeng1@huawei.com> References: <20240220034835.507022-1-mawupeng1@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemd200001.china.huawei.com (7.185.36.224) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791388251979362328 X-GMAIL-MSGID: 1791388251979362328 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 | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c index d8c37aaaf041..5b56f08f8ce6 100644 --- a/arch/x86/mm/pat/memtype.c +++ b/arch/x86/mm/pat/memtype.c @@ -950,8 +950,7 @@ 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, +static int follow_phys(struct vm_area_struct *vma, unsigned long address, unsigned long *prot, resource_size_t *phys) { int ret = -EINVAL; @@ -965,14 +964,10 @@ static int follow_phys(struct vm_area_struct *vma, goto out; pte = ptep_get(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; @@ -997,7 +992,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 +1079,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 Feb 20 03:48:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mawupeng X-Patchwork-Id: 203397 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp176754dyc; Mon, 19 Feb 2024 19:49:16 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXJwGRoVKCCU7h7h066GxRrV+bw09DclT4Nnv2MSIn8xsnz+sKRgMDC5E/QpJ2ewkIQCBNLYIk/60HiapYp9CHkfwIR/w== X-Google-Smtp-Source: AGHT+IFBdcdKRaAPMcHGjw9P8tla1DgS7ZAd61R/D+LXjyMCRVP/m7Z7frdAPdL+TCRYrvXRljf8 X-Received: by 2002:a17:902:fc8f:b0:1dc:b8f:cd0f with SMTP id mf15-20020a170902fc8f00b001dc0b8fcd0fmr2784820plb.54.1708400956704; Mon, 19 Feb 2024 19:49:16 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708400956; cv=pass; d=google.com; s=arc-20160816; b=A3bXQz8M+xjgC1X+kH/1JIosBGuefhejXI9esADsXYHgfrfLdkCvXcNcytftloIBS5 C9GWN0J4ID27ylPMpnPGM562xsm+Whjub+yVlV+/l7YSkF2X4VWNz8TQyEOXLnbQLw8t SawWytdodVlOIhki6h4OY0EiF/sMgba7ZBWDw9IUm+/1GkOpfvoO4E3jZtzPivz4OBp0 YqXUCcjrKUd4qFuE1dciUWPLEJ8NJ7/p0wpQ1T6pBeoymm39Z0R3d7frhOwgVuA3ZBkv fvdJgrL1fPyWuD34jGlOSf4XsAZC6TD3VUI+b2dAkMfGOMAeoHWVRb/Ev4s7nnsoKhUi lc9w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=UBMm2ylMBBUFwI9+Hbt/7fHj5CXw3f0ET8LE1lr09gM=; fh=zpgpHhi7NFRm0UrQnwLzLdFqTpbxRncqQ6HhcVWeB8c=; b=WutO/PQFTqDt/4adkKnPSASQXv8HFhZP+MRaD4Vka0FXeYyNcMGjgCSYjGWAkmVfj0 nhaETTk9lAo/62vb7WjuEVoEIITc4e8jj7PssmZdNFiniVrBzJ3dynZ0Ae0Aq6THv6NI 25gHh561otG11jhmSVZ2kEYDP4+T9bzv54ZKYR4Mz6CxIVCR0R+2TfE/H8XBMnHLCwp2 zs83Dz30lgHDPj2cAh2IjK3f6poqAVyeEx6E5X7cD5RRDbKqi7hyTUOHtmf6VO4fZeC3 bzvt6HiAGIQYxIAI6ja2kRDxzQqj/aDsJRt/rNwY7jEGO+yKh2ecFI6jpF/Hqkyx37w4 502A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-72286-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72286-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id cp1-20020a170902e78100b001da2a2c90e4si3538983plb.438.2024.02.19.19.49.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 19:49:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-72286-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huawei.com dmarc=pass fromdomain=huawei.com); spf=pass (google.com: domain of linux-kernel+bounces-72286-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72286-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 85531281012 for ; Tue, 20 Feb 2024 03:49:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 992F357316; Tue, 20 Feb 2024 03:48:47 +0000 (UTC) Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 41AA247A4C for ; Tue, 20 Feb 2024 03:48:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.190 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708400926; cv=none; b=h/58vaSPM2kRei1xqkKb+iZzbYRXsT3mWk9guyi/sN+JeUBevyCtG3ENdQ7RyFy5bIBvFj5dr/MVIbIE6v8dqKlor0sLu8pR4/IcfHYJhTYiIehRupbFWthrpYYiFUNUTdcrSso0HHW+ilz3I/QybBdnRlNq9ESid+DvMTDisgc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708400926; c=relaxed/simple; bh=Z6elAPMbAM6XrnscquSpysia9b+peWJJ+5rOVH2M9ds=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Y2Vr7OWMf7P73mKSKAoU9Kz3tjc9KQK+NMCFXB79p0zviYVU05y3lI7oAME+JpdPKHo9A5ECf90VUMNw6Ba/tWSfMeEQFshRwsP1zEOMNVuVYX8iF+OYn/+8boEdbAkOyW6hPNR93reSH9mlTwf2dCxTXb0UfuxHhCKPDj9x6Ks= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.190 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4Tf52J35Gtz1xnMy; Tue, 20 Feb 2024 11:47:20 +0800 (CST) Received: from dggpemd200001.china.huawei.com (unknown [7.185.36.224]) by mail.maildlp.com (Postfix) with ESMTPS id A29B0140120; Tue, 20 Feb 2024 11:48:41 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemd200001.china.huawei.com (7.185.36.224) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1258.28; Tue, 20 Feb 2024 11:48:40 +0800 From: Wupeng Ma To: , , , , , CC: , , , , , , , Subject: [PATCH v4 3/3] x86/mm/pat: Remove WARN_ON_ONCE if follow_phys fails Date: Tue, 20 Feb 2024 11:48:35 +0800 Message-ID: <20240220034835.507022-4-mawupeng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240220034835.507022-1-mawupeng1@huawei.com> References: <20240220034835.507022-1-mawupeng1@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemd200001.china.huawei.com (7.185.36.224) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791388241739125916 X-GMAIL-MSGID: 1791388241739125916 From: Ma Wupeng Since there is no obvious reason to keep this WARN_ON_ONCE 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 5b56f08f8ce6..5b3a7a2b21e3 100644 --- a/arch/x86/mm/pat/memtype.c +++ b/arch/x86/mm/pat/memtype.c @@ -992,10 +992,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); } @@ -1079,10 +1078,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; }