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 A6A68C4167D for ; Wed, 8 Nov 2023 06:15:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AF74D80010; Wed, 8 Nov 2023 01:15:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AA74E8000D; Wed, 8 Nov 2023 01:15:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 995C680010; Wed, 8 Nov 2023 01:15:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 865998000D for ; Wed, 8 Nov 2023 01:15:08 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 5912C1CB65F for ; Wed, 8 Nov 2023 06:15:08 +0000 (UTC) X-FDA: 81433774296.28.715C50B Received: from mail.alien8.de (mail.alien8.de [65.109.113.108]) by imf28.hostedemail.com (Postfix) with ESMTP id 1CB81C000E for ; Wed, 8 Nov 2023 06:15:05 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=alien8.de header.s=alien8 header.b=IUXL2eqk; dmarc=pass (policy=none) header.from=alien8.de; spf=pass (imf28.hostedemail.com: domain of bp@alien8.de designates 65.109.113.108 as permitted sender) smtp.mailfrom=bp@alien8.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699424106; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Siw88j4EN9rm3CCkm9p9kBj7DtmN6TqUD8LWLvzmcHw=; b=IyVoLBFmr6RL4T+Tz8HOl2EuUrRTp/lG1uAtuaD8BqCcBm5/36JRqi0uKNJCrrafp1SB6E tGCeaAbDgoYm+oH2N0jUQ5v42+seD5B9KRXKHph6J5meuFbyX1rtvRUegl+2aPiPtShAwB hWTZwLubVczIBJ/iYvdxVdI4HSk05K8= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=alien8.de header.s=alien8 header.b=IUXL2eqk; dmarc=pass (policy=none) header.from=alien8.de; spf=pass (imf28.hostedemail.com: domain of bp@alien8.de designates 65.109.113.108 as permitted sender) smtp.mailfrom=bp@alien8.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699424106; a=rsa-sha256; cv=none; b=QM0G83RUiYRotFPhuxPVBqLjTIraOT0NBvo7shD9he8Tedfc6SgxrX5Ah8F7PvddEPhBsQ K1AETJYGX1lpUldkSct03tdVMpjarWn2QClEn7gaHfAc6PTUKKJp0xgjZ4TRBTyDswzB0v kuyX8H/KF6ZNyLWu7a01td0JY4FA81I= Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.alien8.de (SuperMail on ZX Spectrum 128k) with ESMTP id 544A240E01AA; Wed, 8 Nov 2023 06:15:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at mail.alien8.de Received: from mail.alien8.de ([127.0.0.1]) by localhost (mail.alien8.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id EHip46odZLin; Wed, 8 Nov 2023 06:14:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=alien8; t=1699424099; bh=Siw88j4EN9rm3CCkm9p9kBj7DtmN6TqUD8LWLvzmcHw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=IUXL2eqk5iLpWnofHuVYCsP6OCPH/V28fpddsfAb1c80YKs4+RqnST/ctXMB+LDRV U7+qji0J1fuqA6tKsG2M6v716OrADMZPIAq1BRaI6qT4sycj6JuLU8m36R2DGMVFKO mUwDg1kOt6pFcSoG7armcB4E7RNcE4K7qxrnIQzfqD46dRfPYkdPu1eiKCzD9Ky2sY tMm9AqRCnBlw6mVVL48rRg3HEM3dM+KssgEJ5sYV9Z7b3d9fyVg4+AusCxTs/wb54b bOyvODvw7C1CIGk8ZO3Rhn7/eyk3IMdtf2JtQtLaF4ExnhEizRrChjG6sPgudGPn+B JzidoulbJu60FTJfRqNgAdNCYgl3Pqguk/tKWjdnwRf1NfEfKXkk/qh69Bcwr50/QJ dickcZ2iV1b4J/TskV2N4ne4jPBWPGJSWkZGq4LdPlYS/11VmkkySj9Y0kLF6F7EQZ OCQIT5lXqmwhRFg1iDeev1s8oH56rmw68ft3k+5kSmwtyuz64DjhD8lld0DNMqdtnN 8QArxkMPMKTDT8PEuMhAHhFqyV5XGB10heb5B4VDJrjWb57AnINBp8n0PZHuERbWzl M0hg+46dZ44U8KcNNwqw4OgKxla8lzhR86yKCpqV1ku9qkzZY2UpHkPY5zCBfF+A5/ /3q8YGTcgTjG23Z2bCwe9PPU= Received: from zn.tnic (pd95304da.dip0.t-ipconnect.de [217.83.4.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature ECDSA (P-256) server-digest SHA256) (No client certificate requested) by mail.alien8.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id D946840E014B; Wed, 8 Nov 2023 06:14:18 +0000 (UTC) Date: Wed, 8 Nov 2023 07:14:13 +0100 From: Borislav Petkov To: "Kalra, Ashish" Cc: Michael Roth , kvm@vger.kernel.org, linux-coco@lists.linux.dev, linux-mm@kvack.org, linux-crypto@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@redhat.com, jroedel@suse.de, thomas.lendacky@amd.com, hpa@zytor.com, ardb@kernel.org, pbonzini@redhat.com, seanjc@google.com, vkuznets@redhat.com, jmattson@google.com, luto@kernel.org, dave.hansen@linux.intel.com, slp@redhat.com, pgonda@google.com, peterz@infradead.org, srinivas.pandruvada@linux.intel.com, rientjes@google.com, dovmurik@linux.ibm.com, tobin@ibm.com, vbabka@suse.cz, kirill@shutemov.name, ak@linux.intel.com, tony.luck@intel.com, marcorr@google.com, sathyanarayanan.kuppuswamy@linux.intel.com, alpergun@google.com, jarkko@kernel.org, nikunj.dadhania@amd.com, pankaj.gupta@amd.com, liam.merwick@oracle.com, zhi.a.wang@intel.com, Brijesh Singh Subject: Re: [PATCH v10 06/50] x86/sev: Add the host SEV-SNP initialization support Message-ID: <20231108061413.GAZUsnNVcmYZNMw2Kr@fat_crate.local> References: <20231016132819.1002933-1-michael.roth@amd.com> <20231016132819.1002933-7-michael.roth@amd.com> <20231107163142.GAZUpmbt/i3himIf+E@fat_crate.local> <4a2016d6-dc1f-ff68-9827-0b72b7c8eac2@amd.com> <20231107191931.GCZUqNwxP8JcSbjZ0/@fat_crate.local> <20231107202757.GEZUqdzYyzVBHTBhZX@fat_crate.local> <250f5513-91c0-d0b5-cb59-439e26ba16dc@amd.com> <20231107212740.GFZUqrzK7yzy41dRKp@fat_crate.local> <20231107220852.GGZUq1dHJ2q9LYV2oG@fat_crate.local> <4b68fd05-5d21-0472-42c3-6cf6f1f9f967@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <4b68fd05-5d21-0472-42c3-6cf6f1f9f967@amd.com> X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 1CB81C000E X-Stat-Signature: izotnrua8wuykxodqectg5rfgc3dxggt X-Rspam-User: X-HE-Tag: 1699424105-649387 X-HE-Meta: U2FsdGVkX1+uoT/iYZYE0I3zBTPGQ7aFl/wivVY3U4SFcPTh5IfbiL9Zx62e2Y93N+p/5Zxa8HTVVav7MrlPYjQ2DSNNO85UUuI0OG2J5d0KtLuVJtYyEAaMqd+jVbTYLkDnJDtVNkZGQ4/6+KexzJZHSR5umONiM1fFaB8KAWrxcqK0b57FI6eQPX2mi1cZJOvO7nPIg/30lCWt4ySZqLhRKFDev8nlsGVyh2TU82FimWTTqDSeDIMmOTBaKG1RRtxEausN3HEE9/qchyRFoIkjY9fPmEzeDqBNIIXXl9bt3f+JhN/2j5QhQtWorSH4UUCJILq5k3i/QXqY6L7Yy4LNULkthgqh76KM9F3KCUOOLzSt+dxnUuuH3ZeKWZGV7jBgb/6y+i8AtBLVZ6QSSQTPUHAGj/uSDLe0hRJpL3Lev6Jmxb8Ryg4RTriTDUsXk89RveAR/ZD6IRtDahb/RDyb/mDuksiKNXyEfq8hBiX4o1T22uiQn/GuqO6zlM3zd9wJW6+HMGF47zEeQ4WNZ0fh6nsMw+5PefLD8om1tlTgZqnvfcXj/5D3WYH8ZayN+hgJS4jUn7fiZoyDpcA68yP/8J+bnv9//QhM4iDlEY8s+/iU2/QCaWBmexgN3dRJeSQhziJtRsCg80dOYeU9ef2J3y9yhWGt2Mc5DI9T+fi+5+3YNpZms4oUwOx3X9wxMRYjCmEpGpVHBNufHcWDjbyOkHo444BLxtIK07541Bbn3f3INP/xZtSV5NPwl/a+IfY7DajtKLeJJPGGLqgi7DM8FOZaguJ7iyCxuoDzNLOR4sf6eLOMt6WrALNo7jmVx+9frs7hJwSLfZ6peA9/tVz7IJHDZetFV/uMg0nRTT4YcKLaoxzU2T8EykX2SIlEec5Smq2tAgjyB5Lx7w5/+kcFUgHUfXDv8Ofb+qxvReb1uP8CO67FOjWjM3ZvfBB54KLoI3noFKOlnc8kXSi 84YX01gd kUOuon1em3Pa/l7l/YNnW1IxgwbvbJ2bGsq/qKuqMGIJQNu9bhb/8x1GBrc+2Vow/AHuqlMS0CH8H2lpTRDz0iMAuzgDMXZNdJWOetgQYJWR28evL5XcffK8ppoovssPJDggVnrYu334fqKu13MNmEJKhvd5dpzEaVosL8mTsl3Ovs3Vxh2Zj4yNz0F1aL8VLAEzNDe25R/I/GHI= 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: On Tue, Nov 07, 2023 at 04:33:41PM -0600, Kalra, Ashish wrote: > We will still need some method to tell the IOMMU driver if SNP > support/feature is disabled by this function, for example, when CPU family > and model is not supported by SNP and we jump to no_snp label. See below. > The reliable way for this to work is to ensure snp_rmptable_init() is called > before IOMMU initialization and then IOMMU initialization depends on SNP > feature flag setup by snp_rmptable_init() to enable SNP support on IOMMU or > not. Yes, this whole SNP initialization needs to be reworked and split this way: - early detection work which needs to be done once goes to bsp_init_amd(): that's basically your early_detect_mem_encrypt() stuff which needs to happen exactly only once and early. - Any work like: c->x86_phys_bits -= (cpuid_ebx(0x8000001f) >> 6) & 0x3f; and the like which needs to happen on each AP, gets put in a function which gets called by init_amd(). By the time IOMMU gets to init, you already know whether it should enable SNP and check X86_FEATURE_SEV_SNP. Finally, you call __snp_rmptable_init() which does the *per-CPU* init work which is still pending. Ok? Ontop of the previous ontop patch: --- diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 6cc2074fcea3..a9c95e5d6b06 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -674,8 +674,19 @@ static void early_detect_mem_encrypt(struct cpuinfo_x86 *c) if (!(msr & MSR_K7_HWCR_SMMLOCK)) goto clear_sev; - if (cpu_has(c, X86_FEATURE_SEV_SNP) && !early_rmptable_check()) - goto clear_snp; + if (cpu_has(c, X86_FEATURE_SEV_SNP)) { + /* + * RMP table entry format is not architectural and it can vary by processor + * and is defined by the per-processor PPR. Restrict SNP support on the known + * CPU model and family for which the RMP table entry format is currently + * defined for. + */ + if (c->x86 != 0x19 || c->x86_model > 0xaf) + goto clear_snp; + + if (!early_rmptable_check()) + goto clear_snp; + } return; diff --git a/arch/x86/virt/svm/sev.c b/arch/x86/virt/svm/sev.c index 9237c327ad6d..5a71df9ae4cb 100644 --- a/arch/x86/virt/svm/sev.c +++ b/arch/x86/virt/svm/sev.c @@ -199,14 +199,6 @@ static int __init snp_rmptable_init(void) if (!amd_iommu_snp_en) return 0; - /* - * RMP table entry format is not architectural and it can vary by processor and - * is defined by the per-processor PPR. Restrict SNP support on the known CPU - * model and family for which the RMP table entry format is currently defined for. - */ - if (boot_cpu_data.x86 != 0x19 || boot_cpu_data.x86_model > 0xaf) - goto nosnp; - if (__snp_rmptable_init()) goto nosnp; -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette