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 C08DCC46CD2 for ; Sat, 27 Jan 2024 11:42:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F3F2B6B0072; Sat, 27 Jan 2024 06:42:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EEEA96B0074; Sat, 27 Jan 2024 06:42:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DB6A36B0078; Sat, 27 Jan 2024 06:42:57 -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 CC8E26B0072 for ; Sat, 27 Jan 2024 06:42:57 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 765E71A0238 for ; Sat, 27 Jan 2024 11:42:57 +0000 (UTC) X-FDA: 81724904394.25.F07992B Received: from mail.alien8.de (mail.alien8.de [65.109.113.108]) by imf19.hostedemail.com (Postfix) with ESMTP id 3AF031A001D for ; Sat, 27 Jan 2024 11:42:54 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=alien8.de header.s=alien8 header.b=eC4rs6Wd; dmarc=pass (policy=none) header.from=alien8.de; spf=pass (imf19.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=1706355776; 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=Z+24pU73zrvlVW/zZsFzlGVxb2gSvEeHL9ZKSaOfvm8=; b=wQvmdnmsdbNg4kmqhX3zHS+RkHrlL5hKzUTgfcq45R0sqXJdIpwpYuPTj6m4bzfh2+98kE HULrpVc7/6dSn6SRB/5wpZ+1gKbKA0te+Zf9g3Gr+BxSkeHYETxFgEv6dt+XDzRaPtW0eG ZEg6N9jT3qaZaKgbmbDLRGWS4EyrBxQ= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=alien8.de header.s=alien8 header.b=eC4rs6Wd; dmarc=pass (policy=none) header.from=alien8.de; spf=pass (imf19.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=1706355776; a=rsa-sha256; cv=none; b=RPC4kNZbLDl5hUxHpyi6v9kT2YrrRmQ3IZyCQMd+fAX+Jv9EQfUZbjh0BkqLwmon3Fqifl hfIpjA5mowFh618R5f2MDe1OZdjpryOGRA1+S0nr1a5ywqacUHcHUNG7tLRKhLO/rtXF/w Y1rtFZ0+Ma4ajg+SV4PequeusG9l0/s= Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.alien8.de (SuperMail on ZX Spectrum 128k) with ESMTP id 4F3AA40E0196; Sat, 27 Jan 2024 11:42:51 +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 CIObjHhXZrUT; Sat, 27 Jan 2024 11:42:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=alien8; t=1706355768; bh=Z+24pU73zrvlVW/zZsFzlGVxb2gSvEeHL9ZKSaOfvm8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=eC4rs6WdjoEAKl2hlM4DT8Ngyn7hIzO1XtLqEGVdcosggtPTaawBo0zgWCPYL0fp0 tXHcSXmV9rsQa1LznoqFpESHm5PRtL6p7P9t91N+pCjdpT1nUmTFRfqvLzPi4yPncD AbFcv6pi0dgWN3pzy7KBBMK5uYvXEf1+cCbxD3wogXe/gdKmqYtCs1R723GFv2uqTF r9qdDIguH8bY6RrAQRDKIbyGKezDOrtTmgibvnjyMAPZ/mcYg+iNHpb6Qbq+lpoYaG h/H3Xzhi5LwTQxppVDMluSTI+kUEINJjQkBkOVUlhk/xseeqzpv8bH0wc7bp0u2Sbc bPelKuYVSeN74fAIy+GORMmBwW3Q0wjtRqCjXPfImX6pM3GEF6+1w8uetPJmV2MDsf gmF1XSHCxkf1VTEMBYkknctBJfZrPSlBy5xIfAzqUf83N3nAJlCBEZg0vtyhS/2XwG Mx6ApzoIcVSR17zE4NkrPPRoHVJ1e46DR3F24AYYrzcEQo2JQvwE3NNP3BXz/wY4Eh f+j7/Rox/xWnB99wp6N7L8V+buOHpbNVVEAC2hNWsfizH9XIRtc1rFJXd6yXzU2VqM 9bGD1cD5mLnomB2H9Xxv5PJslPh068zLfH20RKayB50XALaa6PGfV1mhv1/y6bhKqu pKzTDG5kVuhAuqJOMmtPjZy0= Received: from zn.tnic (pd953033e.dip0.t-ipconnect.de [217.83.3.62]) (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 7310540E016C; Sat, 27 Jan 2024 11:42:12 +0000 (UTC) Date: Sat, 27 Jan 2024 12:42:07 +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 Subject: Re: [PATCH v2 11/25] x86/sev: Adjust directmap to avoid inadvertant RMP faults Message-ID: <20240127114207.GBZbTsDyC3hFq8pQ3D@fat_crate.local> References: <20240126041126.1927228-1-michael.roth@amd.com> <20240126041126.1927228-12-michael.roth@amd.com> <20240126153451.GDZbPRG3KxaQik-0aY@fat_crate.local> <20240126170415.f7r4nvsrzgpzcrzv@amd.com> <20240126184340.GEZbP9XA13X91-eybA@fat_crate.local> <20240126235420.mu644waj2eyoxqx6@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20240126235420.mu644waj2eyoxqx6@amd.com> X-Rspamd-Queue-Id: 3AF031A001D X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 6yegb13j4rrhbws5swrfy15rzrgwes1y X-HE-Tag: 1706355774-505016 X-HE-Meta: U2FsdGVkX1/Z29yVwLVZGSmM03IQGZyseaE6w5/sqMUP/MuLRH0P9P/IHRjhkUAuvjmF7yyVHittYLbmgi10KfItN3T2V0hkR3w82UuhKcHInqjaxHhxUuITR8+e/KkrvRKQcXIsVEHI1pDks8Z+hpCoqVl1ziiG2NktacHRAzwtIHPDFh/Lht9apx3ZTakNq2YIwgS66bgPqm+Ump0ujEAP0/mQD+nFIAWH24xYC8oGPQ0ZonaTnuZu3FMiYJxNdWxaLP3HukUiVY2eSWUQy67flMeWAORIFoeYMurxuNZd85fpo0hfDHX1x8X1VWfOZ9QiEB6YVsIa5c7Z7ckBvxoWJUWrgHhPPRIcxTQ2AldPLvt5WeepDQiLOgzdn6TPmERKaJuj5ZmUbG6LuGpgHK+kDvYSOzjYIBsdup0UNQ4NAx/+hUiUK18I19iYPYNV672tIEwBkiEJYbyJRwTqBynJu9/F7FLB84xN99/mwThpZxOYIRXqcxOG14Ylaq7KcmSC7eTuJ1ELS2H72bItk7W1OsW5XrapFGJ5b6Q4/JbMLGcJES6ufW5NF7yCZMNqjUhLf0pMONns5eHX1Zf7xO9BrNHlKt+Eir5a5WiO9mTuKUaOgOkjRvqTDTH+4bTuCdpGU+lRiz8H0mOyfRwmJ1RBM3yHaK90OAp9EYFLi+eceE3lIIK6hRnb3Pw/Y9oZgl3xn1JTaqIdhbIt4arN/JNmGypzOaezB+ULSN5fu2q8+QdxGJGqt/AYz+RhAtqY2npSImpkkIsV0NE56HLp/24FlGE9fYVtM3DHeiLQYH5x2Dn8bDmONiedn8Mj/f5aj2M/CMRzYBc+8ALxUW/3aQ== 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 Fri, Jan 26, 2024 at 05:54:20PM -0600, Michael Roth wrote: > Is something like this close to what you're thinking? I've re-tested with > SNP guests and it seems to work as expected. > > diff --git a/arch/x86/virt/svm/sev.c b/arch/x86/virt/svm/sev.c > index 846e9e53dff0..c09497487c08 100644 > --- a/arch/x86/virt/svm/sev.c > +++ b/arch/x86/virt/svm/sev.c > @@ -421,7 +421,12 @@ static int adjust_direct_map(u64 pfn, int rmp_level) > if (WARN_ON_ONCE(rmp_level > PG_LEVEL_2M)) > return -EINVAL; > > - if (WARN_ON_ONCE(rmp_level == PG_LEVEL_2M && !IS_ALIGNED(pfn, PTRS_PER_PMD))) > + if (!pfn_valid(pfn)) _text at VA 0xffffffff81000000 is also a valid pfn so no, this is not enough. Either this function should not have "direct map" in the name as it converts *any* valid pfn not just the direct map ones or it should check whether the pfn belongs to the direct map range. Thx. -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette