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 1EA07C3DA6E for ; Fri, 5 Jan 2024 21:28:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A8B456B02C3; Fri, 5 Jan 2024 16:28:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A12AC6B02C5; Fri, 5 Jan 2024 16:28:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8DBAE6B02C6; Fri, 5 Jan 2024 16:28:36 -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 77D796B02C3 for ; Fri, 5 Jan 2024 16:28:36 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4024580B85 for ; Fri, 5 Jan 2024 21:28:36 +0000 (UTC) X-FDA: 81646546632.02.B51F568 Received: from mail.alien8.de (mail.alien8.de [65.109.113.108]) by imf18.hostedemail.com (Postfix) with ESMTP id 096FD1C0002 for ; Fri, 5 Jan 2024 21:28:33 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=alien8.de header.s=alien8 header.b=fzKXy1xy; dmarc=pass (policy=none) header.from=alien8.de; spf=pass (imf18.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=1704490114; 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=wMp96QnJYgVKjGepckhcJBPd5Px0XtoqLOg4+sLtFFg=; b=MA+EZKgcg2yYDMF8v7z2Q8K/EVdO5GZ5rdXfflS2SRBA2Fs7hd6O9du9ayAzyB8Nj0xJM8 OfSbulEVl0KZv/iRz1URzamC5G0L5xk17F+OMiXKvU+QhPArG0LYpc5fU6Dlg2SrGM+/1e aIfbLmjTmKlpfVuYUY++OiKXsFjhgF0= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=alien8.de header.s=alien8 header.b=fzKXy1xy; dmarc=pass (policy=none) header.from=alien8.de; spf=pass (imf18.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=1704490114; a=rsa-sha256; cv=none; b=mUFR34riP0+zSWo1tM6I0g8kfWYXOksunyapptk3k/K1XQC9/PtWjJE2B9E95aHYz8/2GP ww9WGdHhxecdgx2mLhUwEvFDJybETb2P4g7YS/rFIoPK+7W4sUEM6L5/J1rQq0sHjjPqJE 4M4XefBqJ+DyZmZXlv/pkM2amOzRjVg= Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.alien8.de (SuperMail on ZX Spectrum 128k) with ESMTP id 2998E40E016C; Fri, 5 Jan 2024 21:28:30 +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 U_6ilrElvZTJ; Fri, 5 Jan 2024 21:28:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=alien8; t=1704490107; bh=wMp96QnJYgVKjGepckhcJBPd5Px0XtoqLOg4+sLtFFg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=fzKXy1xy/auYCMgCgKvhP0tdfu5oMOyhYcxsf1lyiNxWQUuHmyGCwGXLiTBjIiAmL Y3p0YP6b10Ty/jlWXnz51CKkuqQM6RYjO2GWJCF8OPBF8zknpHJk3OivWNvJZW3brP U9TZj0r5TVc/OR6yMsXu0IzFK6LyFsU2aJ52kLbUH7pcUPkInjNUKQAYSjqZhw7s01 Y5h4hxQH7OrsofIN3DWJmouWAWDTp6ZrqCzoC9yAGbLD1Hgam2kCUj/hn8Hj9mQT1Q 7SNGbnZ5sFnKq2Dx2pirNVfnlMx3+Me5slVtE6xHYDxG9OAyLiTRTF3IBjFsGCZELS 5IGJwqlC0lkni1DkwpRn8VOBZ6gYJ5YYQLbD+IfPACQ63YKDEAmNZ3dZgCI0z8aMIe 9t3rcSzNZuXqxnLldZu0eqB+hBabF+BtxO7uwEND4txRyVTzgkoEF1gfhxzJ70RVv2 Kckcc3C/5t2LpGfj/qnVtAz8eew/OgfiaXXCOiBOnSrFGhlAL9wmfndamKxYNONgKg HR+CAp2zzwmfOxM4HFuf9fmh6Y3lTnmMoGbr8+xE+Nj/JsPIs7UTo8ZE93c+6IpePo q0erZiBiXX2+RFqj3E4QgcP/nPS7rULkzbjKaBnYnrMsDQ+Xn+wSofHUKhEA+eDroK xV/HB2aPCmRMXHB792jfhFqQ= Received: from zn.tnic (pd9530f8c.dip0.t-ipconnect.de [217.83.15.140]) (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 8C5C840E0177; Fri, 5 Jan 2024 21:27:48 +0000 (UTC) Date: Fri, 5 Jan 2024 22:27:42 +0100 From: Borislav Petkov To: Michael Roth Cc: x86@kernel.org, kvm@vger.kernel.org, linux-coco@lists.linux.dev, linux-mm@kvack.org, linux-crypto@vger.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, tobin@ibm.com, vbabka@suse.cz, kirill@shutemov.name, ak@linux.intel.com, tony.luck@intel.com, sathyanarayanan.kuppuswamy@linux.intel.com, alpergun@google.com, jarkko@kernel.org, ashish.kalra@amd.com, nikunj.dadhania@amd.com, pankaj.gupta@amd.com, liam.merwick@oracle.com, zhi.a.wang@intel.com, Brijesh Singh Subject: Re: [PATCH v1 04/26] x86/sev: Add the host SEV-SNP initialization support Message-ID: <20240105212742.GFZZh0TpMZEmah1bBH@fat_crate.local> References: <20231230161954.569267-1-michael.roth@amd.com> <20231230161954.569267-5-michael.roth@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20231230161954.569267-5-michael.roth@amd.com> X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 096FD1C0002 X-Stat-Signature: pw9w3tapswrajycbcajm93pdkn7888ud X-Rspam-User: X-HE-Tag: 1704490113-968202 X-HE-Meta: U2FsdGVkX18/7iur4VRtu5rAcNwXZ6jowqZjyrW/WW7MXXMiMmOYWThqW9J8zyRnrfvRKxVfHU97kITt72ct8FIHAHQeihWnKOOY+JRTUY9OCSvh5BufgK/qzI+cOhpod+V0EnyLuOjzVwbDLtjVmEXLxfuhLHA1DQ2VBaf5yY2JcPIAmUZfgfjfKXQwwcrK0Fn2+TFS7p4VxJgfk7yuYMIVQPjCq+/NsQ1e55ziFIunWVyIvA43mtMR5l6qGP3BBiEd8b0oUIIkI+4zUyl2PrfZ+WsMv6J026k4/bfQWWjfxbxUOJdbUPeZQXW5s2tYI6U2q34iW0zXOJE3ze/+Bbf3TkcqqjTBaGf5P06BAcmPhTg2wgkPDqtgIbVCTFOR4nCKZMmsvrmQAtIePMyWcv8IDWqwutFnAXTlllqgzicWx4LZhowpxCQPpxTbQlo6tZE9sFqC/OgKyp1O07pylJUNbK+2C4Q/pqqj5uHIPxL4TwYXs0/6ugurMhvGHxjjkCMNqQhtJWz+Ng0rvR6NGrmuV4NU+RolnWmst+eGg8drIYd6y8Xd5x4yodnzss3XNugIucNWjY8u6g3eQu6hTEeY1nDCx1shW4aDpXpNv09Grj1P3RsanZfPU8wsjTqFlS1I/hNOUSYHyiGnPhRxR6jTJv0EQ7Wn5E50iPHpfLKIS2+QkXLmQNG//3hEcSJl/5t6KkYwkf6GRs/kO414XH9Dk2SGJrkRMiKwDiBJ2rK+3c6X12G/sD5E0eErOqDmT6hI9zundAc5nuN5M46i7Hqhx2YpqFszgcN588zbIVS9vNeAt/bkuOg79Vo5xOJXbQ/feeVtXVPlwoxF2do+TnnMyGVz9PQisrUgXAhnKeOmrl4QZsr4gp7aWWMXyQ+lUYtBb4OgIxQkNIMeor8ewxCldj00v96RzMcOI1kB0XTKXxrxwxfL6pb8lblA4RkUf8S5CbhEAOidjawe8P+ iRtejchI NSYu1U1T+VRXFM7nciCEZwQKOOloUMT+GOg22SLAWyhW1nhrKNqgXPUSSamRsldJoDukyx8iC4lRswavrohneU0z0tJHPiiUXT8feaLtvg16Dmkn1lPH1jXJKGCELnUwYm+qnIS0Jl+0KuLimEgM5XA8PPpN9LKcQAH/QXX+e+LTRru70UPubTENNSinu2YIaS0tqHeJPRgirrmo= 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 Sat, Dec 30, 2023 at 10:19:32AM -0600, Michael Roth wrote: > +static int __init __snp_rmptable_init(void) I already asked a year ago: https://lore.kernel.org/all/Y9ubi0i4Z750gdMm@zn.tnic/ why is the __ version - __snp_rmptable_init - carved out but crickets. It simply gets ignored. :-\ So let me do it myself, diff below. Please add to the next version: Co-developed-by: Borislav Petkov (AMD) Signed-off-by: Borislav Petkov (AMD) after incorporating all the changes. Thx. --- diff --git a/arch/x86/virt/svm/sev.c b/arch/x86/virt/svm/sev.c index 566bb6f39665..feed65f80776 100644 --- a/arch/x86/virt/svm/sev.c +++ b/arch/x86/virt/svm/sev.c @@ -155,19 +155,25 @@ bool snp_probe_rmptable_info(void) * described in the SNP_INIT_EX firmware command description in the SNP * firmware ABI spec. */ -static int __init __snp_rmptable_init(void) +static int __init snp_rmptable_init(void) { - u64 rmptable_size; void *rmptable_start; + u64 rmptable_size; u64 val; + if (!cpu_feature_enabled(X86_FEATURE_SEV_SNP)) + return 0; + + if (!amd_iommu_snp_en) + return 0; + if (!probed_rmp_size) - return 1; + goto nosnp; rmptable_start = memremap(probed_rmp_base, probed_rmp_size, MEMREMAP_WB); if (!rmptable_start) { pr_err("Failed to map RMP table\n"); - return 1; + goto nosnp; } /* @@ -195,20 +201,6 @@ static int __init __snp_rmptable_init(void) rmptable = (struct rmpentry *)rmptable_start; rmptable_max_pfn = rmptable_size / sizeof(struct rmpentry) - 1; - return 0; -} - -static int __init snp_rmptable_init(void) -{ - if (!cpu_feature_enabled(X86_FEATURE_SEV_SNP)) - return 0; - - if (!amd_iommu_snp_en) - return 0; - - if (__snp_rmptable_init()) - goto nosnp; - cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "x86/rmptable_init:online", __snp_enable, NULL); return 0; -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette