From nobody Fri Oct 31 04:01:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1752586209; cv=none; d=zohomail.com; s=zohoarc; b=Ntkm/mV1u4b9VyWv4qNWr911IfS/AKMLB6wFPOGTx6MdBppkEDENQQA7ZO4vBVItIQUT+QHZyDZzPHaTRdIj4Ao8xHN8KUd83MbCN/stVAvFMpq2kVrbzx5sRWOP9aDw99BLGvbtHcxi5qKgo/ij2t7j0RR7aObgB2XeZe6uK00= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752586209; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lDLoaippG53vLOL0sHnqy7SiZBuEGT4wELxw+HEbbmQ=; b=FUrZ9pGPLgzr25td4urxf0F4P1bAZ8G1voI0kaZi46T7wl0da43yW0MmBlM+wLx38X6zzgP1RSN/gXIhMjHL1/zaMzy932AKBbroXPL/PHlMRQqVy6MRsU4Q0p3c5l01V5AVykPa7+TPFsdqRym3UIAiscGYwUkC7J+9Ed+8fTo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1752586209769535.3849637303138; Tue, 15 Jul 2025 06:30:09 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1044117.1414239 (Exim 4.92) (envelope-from ) id 1ubfjK-0001Ta-8c; Tue, 15 Jul 2025 13:29:58 +0000 Received: by outflank-mailman (output) from mailman id 1044117.1414239; Tue, 15 Jul 2025 13:29:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubfjK-0001TR-5R; Tue, 15 Jul 2025 13:29:58 +0000 Received: by outflank-mailman (input) for mailman id 1044117; Tue, 15 Jul 2025 13:29:56 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ubfjI-00013q-A2 for xen-devel@lists.xenproject.org; Tue, 15 Jul 2025 13:29:56 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id cbb70347-617f-11f0-a319-13f23c93f187; Tue, 15 Jul 2025 15:29:55 +0200 (CEST) Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id BAD741F397; Tue, 15 Jul 2025 13:29:53 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 8C37713A68; Tue, 15 Jul 2025 13:29:53 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id aVuzINFXdmgRNwAAD6G6ig (envelope-from ); Tue, 15 Jul 2025 13:29:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: cbb70347-617f-11f0-a319-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1752586193; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lDLoaippG53vLOL0sHnqy7SiZBuEGT4wELxw+HEbbmQ=; b=GOF8XqOvO8HKoiA+Kyj4jDiygj8+3WXWB/54GkpnMysYqD0JjxROPKpnWoShEGaddF7mCF uxSbnbxiP6Ulde4qejlA8lkDaK2hP4iXqHePy5XzRgou1uzyRWeOrvyCyliuZlxOIh5iOQ dEYCLnHS8j5fd6a+NHpyGKIE6aroAgI= Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1752586193; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lDLoaippG53vLOL0sHnqy7SiZBuEGT4wELxw+HEbbmQ=; b=GOF8XqOvO8HKoiA+Kyj4jDiygj8+3WXWB/54GkpnMysYqD0JjxROPKpnWoShEGaddF7mCF uxSbnbxiP6Ulde4qejlA8lkDaK2hP4iXqHePy5XzRgou1uzyRWeOrvyCyliuZlxOIh5iOQ dEYCLnHS8j5fd6a+NHpyGKIE6aroAgI= From: Juergen Gross To: minios-devel@lists.xenproject.org, xen-devel@lists.xenproject.org Cc: samuel.thibault@ens-lyon.org, Juergen Gross , Jason Andryuk Subject: [MINI-OS PATCH v2 02/14] kexec: fix physical addresses in start info data Date: Tue, 15 Jul 2025 15:29:24 +0200 Message-ID: <20250715132936.2798-3-jgross@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250715132936.2798-1-jgross@suse.com> References: <20250715132936.2798-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.com:email,suse.com:mid,amd.com:email]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_TLS_ALL(0.00)[] X-Spam-Flag: NO X-Spam-Score: -2.80 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1752586211453116600 Content-Type: text/plain; charset="utf-8" The physical addresses in struct hvm_start_info are pointing to the memory where the data is being built instead of the location where it will finally be moved to. Fix that. Additionally rename kexec_param_loc to kexec_param_pa to better reflect the semantics of the variable. Fixes: b7994b6409a4 ("mini-os: kexec: build parameters for new kernel") Signed-off-by: Juergen Gross Reviewed-by: Jason Andryuk --- V2: - rename kexec_param_loc to kexec_param_pa (Jason Andryuk) --- arch/x86/kexec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/kexec.c b/arch/x86/kexec.c index fc58473e..d0af460d 100644 --- a/arch/x86/kexec.c +++ b/arch/x86/kexec.c @@ -197,7 +197,7 @@ bool kexec_arch_need_analyze_shdrs(void) return kernel_phys_entry =3D=3D ~0UL; } =20 -static unsigned long kexec_param_loc; +static unsigned long kexec_param_pa; static unsigned int kexec_param_size; static unsigned long kexec_param_mem; =20 @@ -208,7 +208,7 @@ void kexec_set_param_loc(const char *cmdline) kexec_param_size +=3D strlen(cmdline) + 1; =20 kexec_last_addr =3D (kexec_last_addr + 7) & ~7UL; - kexec_param_loc =3D kexec_last_addr; + kexec_param_pa =3D kexec_last_addr; kexec_last_addr +=3D kexec_param_size; kexec_last_addr =3D round_pgup(kexec_last_addr); } @@ -233,9 +233,9 @@ int kexec_get_entry(const char *cmdline) memset(info, 0, sizeof(*info)); info->magic =3D XEN_HVM_START_MAGIC_VALUE; info->version =3D 1; - info->cmdline_paddr =3D kexec_param_mem + sizeof(*info) + + info->cmdline_paddr =3D kexec_param_pa + sizeof(*info) + e820_entries * sizeof(struct hvm_memmap_table_en= try); - info->memmap_paddr =3D kexec_param_mem + sizeof(*info); + info->memmap_paddr =3D kexec_param_pa + sizeof(*info); info->memmap_entries =3D e820_entries; =20 mmap =3D (struct hvm_memmap_table_entry *)(info + 1); @@ -249,13 +249,13 @@ int kexec_get_entry(const char *cmdline) =20 strcpy((char *)mmap, cmdline); =20 - if ( kexec_add_action(KEXEC_COPY, to_virt(kexec_param_loc), info, + if ( kexec_add_action(KEXEC_COPY, to_virt(kexec_param_pa), info, kexec_param_size) ) return ENOSPC; =20 /* The call of the new kernel happens via the physical address! */ if ( kexec_add_action(KEXEC_CALL, (void *)kernel_phys_entry, - (void *)kexec_param_loc, 0) ) + (void *)kexec_param_pa, 0) ) return ENOSPC; =20 return 0; --=20 2.43.0