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 B8CD8C77B7F for ; Fri, 19 May 2023 10:16:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3D022900004; Fri, 19 May 2023 06:16:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 358A9900003; Fri, 19 May 2023 06:16:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 220CE900004; Fri, 19 May 2023 06:16:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 136B3900003 for ; Fri, 19 May 2023 06:16:49 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id D57581C7702 for ; Fri, 19 May 2023 10:16:48 +0000 (UTC) X-FDA: 80806600896.22.E21E423 Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by imf11.hostedemail.com (Postfix) with ESMTP id A456F40016 for ; Fri, 19 May 2023 10:16:46 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=shutemov.name header.s=fm2 header.b="b lCqjsu"; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=dXyFgQH7; spf=pass (imf11.hostedemail.com: domain of kirill@shutemov.name designates 66.111.4.25 as permitted sender) smtp.mailfrom=kirill@shutemov.name; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684491406; a=rsa-sha256; cv=none; b=hp8oWBT4NQwOonDFxB4dCVhbbIwoHelX16iuxrfrFu1EOxf408VL4P2WK+Oy9rU4SH8dcw P9ApGFXZaClrzx7VQWvggVl93dEt4dRpgn3KEjaWM1eXL8U/x8tdSgVAbc7Gecc6AyTLhW SExZJIVCOBTek+dE2h7yiPPP0kbEoSc= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=shutemov.name header.s=fm2 header.b="b lCqjsu"; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=dXyFgQH7; spf=pass (imf11.hostedemail.com: domain of kirill@shutemov.name designates 66.111.4.25 as permitted sender) smtp.mailfrom=kirill@shutemov.name; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684491406; 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=eusJfDMu4BSNTI2WSPt51cso8c3WEiCMloVC5l7E91A=; b=aL5/k5xQ3hKMXcGEZIgq3z7scG2yD2ftFBSLc1O5wdaOqPonTKmiA0/mk8g4d/BgSI2Ek5 BqgQ1GbHAaZ4+zn3mD1X+XmPcLOJr/HlyqIBbIGdO0J4xfOLKs333GMmDXncz9dR3YmeLZ A7SZWG+sFF9fIi1yJC7PQNH8iy9CzJ0= Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id EB00B5C018B; Fri, 19 May 2023 06:16:45 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Fri, 19 May 2023 06:16:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shutemov.name; h=cc:cc:content-type:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1684491405; x= 1684577805; bh=eusJfDMu4BSNTI2WSPt51cso8c3WEiCMloVC5l7E91A=; b=b lCqjsuOikslXbda5V6akg2UopLQgrMQlrMPxyvtjHo/yJUKUYsSrWvC17uuKr4vM O3Dv3fChZ0sWQT9o+pbsyKJ3oF0P8ce1LmE7hNzWgNvVHUD7m+qKqpW9b0Imw1Mo 88O454JJockUe2btHxFt99nIq3+F+eEfjeZciytpwoQhJLAVLBKvGCGFJNPVFgMQ HlxETu/Lumab7SYt93kWpZl2866CP9QND6VTMTK7Awv7LPawzIsV53d2kkASQlDX oSMEWGKm2uXhWPj4LjqqQ5cZ7a3VdzP3vpxAnrZqJ0cFQWRcyL69/8YB8JAmenk1 IrTT22X/qH2pzPy4QFwYg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1684491405; x=1684577805; bh=eusJfDMu4BSNT I2WSPt51cso8c3WEiCMloVC5l7E91A=; b=dXyFgQH7P6eiAYgSleRv/Gjqb280F ThmzxeXcsEdqsawOM/bakg1QLciiKGf86X0jkUAbdXki8U2advF5sTZKIilcju67 Oz0a4RkZ53yo8PRTDo9WfF8gEMuifyzzXRF3+qR1nhsdbtzwcDGuvhnof1nWAC9e w9T3mDF5ynVfAQf3bFdZfb+wusOfpyS4xdqSm3SHpqCkbnWNIn05qSrdfe/+gW+U h6pglTLWaR2rKFF9aEznZ0tseJSOR+otfGzLZTSdH535OpcEbLR4PogR0kMPWiX2 GiNV0jvqiazvZs01yOVjM03jQ4HHnsapOH+01jwn/uTa/ZFYiw4ySkGQg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeeihedgvdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdttddttddtvdenucfhrhhomhepfdfmihhr ihhllhcutedrucfuhhhuthgvmhhovhdfuceokhhirhhilhhlsehshhhuthgvmhhovhdrnh grmhgvqeenucggtffrrghtthgvrhhnpefhieeghfdtfeehtdeftdehgfehuddtvdeuheet tddtheejueekjeegueeivdektdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehkihhrihhllhesshhhuhhtvghmohhvrdhnrghmvg X-ME-Proxy: Feedback-ID: ie3994620:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 19 May 2023 06:16:44 -0400 (EDT) Received: by box.shutemov.name (Postfix, from userid 1000) id 4DA4210DFD2; Fri, 19 May 2023 13:16:41 +0300 (+03) Date: Fri, 19 May 2023 13:16:41 +0300 From: "Kirill A. Shutemov" To: "Kirill A. Shutemov" Cc: Borislav Petkov , Andy Lutomirski , Dave Hansen , Sean Christopherson , Andrew Morton , Joerg Roedel , Ard Biesheuvel , Andi Kleen , Kuppuswamy Sathyanarayanan , David Rientjes , Vlastimil Babka , Tom Lendacky , Thomas Gleixner , Peter Zijlstra , Paolo Bonzini , Ingo Molnar , Dario Faggioli , Mike Rapoport , David Hildenbrand , Mel Gorman , marcelo.cerri@canonical.com, tim.gardner@canonical.com, khalid.elmously@canonical.com, philip.cox@canonical.com, aarcange@redhat.com, peterx@redhat.com, x86@kernel.org, linux-mm@kvack.org, linux-coco@lists.linux.dev, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Liam Merwick Subject: Re: [PATCHv12 4/9] x86/boot/compressed: Handle unaccepted memory Message-ID: <20230519101641.nka7ty3fttntymci@box.shutemov.name> References: <20230518231434.26080-1-kirill.shutemov@linux.intel.com> <20230518231434.26080-5-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230518231434.26080-5-kirill.shutemov@linux.intel.com> X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: A456F40016 X-Stat-Signature: dccysm1ac5aoin3p3fonri18g6bz6fi5 X-Rspam-User: X-HE-Tag: 1684491406-387039 X-HE-Meta: U2FsdGVkX19KFTuEjuOTH6v5is+0wOu1dnVC10w3k90g5Jlz7MVDQNcsLuj4N+j5W9K49COaA7UV2cNZLUbczQFsE50jAAwrN1AkWWG/s1N82WV61EKoD4EL/YtMOt3IIM+KDvROX58LzFZWfW04o73Q3KENu+W7dyp7gXkc3Nkp7vM3IVveE8kVEcuQlyhu6h/9WFloGPqRPWYJGTh5wo+QW+4VOUTJiA2mQBXBYSBbrZemwc0rfQGtsCjvu2KR/Cba1bM0ntgRViMQKXpvOekUzdHoIYJy0VxyEy36KcrHdiC1oCggFS4grKLgYgxOswOgrMpwnpmVwjOs391Xtr9ZPBUH6CBHFkeUcbKaEmj2r+wSGv0dBHQ5PJ3w3FYm+R4Ui8Xb/qxJua5xBfBf9FDGx62h6CvxwTmzkhXVrebJrQWSbZILlazGy/xkiVj+6lgb89rxbh+0bMJ127PdsXue6SpGuQZ9G89IWXagYRMcOMBFISwtvSYrHtcSdnCqdLpGArARpQDuNtN3WrI4HpEKFJeQB4DRn67MFveHUzC8BUX7yRCjE8DgkWZ3gBje3E4LwWLMci+1+e746XlQ0m4mcxkUuo8K9uRtjtp8SMUlOBg+oCBfzA0zn36wNEGPwbrd2sd9cfHgHYPxLbNgkn6RnVBJc9JI0mBLfhjdtvQxrXIIvFrJ60Wn6b9iRuHGfBrY3KCY32boPlwm+xOB9+niFyQybzU1pkHruwGAppVMWVb/w0Ywu4p0IfoQpmsaeKPK8YS/5O0FMOOi207uuaguBpq98hDmCTYRaTbrKI+tJxks5ioeIKJxmFHstSVesCrb7Vl+j5+LZY0Fak10WH7lBHWsdOLGl2PM+8Z9wZSbbJiyDodypNQMilih83cFmxWinroqPlz0hENPg5uRbxs49XJ1GVJj8/vVLgRvPuHOhiklBJhG+jMjGGVu6fTMAiXGbd9baSSw+n5CjvP UOmDCCVJ JKmxEPg/+CU7RIUDv2d22dONwSfyCe48GcmbN4V9PzhTrZpFhesLMERt2ssdp9EmIZqTdBnAH5FTdndVbFZEeXhsv67tpLsb95GsNdenYuuDW91mI/SYOXGdELMZ6GxhRy+F6jo2qkX0JrJZVjj7zTLObQ6y2qvWXNQaKWt/gU0Ins6Aqsf0Xmrdvks4UYjcpvgcC50OQtW0HbeUfkXTjU7YXOEmLNjYiSNXy8Lg89bPSWFiFa6aW1FcefKKEpVX7xH8yUYo/qIKOB20FkTOmKvr+OXPguEOmhYbMK6pxFsqw1KA= 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: On Fri, May 19, 2023 at 02:14:29AM +0300, Kirill A. Shutemov wrote: > diff --git a/arch/x86/boot/compressed/mem.c b/arch/x86/boot/compressed/mem.c > index 67594fcb11d9..87372b96d613 100644 > --- a/arch/x86/boot/compressed/mem.c > +++ b/arch/x86/boot/compressed/mem.c > @@ -1,9 +1,32 @@ > // SPDX-License-Identifier: GPL-2.0-only > > #include "error.h" > +#include "misc.h" > > void arch_accept_memory(phys_addr_t start, phys_addr_t end) > { > /* Platform-specific memory-acceptance call goes here */ > error("Cannot accept memory"); > } > + > +void init_unaccepted_memory(void) > +{ > + guid_t guid = LINUX_EFI_UNACCEPTED_MEM_TABLE_GUID; > + struct efi_unaccepted_memory *unaccepted_table; > + unsigned long cfg_table_pa; > + unsigned int cfg_table_len; > + int ret; > + > + ret = efi_get_conf_table(boot_params, &cfg_table_pa, &cfg_table_len); > + if (ret) > + error("EFI config table not found."); > + > + unaccepted_table = (void *)efi_find_vendor_table(boot_params, > + cfg_table_pa, > + cfg_table_len, > + guid); > + if (unaccepted_table->version != 1) > + error("Unknown version of unaccepted memory table\n"); > + > + set_unaccepted_table(unaccepted_table); > +} 0-day reported boot failure outdise TDX guest with CONFIG_INTEL_TDX_GUEST=y. The fixup: diff --git a/arch/x86/boot/compressed/mem.c b/arch/x86/boot/compressed/mem.c index 0108c97399a5..8df3d988ae69 100644 --- a/arch/x86/boot/compressed/mem.c +++ b/arch/x86/boot/compressed/mem.c @@ -56,6 +56,9 @@ void init_unaccepted_memory(void) cfg_table_pa, cfg_table_len, guid); + if (!unaccepted_table) + return; + if (unaccepted_table->version != 1) error("Unknown version of unaccepted memory table\n"); -- Kiryl Shutsemau / Kirill A. Shutemov