From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94528C3DA79 for ; Tue, 16 Jan 2024 02:20:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0EC516B0078; Mon, 15 Jan 2024 21:20:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 094266B007B; Mon, 15 Jan 2024 21:20:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E08AE6B007D; Mon, 15 Jan 2024 21:20:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id CCD436B0078 for ; Mon, 15 Jan 2024 21:20:34 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 9DE3F1C0D6C for ; Tue, 16 Jan 2024 02:20:34 +0000 (UTC) X-FDA: 81683570388.10.3B92DAC Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf04.hostedemail.com (Postfix) with ESMTP id A45B94001F for ; Tue, 16 Jan 2024 02:20:32 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=MoFiggBY; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf04.hostedemail.com: domain of mhkelley58@gmail.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=mhkelley58@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705371632; h=from:from:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=c4vfRMdoaViI6HxDtxXy2GwJGspyIYSCzcn+j2z7kh4=; b=0nStZaTfHiciRneMhrk7zZIPdmkJ5NSqlV/BybnVm4fNWUYrIVqPvI1bVJXINeOHk41OmQ eGj895nxfvuWIvENQuoktwgtL7v3Z1WsXZENryYo0amus/GoaH2CslL6nn93AJTcvu1/V0 aD9wfWHhS2FcEUowzc7PuVNFoUUGJyY= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=MoFiggBY; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf04.hostedemail.com: domain of mhkelley58@gmail.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=mhkelley58@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705371632; a=rsa-sha256; cv=none; b=i1c+Ndyud/9ydMPILfG9p2wnK1c1jFFQ7+FCSEKiDcYWVuzRFnyOBB8nqGRHEsLzWiwExP f3YQyZ4zwu1QrjkiUN7Q2bheaRe4jEHRXQnyN4TzdeY87Xg+8GrzK6XU4N3Ac2Osi8q9hi JOYYmCXi6OnQdc7plqi6KBUTPNwVfqE= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1d41bb4da91so50984275ad.0 for ; Mon, 15 Jan 2024 18:20:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705371631; x=1705976431; darn=kvack.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c4vfRMdoaViI6HxDtxXy2GwJGspyIYSCzcn+j2z7kh4=; b=MoFiggBYyDwhzGB9O4tyaINlBJO0E5ASlqM2iA+agy1eMmwMqtbW2FkKEUhk/RpG8A anN27JNilm+oWexw+5JpA6svUFwYVv6cTb3uKr50vjlArXRirbRsbf0xS5S5XqVg6AQM p9ZGwjwGD0fKwRV8Vgw0/dornllawci11izbbPoAQebkWG9GlsDGLIMod4oNhQprqPm6 ZWjgPrz3e1pQZbQDMqiEvG1k6iEghA/snPcb2ELOmtcJD8zfjJwV9XsTU6lnTrJ6hoyi npf5kreBcNBwKFx4a98gY8EP7XiIvR2/49LelWH/Xz7ulNpZq4LFaDvT/kHep5cV8bQA Hl+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705371631; x=1705976431; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=c4vfRMdoaViI6HxDtxXy2GwJGspyIYSCzcn+j2z7kh4=; b=fLfkOjS4D7FlBIECvOIGZm5YfNQUfVTSyG7IswA7zJ4C0m7Vx6PzGjf7O+PnZBNxxU mBCunpjLTzIhlPZq3Mnh6iCRgpNJQl4nZKz3P+bEvl7NJFdoz9dymtiXAB+ZNkBr4qQv sv7fQVM2EbyGjoJ8U0s1XOHts0Xh51Rb+4/Ly4eG+3G12Nuh4lWPHJfnkYLKkadRdfhm Xpstc/u685qxZZsHzUpqPmbmx0PWwrgIfMfi9JqX1Yl+FF7IokSa+IIIl1+4LbefdW/H SPPzLiImFO7YzuUVYQqcfJ1LujUUHpWIV8qakWt+k3o2/ZRIVZru4wiOoeguu6HJtMsU n1ow== X-Gm-Message-State: AOJu0YwT6t4CIkZ3PFDeTezgd5Bzg+LumYkPqAAIowLlUW5ayhApE3y6 PaIv6ehbCTrcDCj0e81SK/7EPw9VZbk= X-Google-Smtp-Source: AGHT+IFRVMIEFLp+rPfL0OtTdnRiBOnM5nFlc0pFAGcjr3KeEtvte2JqdiXRGVdv5FquDNd/HY+qHQ== X-Received: by 2002:a17:902:cec8:b0:1d5:c558:164d with SMTP id d8-20020a170902cec800b001d5c558164dmr1779308plg.74.1705371631546; Mon, 15 Jan 2024 18:20:31 -0800 (PST) Received: from localhost.localdomain (c-73-254-87-52.hsd1.wa.comcast.net. [73.254.87.52]) by smtp.gmail.com with ESMTPSA id kn14-20020a170903078e00b001d1d1ef8be5sm8193379plb.173.2024.01.15.18.20.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 18:20:31 -0800 (PST) From: mhkelley58@gmail.com X-Google-Original-From: mhklinux@outlook.com To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, kirill.shutemov@linux.intel.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, luto@kernel.org, peterz@infradead.org, akpm@linux-foundation.org, urezki@gmail.com, hch@infradead.org, lstoakes@gmail.com, thomas.lendacky@amd.com, ardb@kernel.org, jroedel@suse.de, seanjc@google.com, rick.p.edgecombe@intel.com, sathyanarayanan.kuppuswamy@linux.intel.com, linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev, linux-hyperv@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v4 2/3] x86/mm: Regularize set_memory_p() parameters and make non-static Date: Mon, 15 Jan 2024 18:20:07 -0800 Message-Id: <20240116022008.1023398-3-mhklinux@outlook.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240116022008.1023398-1-mhklinux@outlook.com> References: <20240116022008.1023398-1-mhklinux@outlook.com> Reply-To: mhklinux@outlook.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: fh841kjdigschut6e7xqfxw9zuff46ya X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: A45B94001F X-HE-Tag: 1705371632-553845 X-HE-Meta: U2FsdGVkX1/elwMa7EFogdvIOsPJjYJ7sZIyqFrhLarwUjLJuQ21j/13/j1YsuFjq0MXNVLrxnB8N+bTdPSRqp8bA5j24WDP5YNZnHjyifWIFCGhTIeiNUSp9uwULhgbbykCraYqfTkQqPc4y2C4gwikmHVUuHKyaUuM76Xj684Ll9T1Wqk1KEQu8BvbBU5NPpV3rv1xGijoiirflVWoQvHWpmPEunZlB5gMR2ZIObIjuCt9nJou+CM7LRd6479DZ0iLi1AaX3mBRqV9Nh8SUmjR7X7Q6T//wSfoBE9kQf1zTdAh4JtIjn9c7N4zCjW9Wgegtn0jqUmmW1sB0asI+eBffTImauULPPE6eqe+vsPk8Chp7yMuBwkV9hr9Zcy5mezgh9XdUpDaNNzofcA3vKe4s30n8lMvZTS03owuLRXl5DZNiKRO6moofwOex7jFhkutzgvs9odqN3g8xQcQts9tWAPBf8VP3rVGn4MYUEOiugPCIMhLlvwAMFjUlJiPI1RjghsWdyQcenh8CV/+dvjuhIu2R6XEdJwhipsCp0bFavbMI3QLkpoz5jhKY+TNzFKh3J/+/mfmj8XGWs5ZhDEKXgtkyM4BYdQWN1Nfv2iS25WK64Vv0j/Ju47eUKD9qAR93FTjtUB2nyxcd5MhJRtKcw36PzD1EpjSRclOi7d2p2MmtV48Dyw+xiEZTVoLMIcK6JCRF2A3kpNo+UdBAe4FaTq09tS3Nf5Ht9cpJ+rqsUCjVbWbBZ6KoBmCwnujhZcuOdAhrbiJz8m+lNQqBorXZhzAP5xafujdx4I0hYEwjGZdWYQu8gXWIKTBcGViKqqRWunxFcXqNRjxD8vgCmqlaPiItaRPP1rzRBnUKFqmjKdLuV6+/Nqw20pvZFpRjiiiDwFVskLJsPbk+Qz+kU9C7nj1tF5kbeSzTjF49AXJYfZgkfiWaHBkumWW99ypV1bMrEG/Ec08QeXncnc w2jQEINS d4VazPtANGGtmu9DBg8dyvovP5CzY2nLOt+H5horjDBn2KrQ9dPLMbsZGSLBS7ciQNgfaa8gBneGj9SfBn7+iUBmCvfX9yIxZaI6W9O5z9whXv+Co6pkLwNx8bhBLP8RhXWLJv8zX9dU2473zB1thfqcyCWC8oKcoaTL7Bg27fG569WnuBUWcnWGivn8voHNs47IQngObS41RB0PX5ZuFcKtKLK9sOHctijSRUFoNuv0boaFT3bUCyuej0WmG3CSwmyCFXPpnGTStPtsIaS2aoA7McqPShINWf9OU6OBngADrg4zSRi1Pmy8Fwhn0lLXtiLGgpKUSQnAa62P7wYnL1xQgZdLkLiI0gxzJS40yIjwBVL2YxhYpnaSAO4xgfrIkur4FAo64eCFw6wQvD85FBp2MynvoJL7GD8nCMAlYcemy6La/035r/eQAslMXv89SI4ZAM8HmS3R3+55AQOQ4FNgjz96YYofJ94XigdKqGRFhi4mzFu0cDiaSwUx3S/eZPtm0lOY3nEJXWWx/Fu8A5M3M5f9HZZVrZc7sm6ph98rJ4TV5NnJcwEPFsI0Er+Y61425ZkfWvWbClUB+fidfd/FoUIRz/q7ZhipF0FXAC4ByD8CDZRhhxU4Tywy6brUmEnomsdMM7s0jxW7X8lSoEqVmQg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Michael Kelley set_memory_p() is currently static. It has parameters that don't match set_memory_p() under arch/powerpc and that aren't congruent with the other set_memory_* functions. There's no good reason for the difference. Fix this by making the parameters consistent, and update the one existing call site. Make the function non-static and add it to include/asm/set_memory.h so that it is completely parallel to set_memory_np() and is usable in other modules. No functional change. Signed-off-by: Michael Kelley Reviewed-by: Rick Edgecombe Acked-by: Kirill A. Shutemov --- arch/x86/include/asm/set_memory.h | 1 + arch/x86/mm/pat/set_memory.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h index a5e89641bd2d..9aee31862b4a 100644 --- a/arch/x86/include/asm/set_memory.h +++ b/arch/x86/include/asm/set_memory.h @@ -47,6 +47,7 @@ int set_memory_uc(unsigned long addr, int numpages); int set_memory_wc(unsigned long addr, int numpages); int set_memory_wb(unsigned long addr, int numpages); int set_memory_np(unsigned long addr, int numpages); +int set_memory_p(unsigned long addr, int numpages); int set_memory_4k(unsigned long addr, int numpages); int set_memory_encrypted(unsigned long addr, int numpages); int set_memory_decrypted(unsigned long addr, int numpages); diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index e76ac64b516e..164d32029424 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -2045,17 +2045,12 @@ int set_mce_nospec(unsigned long pfn) return rc; } -static int set_memory_p(unsigned long *addr, int numpages) -{ - return change_page_attr_set(addr, numpages, __pgprot(_PAGE_PRESENT), 0); -} - /* Restore full speculative operation to the pfn. */ int clear_mce_nospec(unsigned long pfn) { unsigned long addr = (unsigned long) pfn_to_kaddr(pfn); - return set_memory_p(&addr, 1); + return set_memory_p(addr, 1); } EXPORT_SYMBOL_GPL(clear_mce_nospec); #endif /* CONFIG_X86_64 */ @@ -2108,6 +2103,11 @@ int set_memory_np_noalias(unsigned long addr, int numpages) CPA_NO_CHECK_ALIAS, NULL); } +int set_memory_p(unsigned long addr, int numpages) +{ + return change_page_attr_set(&addr, numpages, __pgprot(_PAGE_PRESENT), 0); +} + int set_memory_4k(unsigned long addr, int numpages) { return change_page_attr_set_clr(&addr, numpages, __pgprot(0), -- 2.25.1