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 6D912C3DA6E for ; Fri, 5 Jan 2024 18:30:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D51036B024E; Fri, 5 Jan 2024 13:30:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CFF596B0258; Fri, 5 Jan 2024 13:30:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B7A266B025F; Fri, 5 Jan 2024 13:30:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 9BC736B024E for ; Fri, 5 Jan 2024 13:30:45 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 66212C09BB for ; Fri, 5 Jan 2024 18:30:45 +0000 (UTC) X-FDA: 81646098450.15.0554DEF Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by imf04.hostedemail.com (Postfix) with ESMTP id 3914A40022 for ; Fri, 5 Jan 2024 18:30:42 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Uij1az9e; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf04.hostedemail.com: domain of mhkelley58@gmail.com designates 209.85.216.43 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=1704479443; 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=lydFpi0OZX3PRN1Ii8TvNVEIYJGkasxvD7FkCrzWjvc=; b=t1XrhhJ9i7LrORVDTglhAKEO6zceR/X8QMzlxb4uvWuitFFUCzh82EdWRLIK6jHhPGH0hl s3lOozXC4zXvzqS1AhSXUSXsRT0lrxbJT2FrCNxgRlnngOJ+LeStzxDDkLPDc+JnHRmpYM S+3TlhUTahGQRzz6OwuV/Lt2BJAuIOs= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Uij1az9e; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf04.hostedemail.com: domain of mhkelley58@gmail.com designates 209.85.216.43 as permitted sender) smtp.mailfrom=mhkelley58@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704479443; a=rsa-sha256; cv=none; b=hgGE83eamjDbFtBt6ep2ZIYUFZ2kpPZl2msKjq0hEv5pEUpGFeA9e44Jp3AXqhP8JcJnax B3NRi0Bn7IMOK5weFn04bftwt5/8ZyNz9dsrzMoQC4uPP6IE00UmtGoO8NXpiEHlOU3ZJG FiR2qjXtM0Gqm9lSphmcF0vmQ8zS8RE= Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-28cba988d6bso1331241a91.2 for ; Fri, 05 Jan 2024 10:30:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704479442; x=1705084242; 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=lydFpi0OZX3PRN1Ii8TvNVEIYJGkasxvD7FkCrzWjvc=; b=Uij1az9erj5pQy32UFaezEVgq7mrHai7hdv7UTmxKAG0FgTdzZBAOQFVPhMk42tBZl zDUtXJ6ijJhP/DtCMfQHT4aZXbdNBOjq+nmJr95iFttQFUCuo3wmSG/XHt7J0pUX0Hh+ BLieHtrJYMsRP4YfggpeLn/OJUaOqRe+u7c8piKCSxXUUWc7GyIhVsgaMY1AJRuPdEiY zevDNkYbkU/O3NbKGkhUuw1jPMp9sxJqVRFaPfKn7Tjmfl8f3JKf03vj1293A1CJWi8B CazxQ9cLZZEDEpCy9Lmjzt2F0U1g2PA9bNQE5L159E5r7atT3tywLVhZM8HX78UHTkwC CYUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704479442; x=1705084242; 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=lydFpi0OZX3PRN1Ii8TvNVEIYJGkasxvD7FkCrzWjvc=; b=VO+k16mssF4QkAynH2Kf+2sOcK+hv2xm/iaL1aEltCugWFgPukBgNbMwn6WJGXz17m CN3D+pUhpTJOcJs67G8+pZn5gvarQIy7WPt2XYcvYicfSb9WsWmj+IMzUyZL9+zIMzP8 tm+s3bIubg9Tu0pi2B1IfSAHO1zlr4FGzoJ29slcz7b2BiKMKWLrqt8av4HprSs7kegU YYaoxKSwSLw0en0nEUXZkrPETh297OC3/PVr1Pb69eLyKqO5DJ4RMFqafYZhNe1XrirF JIryci7PGFtkVBcoUDY11TPJNIbWt/lyNormd6UoCdotkUsZ0iSBEmpAquPRQrlbcliC mDbQ== X-Gm-Message-State: AOJu0YwU7Bk7+iJdZD5AbFGlG9zMVatF2aIZVhzd8DbDECpyqG2d7dVl 6/rD4GCH3szL8B3/BRHX1Ik= X-Google-Smtp-Source: AGHT+IG19yTmGDm43gGH0Te1ADwX3xmhZ2HI5+b+LjzFdjx7tfO595u+C0rtiQTuBnjZcxP5J7fOYQ== X-Received: by 2002:a17:90b:24b:b0:28b:c9fb:e328 with SMTP id fz11-20020a17090b024b00b0028bc9fbe328mr2079013pjb.51.1704479442131; Fri, 05 Jan 2024 10:30:42 -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 23-20020a17090a195700b002868abc0e6dsm1687293pjh.11.2024.01.05.10.30.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 10:30:41 -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 v3 2/3] x86/mm: Regularize set_memory_p() parameters and make non-static Date: Fri, 5 Jan 2024 10:30:24 -0800 Message-Id: <20240105183025.225972-3-mhklinux@outlook.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240105183025.225972-1-mhklinux@outlook.com> References: <20240105183025.225972-1-mhklinux@outlook.com> Reply-To: mhklinux@outlook.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 3914A40022 X-Stat-Signature: ww7psts8wsxby1zqdzauthshtquk3bdf X-HE-Tag: 1704479442-953059 X-HE-Meta: U2FsdGVkX19dVybIvL7AjP1I8MqU9Co4dnaEXIZKmJdnpSPSi58iUeZUuRkEFEYNLV+AAF9mWOtbSaNlrHrJG4ck6SiJAppAN6EzWEsbm2ZOZzuCDT2CduKdvyrlRYOas4StzFHZ2zgaGW1H+Po97bIzI5BZ3aHtzB4SexD4jy/VjrRcfQv3JeM/WuZWTlhpR6YRt5gPvhe3Au1OyGXyaJ0IiAIKdxgcwods2i0arWsCzFmA3SjzNE+pJogTzIJaFU7FmQcatZpOLEzlppczIRS5Avvoap7xhocKpcnvw1QHU3MJKR/IAf+ZCkV+3n7uvfr6e5Xr7psVxQ20MDZvv9CbRr3uec8OV7lPLjB6W7Uj11ng2RWYTUGf5RE2MNpyitwErLdVg0MDGRwxqlWvFsMn+zjLUne7FPRahkvaERTVAybua1s0r/U0dpbIu8nPKr8p6MLvgoCVU8d6XScOwDtMgYP6m+C3KdufuT8E3t8bHl0YybtZjkvEsYWBUpb9o0nZzH2A2IBhEbqkU2/nG4FKNH/xDU+OhH4DB0+YfoLTrbsgPfmfKV5Jb+vIBFMyUGjcgcQgO/bypz42YCpxANHYTzK5WThD4r6c/Fbfwqoi87PdMTpcJWD990OG/SyBhzMYg9Bjt3Ft/o4p5dXVoENyhof+l4oZ0Ci/sjVhkSnkRWnYQjFh12jXodeTD3yvTTsWUGdbVnNZWQuHEVh4Bf93DtqwBw/T8EcjU+b9bz3Pm5l9F71HdT2mWuYvtCDgwRisxAePUK65F7prXkc+SUKkAoyx+NrsmZgSgNeLdmXYI8hIOcYe7aoWWK+36FeF0eC2/mUBMx2apRN1hbPbZsRL1IQduvBbfSTGQloqmoAWPXwRmSOquuIFqHMaVJa8zWkIWVQhsKZUfUbhKAhCD9lkFaWJRC5eSyHTsr/afoN4n5Y5jSQ865XJ3O75pmOvOIMuCpAnKzqHVFXvp4C h8X7DXJU PWDaads+RHBE9qGQokjHkfnDtq/eWHW31v/qaLEZoB8QCgozo796yT9TtCl/ZV4k9YRltB1ZKxZh2Wwy1hZowEoj4ScaNQNdwFD8I1mdEL3Ou6upvd8iTqC0yJ/0LO7LeRbDZeFwV44Y3oapCMWyJD16Zq/IZSiOMupfwVCVm2vgfjEPWLXYKJ+jPJkNRxXmkbfBBQqI00snCK/b1iXhfIX/gUycmYGa8m2olk11WxZKG18i/f773ww45PTq9dvhWUiUmBpgDBWiP2X2c7Ktch0tBPzbQfqnUTD6TDqgMvzfs7L7DwVEUKHQXGrzF/MRSFd50ijV/B2e2n4dagVT0hp+HziI025n+Vpd2r6OUr/R74LENOs5t8PYV5FV2+xzo2qfACBd041/sfTqF1KOO+AG8DP7InoHILvZ3fW4IdhfgpahxGuYfRBRoEK3P41s5S5OmeQnXHeigCGKyjyWKA9UTPd/xcDxqld16sDwXOD9lkASK5w124SuNY2BkbUF7rhhAjwmK7Go4+UAYihmFOrY04FhlV6tlx42VB3AEyc4eI0rm5l71FJRipHjqLMp15GSjVB7Mwl6NPvGXwmN4UDp7g8rp7w1oyAt5RaBLaegJr3R8BF5JGUThpQ== 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 --- 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 8e19796e7ce5..05d42395a462 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -2046,17 +2046,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 */ @@ -2109,6 +2104,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