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 83443C61D90 for ; Tue, 21 Nov 2023 21:20:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 39F056B04A0; Tue, 21 Nov 2023 16:20:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2D8C56B04A3; Tue, 21 Nov 2023 16:20:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0DD216B04A1; Tue, 21 Nov 2023 16:20:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id E89216B049D for ; Tue, 21 Nov 2023 16:20:44 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C16AC120433 for ; Tue, 21 Nov 2023 21:20:44 +0000 (UTC) X-FDA: 81483230808.15.23B4773 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf19.hostedemail.com (Postfix) with ESMTP id F04C21A0012 for ; Tue, 21 Nov 2023 21:20:42 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Dwft2jpm; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.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=1700601643; 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=SKZ1/19bZDjXmVD1CEbmEpv81ZSrP5Qqz0tPf+dknk4=; b=ojhA2TfDk7S6WfAsi8dP+dBYp/E6DqbRu3A0n+93oqZlr/UU5A0iKcMkmQCw+caZjCbSBK ZqPxxlMO8qGV1CTblu/psXnzptjpiNkOqBFpSCS0LoifsG12H1ubj/yslk+rdBgIkphVst NsENCX4bldnruiQbWukmy+GSQYLSq6I= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Dwft2jpm; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.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=1700601643; a=rsa-sha256; cv=none; b=jBFqo4W1wACmkJYAGbeZWbZJ0vYWgu4sxKcN0UiXaI5w72ZAhPawDriV5ZxXAvUs2lRyZn 1cKt2Es0mI3R2KAwQFIeo9jVpjB7xxRYSzz64UWAMdFY3JyaiFfparJwbHZF6tzDheZBjg SpV9Q8rvPSffVx0unQxYcOFqO8WGWX0= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1ce3084c2d1so50993185ad.3 for ; Tue, 21 Nov 2023 13:20:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700601642; x=1701206442; 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=SKZ1/19bZDjXmVD1CEbmEpv81ZSrP5Qqz0tPf+dknk4=; b=Dwft2jpmrpG4+uBZ/XplwaqQdGhNUox3jl0DYq1lKDVG06N64RgwaEzfaJeMzLzvP7 1DcAG9aBIqa2mKG7lrIbalkMAeuigDzMkXLiN5JNgyf0Inq19HgE5otxgrshpl7exNZk EXw6zPslWKiwwtPvbhCavQtIt7u2GSJBGVnvIMf1x8iKHcnd+8V5BNhfZlc5/y1DBI15 5cpZY/HBjoBe5LSGC+gmDAczXVB9X1jK+hR5AKDJY6pARTWA0hsPR/YEBGUkxmPYnOL+ i2tQ45RlP4pdaXNB1gbVapc2lHk7HwU1ARaxgZcvQeB0SbjEWQvPs7b7xY7Sh+BegxAB 7xyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700601642; x=1701206442; 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=SKZ1/19bZDjXmVD1CEbmEpv81ZSrP5Qqz0tPf+dknk4=; b=E4QgDDlYDr/XXQb3aWtFkySGSrqs+/r923cuuC7NNtbFsWPQT6i7IwmswV0OjH/xG7 hR342m23oYddE/vx+AJGop4ULxjbEtOX4JdVRYb9Wm3WiZKlCB4QT8w7Ll0S6CAFr7dq TdpIGlRzm1VNhyM6mzp3N2bd5v/p7GwXjRqdcYsy//VRePdQINHgujC/gc/0dhfXUR30 yq0NHjFwL2+en8EMfT92fgtH8GqGFiKLRI86UPCYRbzaBFkMW2kZf4+gI1JxwZhKEDzp ETguB9locE+hxdKn/CPPld0q1ZfjMXxm4lfGLW+Hgt9weMqA4mWRjAuLKSYtgDg9sjr1 +BBw== X-Gm-Message-State: AOJu0YyzYQ4xou8ajdsH9mgpQ950FeWEuf8b4Ejyy8Ufkg6eFTY3aydZ CJSS2SAY0NqeR8n1jN9NMCE= X-Google-Smtp-Source: AGHT+IGz0GBc2L6fKdHOp277El3AvOBOL/M7tgvndLmzeYqXyjHTZ5visODxoyvzOD8ddZlnIN7psg== X-Received: by 2002:a17:903:2281:b0:1cf:6315:8698 with SMTP id b1-20020a170903228100b001cf63158698mr401033plh.42.1700601641967; Tue, 21 Nov 2023 13:20:41 -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 j2-20020a170902758200b001bf52834696sm8281924pll.207.2023.11.21.13.20.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 13:20: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, kys@microsoft.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 v2 7/8] x86/mm: Remove unnecessary call layer for __set_memory_enc_pgtable() Date: Tue, 21 Nov 2023 13:20:15 -0800 Message-Id: <20231121212016.1154303-8-mhklinux@outlook.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231121212016.1154303-1-mhklinux@outlook.com> References: <20231121212016.1154303-1-mhklinux@outlook.com> Reply-To: mhklinux@outlook.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: F04C21A0012 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 34j1745co7fm4eogpb97zrjazbh5rbyn X-HE-Tag: 1700601642-227258 X-HE-Meta: U2FsdGVkX19rTURdJkLHhLYWadEezn1k01jW1Gk6FryNKbO8AaTklZrgpuAl88YBhjZBESrn6gRkSMsE2Zl0VpyMRAp0jV+R357ovkLQ3ZD9fHpBPEwt0/c2v4R+QGt/UUCVxZ7rqs24Db7Qg8J0mo6fU7YbhW/8dTE21FaJWFnX7S6lIkXs+8+mjybQhzIHB0PxjyP9ipQXCG4D+xBPfjWMsrZQ8U9WaV7saa5Eo6Tlc0yb3A9omhIwrdAZINkWcSw20YqdmFe6itduAAH3oF46bI8gUBbCEvpS4E7saDEKZNDpfzmj+U270+Ufol19XlhhTTx/NhiGZyMzv2Bpm8NGXbePfK/ngNLUs7GA5UuC6WXMktaJUOZyzX+0x5sfc26f1lk1NE0yw5wvEg6FlkYTFppoM8lUMqtEMUCaxjySMrYayBIgpAWft2BTTUk0mzXw4Gz2pOHcBepojeppc74qBtSK5O/fN9Vimz995+CXcjBz9sM8ZMdtVk6MDxnpdT1cuZd0bq2Jy//5x6w1hhNaSub7xg269qSdsiPQdyP94jfeCT09+MUlMgbD07QjtQPeuchs7mY7/vpbKStC+tDRV6vU5DSP7LLH8VM1ShRvLvMYgeJjY+WF+z8YwVVWvBNEwd1BwhDySp6Fv5PqFqGr57cr6jEDNcoKdW0aIc5w/PP2KInSsbjDbndoi3ZDlslO7+o/v6R3ZlgHLbkAtybpQFIOxPxh3YuaDYQPI2Mge2iB0jEOLGY7f/oF7r1x52Y/veFfRM7Q5Tkf8/GiIrqHSrrm4+/sUGw2Msasx7S3MYkk+/D4spSxCGpgk0vQYVrfUHDDG/QHvIqFAJN2GeQlBlI+qyeFtXquAexOqZR6bMhx20GAgR/0hdg1C0CXQ4I7hdkZHYtywxtrARaA1dBMyqeToVpi9SarZANvVwlJRKyKhv1jsZ+VGI2S4nI8hGTB09Zjd/HNvt7NFnW NK2lEfTa C/6usGffO/7wrf1MFa97P43R3keiA3bCSY5l4XAIJOal2Rulijc9eLmIjpj1DuC9ghUKHiGd6gN1St01K+vAZIcDhHQGeZjQscabOdbqW+5su51O9vqG2xQft7sTTDGI7a2GfyPskGvPXyCnkqpkbkY61slncCJrvcZ79g+wMpgu2xS9JMC6/rKNQZTX5lxablJmakA8LUJYsFI9cfPfc5FLgp41EyJawTg87tyljYJoHoWeqMYL2pojiOqSDbhnhESaeB7fGq/kCfPs9+IWXxQFr8dRc+r/3Lx+mavAWTjYwGBgs/8egwCBgcm9zutDGjF1CGgpCmhY3inU/g4CdhHcZrG53tjzhzd1Z6bIaxCSXhZ1EL8AwOKZu9UTN25cmH9ROw6QWoBv0n2ZcWHmf9LeHCrlfv9f+u/Nm7ASTSZ4yZyw8K3wXRSwmPTeivpsyku1pQXbwrAp7YDV0I2iDcg5AZyyVIsb3h+TLTy1A9b8vRPVxfiezm4New2YNHkjBGEKGGoyl97lxM5ZYxsG927mjTso0IHRxF9llwxfvEyBpZQxzYdsCgpy5qFUHfvwzVToBnZiE4pTxQkXY1NaC3h+0oOuVcmaHuxGzoRPiYHXO2pdxjRNQctCsxg== 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_enc_pgtable() is only called from __set_memory_enc_dec() after doing a simple validation check. Prior to commit 812b0597fb40, __set_memory_enc_dec() did more complex checking, but now the code can be simplified by collapsing the two functions. No functional change. Signed-off-by: Michael Kelley --- arch/x86/mm/pat/set_memory.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index c13178f37b13..7365c86a7ff0 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -2131,15 +2131,18 @@ int set_memory_global(unsigned long addr, int numpages) } /* - * __set_memory_enc_pgtable() is used for the hypervisors that get + * __set_memory_enc_dec() is used for the hypervisors that get * informed about "encryption" status via page tables. */ -static int __set_memory_enc_pgtable(unsigned long addr, int numpages, bool enc) +static int __set_memory_enc_dec(unsigned long addr, int numpages, bool enc) { pgprot_t empty = __pgprot(0); struct cpa_data cpa; int ret; + if (!cc_platform_has(CC_ATTR_MEM_ENCRYPT)) + return 0; + /* Should not be working on unaligned addresses */ if (WARN_ONCE(addr & ~PAGE_MASK, "misaligned address: %#lx\n", addr)) addr &= PAGE_MASK; @@ -2200,14 +2203,6 @@ static int __set_memory_enc_pgtable(unsigned long addr, int numpages, bool enc) return set_memory_p(&addr, numpages); } -static int __set_memory_enc_dec(unsigned long addr, int numpages, bool enc) -{ - if (cc_platform_has(CC_ATTR_MEM_ENCRYPT)) - return __set_memory_enc_pgtable(addr, numpages, enc); - - return 0; -} - int set_memory_encrypted(unsigned long addr, int numpages) { return __set_memory_enc_dec(addr, numpages, true); -- 2.25.1