From patchwork Thu Jan 11 12:09:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mawupeng X-Patchwork-Id: 187355 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2411:b0:101:2151:f287 with SMTP id m17csp1399800dyi; Thu, 11 Jan 2024 04:10:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IEXOojPq+zx7/JADpHyCUvtLRdoLi81UhyUOVsTUVU9tcdzPM+sof3bTJhlPQUlPgDDwywH X-Received: by 2002:a05:620a:3913:b0:783:18c4:7d8a with SMTP id qr19-20020a05620a391300b0078318c47d8amr1190145qkn.134.1704975030206; Thu, 11 Jan 2024 04:10:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704975030; cv=none; d=google.com; s=arc-20160816; b=z4E2ayaBQnR2zU50J5TwWNUhBcggA9QSu/R4eui3sM2S3jihZVGL2M4u0GuqYvAwev a8+X22xQwlncsKSYQwi1T9rnckSsBU8ZuLb2kSiSPkiHuKM4GSelOX4fEgxN7YKRwNEr C+8qARFr87pIBYufPTd0e3ZBG8+yIAm8KtOKRLUQ+xPr6MYb1BiAPciu5C2l7zNCnVMB UOD21ORBdNz/6h5fIgeOWfuEAMXPYhcUsqXDuK7jdlkw+gLS/0aXMgLA9mhzdA/UBtJH sPYvZAftlzAjdlOZUJhGMC+dGVFz0VBm5LiY5dxCK98W5JaNszA3/4flXy8nBaedq3tp aNJQ== ARC-Message-Signature: i=1; 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=zWg57uO6w1vlBSJSLwpXFeuEl1yeG3R2L+mCmYVmCC8=; fh=VDFt/Ez8CwS+3hxzG1nckgKJ9OcfII+UembkYqexFFw=; b=amOzcdneVcOWV2AjIL/dgTwSl20ff68E8tGnoikDL/Po8RVmJ3/zfmX1DHsnmQjGSj DyckyEMTqW791ofKbbhEmqRbuEiBKUB3Yfkyskr0uukuq9obMhYNIRWkeLiIvDiArljA MAqdrn5XbP1UkPf+k0XQyAAXl3pKFm/14bW+++nhaXF/9kum1PYZDvFPjmWtwZby8WF9 0jIso3Y6WnzQdolGtMEVMboT/ZMCYb6wAM+He6HhCkayQ9EkBbtjvvZrFPL7wZLCrUpP BVzwrImxIr8ZbHoj4BMyCFxchiKpTk6fyCotDrBzKxqK7lYqb2nDda12kHvb5aopCaRt +BpA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-23562-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-23562-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 bn42-20020a05620a2aea00b007832a1c1451si792406qkb.25.2024.01.11.04.10.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jan 2024 04:10:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-23562-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; spf=pass (google.com: domain of linux-kernel+bounces-23562-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-23562-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 033961C20A1D for ; Thu, 11 Jan 2024 12:10:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D233815EB7; Thu, 11 Jan 2024 12:09:40 +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 427AE15AD2 for ; Thu, 11 Jan 2024 12:09:36 +0000 (UTC) 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.214]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4T9jzV3fqvz1FJ0j; Thu, 11 Jan 2024 20:05:26 +0800 (CST) Received: from dggpemd200001.china.huawei.com (unknown [7.185.36.224]) by mail.maildlp.com (Postfix) with ESMTPS id 183751A0190; Thu, 11 Jan 2024 20:09:34 +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; Thu, 11 Jan 2024 20:09:33 +0800 From: Wupeng Ma To: , , , , CC: , , , , Subject: [PATCH v3 2/3] x86/mm/pat: Cleanup unused parameter in follow_phys Date: Thu, 11 Jan 2024 20:09:28 +0800 Message-ID: <20240111120929.2694440-3-mawupeng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240111120929.2694440-1-mawupeng1@huawei.com> References: <20240111120929.2694440-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: 1787795896819053446 X-GMAIL-MSGID: 1787795896819053446 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, 4 insertions(+), 7 deletions(-) diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c index a6a88679c92e..94bcba399701 100644 --- a/arch/x86/mm/pat/memtype.c +++ b/arch/x86/mm/pat/memtype.c @@ -951,8 +951,8 @@ 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 address, unsigned long *prot, + resource_size_t *phys) { int ret = -EINVAL; pte_t *ptep, pte; @@ -965,9 +965,6 @@ 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; @@ -997,7 +994,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 +1081,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; }