From patchwork Wed Feb 28 10:28:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 207747 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp3256170dyb; Wed, 28 Feb 2024 02:28:32 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX73gP5ei+EjFwgOlQdtw6RLR1NeFOjBM+PLUC7BcAHXuFbkOI2qt/FrNOgaTTXLOeJPU2c8YNg4P8UZhmRCt+nuNUWkA== X-Google-Smtp-Source: AGHT+IFd3NgNqTxr8esF92v6mGCVWnf6gNYUoZhKpHnGKZPm8h3UbQfBbeI3NVlPuUDnkY0XJJ1f X-Received: by 2002:a05:6358:340a:b0:17b:5c4b:90a with SMTP id h10-20020a056358340a00b0017b5c4b090amr16286756rwd.5.1709116112151; Wed, 28 Feb 2024 02:28:32 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709116112; cv=pass; d=google.com; s=arc-20160816; b=1EpD6CY2UU+7kLU9rtFMORDgJmv/WIzq2+BW54G9qYZfyuy1HLIlYKZ16WcP9fnO3U dswamDggiApQ1QCYXKLXI4P4X+ttwDreL1KrvQvDDXBDnH3w1XH0HWOTSPT34gndmzD7 S5RR81Tm5OZBPNwSb0BNwrJAB2H3K6sH/QHfUmqZ8EV0JqK9Ci+Z4wEDcwgSCPiu+asi LctYEWYC6TcI6BgXyIkMD8y/Gp7rYzvpfD1t6drwnlTQvWBiqQGgbQKniCZcSXd8tLgN bUzEvAxJdgG4m5UHIngxiVS+311Jx7iMBn+v5mKdYmQcBC9OZVjgYamjDLZmiGXaWZku 2v7g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:in-reply-to:cc:subject:to:reply-to:sender :from:dkim-signature:dkim-signature:date; bh=ZJ/ARzW2iQnxlfHDRNbOFL7Jz4fHUm/wi9/mmrRzFyo=; fh=S9YJMa9tDxyjdo2oIQk2Upquzjze68FYnOjXmvJtgsk=; b=x+5exOgElZHIdRY67Jz/W6wsDKLGhYZQp+DjEhz18nfYOeO4sHBLzfJo4Y6S9KZNA4 61OnKakSnNLMKNwvovYCTPHI5pXG26jRQhBxnHZX39Iwp+eInAbKsC/AhVSEQZg6eChA 9zj/+1np7Wk5PpSkAmlqXqx8sc782BbgHfWhEyWar6b58Sly5/lI91TkONILGcOqDgrl Q9lVqgvpFmAh5RDP6Dh8DCU7lvl+d/uB/7U0grsfO0eLPxsEgcB6iU0J3s93/N0x4YIg TnPLvxQWLR7e2m85vUwIW910kAgMJKM3u6hhpNCgOYMDTR68ygBgUyvknF8gIEdZhdv/ nZOA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=2t9Bhv5+; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=Aozq2qcW; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-84831-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84831-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id c14-20020a0cd60e000000b00690083fcda3si6199154qvj.584.2024.02.28.02.28.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 02:28:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-84831-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=2t9Bhv5+; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=Aozq2qcW; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-84831-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84831-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id E8BD41C2442E for ; Wed, 28 Feb 2024 10:28:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9BA595A4FD; Wed, 28 Feb 2024 10:28:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="2t9Bhv5+"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Aozq2qcW" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7DC1933CC2; Wed, 28 Feb 2024 10:28:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709116097; cv=none; b=INqGR88gL1Sgt1jR2MAu3n5x+tcOSzqvYpkF1B4hN7X++q7X0TCX3VXBOweiZ7B025KXaK/gySb0sUzaCmHJM7/8pA8nUSDoZOqZJ4IX2O3cF503i4JTaeoQQzkt9WMymKNAcAruMA9jKRV52CDBq5DnZ9liGSmbG5UmHpOBaj0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709116097; c=relaxed/simple; bh=c7EozbE5lS8REnkr5wltySbUv2bQiI1Sc8Mhu0Q684I=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=MsZYdKeym5UYf3MleOoTRqqZSVLLuPeQBQiRJzbdQ/B2vzsS+GuFr34niDTdZ/U5XETgaIZyq8ebpiROp4wl7iN6RBo6UwAABmG48zWIx+98AGR+rFwWF5DTHDud2Uz2bnwD7xHuCjkKPc0aiHD5w8n5eI0C+3qJEvVRI4jsaZ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=2t9Bhv5+; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Aozq2qcW; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Date: Wed, 28 Feb 2024 10:28:12 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1709116093; h=from:from:sender:sender:reply-to: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZJ/ARzW2iQnxlfHDRNbOFL7Jz4fHUm/wi9/mmrRzFyo=; b=2t9Bhv5+8ZrR3QtyrTLsPyZgRmeFm2cdRDtC5NbtlkGaVinAFiL4xAi663iYLWAunMPUaO koC2jtRTWWqvEQyUg0I6kVbB1Um2+fIWcej+Kf5u+rF8qzv/6EdqcyuE1sp52mz/UVzCyJ hVJ7rCa1Pl4efZbMnLiCVhdIltxFHuYg4texpW16s544hCTDr+/cy4/FbeYRHEPlt+JqbL 83PZmqycmxsT2HUt3HQG5ArsNCWG33TEWoNbua+Ak2nvh6UnJainhFFYh8H3X2bcTS9hke 5xfpa04DSSiceAj4eWkdQDILKIUDZk4u2mr6az4sGg0BsSYa4zofCoboHmDjJw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1709116093; h=from:from:sender:sender:reply-to: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZJ/ARzW2iQnxlfHDRNbOFL7Jz4fHUm/wi9/mmrRzFyo=; b=Aozq2qcWSWl84qjcO632WVDXdrCDI0iDPxn5J9gk/wCSQ/tSI2YkCK/YZlXi6neLJvJMf2 zWjwX/dVYanK66Dw== From: "tip-bot2 for Jiri Bohac" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] x86/e820: Don't reserve SETUP_RNG_SEED in e820 Cc: Jiri Bohac , "Borislav Petkov (AMD)" , , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170911609255.398.9253992823992514888.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792138136323775221 X-GMAIL-MSGID: 1792138136323775221 The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 9e1daa3bfcccf79ee368061d807ff541d6e2d909 Gitweb: https://git.kernel.org/tip/9e1daa3bfcccf79ee368061d807ff541d6e2d909 Author: Jiri Bohac AuthorDate: Wed, 31 Jan 2024 01:04:28 +01:00 Committer: Borislav Petkov (AMD) CommitterDate: Wed, 28 Feb 2024 11:10:31 +01:00 x86/e820: Don't reserve SETUP_RNG_SEED in e820 SETUP_RNG_SEED in setup_data is supplied by kexec and should not be reserved in the e820 map. Doing so reserves 16 bytes of RAM when booting with kexec. (16 bytes because data->len is zeroed by parse_setup_data so only sizeof(setup_data) is reserved.) When kexec is used repeatedly, each boot adds two entries in the kexec-provided e820 map as the 16-byte range splits a larger range of usable memory. Eventually all of the 128 available entries get used up. The next split will result in losing usable memory as the new entries cannot be added to the e820 map. Fixes: 68b8e9713c8e ("x86/setup: Use rng seeds from setup_data") Signed-off-by: Jiri Bohac Signed-off-by: Borislav Petkov (AMD) Cc: Link: https://lore.kernel.org/r/ZbmOjKnARGiaYBd5@dwarf.suse.cz --- arch/x86/kernel/e820.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index fb8cf95..b66f540 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -1017,10 +1017,12 @@ void __init e820__reserve_setup_data(void) e820__range_update(pa_data, sizeof(*data)+data->len, E820_TYPE_RAM, E820_TYPE_RESERVED_KERN); /* - * SETUP_EFI and SETUP_IMA are supplied by kexec and do not need - * to be reserved. + * SETUP_EFI, SETUP_IMA and SETUP_RNG_SEED are supplied by + * kexec and do not need to be reserved. */ - if (data->type != SETUP_EFI && data->type != SETUP_IMA) + if (data->type != SETUP_EFI && + data->type != SETUP_IMA && + data->type != SETUP_RNG_SEED) e820__range_update_kexec(pa_data, sizeof(*data) + data->len, E820_TYPE_RAM, E820_TYPE_RESERVED_KERN);