From nobody Mon Nov 3 06:32:39 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=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1731112661; cv=none; d=zohomail.com; s=zohoarc; b=hC+UkxN/yE6Or3pVyWJ5HCOvEF366UXGP9zkEUrC+a8Cy3y61oXV9P+yRw6fAXOnvhc/lUYjrSGCnnpCc092aOQpaE8cstZwywOoVGTKTP2lBENoZYNx62uqDc0/jPhtKeH17erWflSrV32k00pCfiMA4QgH/0V1DKLpALk5m4k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731112661; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tMqDlkmdt/fddKZMacTV945+a8ec8UbBh+hwQOHboRo=; b=j7K0wvL4ASJ16+d5SHj7KEORWRQGNN526GUiqQZoE4tmTrsIA2lM/S72ChqPYBspaZv3yX1rlEVEtCIx05u5Dg/zC3Hex42CaHCZAFxeYD35gLV5gBXRB0WfXWR3D6ps6O1Eak+IwAhhphmlpjqxmm7yvQ5+RGvnFegzHEV8FXg= 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=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1731112661968250.9839065555094; Fri, 8 Nov 2024 16:37:41 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.833010.1248300 (Exim 4.92) (envelope-from ) id 1t9ZTP-0007U6-ND; Sat, 09 Nov 2024 00:37:07 +0000 Received: by outflank-mailman (output) from mailman id 833010.1248300; Sat, 09 Nov 2024 00:37:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t9ZTP-0007Tz-KN; Sat, 09 Nov 2024 00:37:07 +0000 Received: by outflank-mailman (input) for mailman id 833010; Sat, 09 Nov 2024 00:37:05 +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 1t9ZTN-0007Tt-QZ for xen-devel@lists.xenproject.org; Sat, 09 Nov 2024 00:37:05 +0000 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [2a00:1450:4864:20::632]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ba2088ca-9e32-11ef-a0c6-8be0dac302b0; Sat, 09 Nov 2024 01:36:58 +0100 (CET) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-a99f1fd20c4so390008466b.0 for ; Fri, 08 Nov 2024 16:36:58 -0800 (PST) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9ee0ad2cdcsm294743766b.87.2024.11.08.16.36.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2024 16:36:56 -0800 (PST) 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: ba2088ca-9e32-11ef-a0c6-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjo2MzIiLCJoZWxvIjoibWFpbC1lajEteDYzMi5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6ImJhMjA4OGNhLTllMzItMTFlZi1hMGM2LThiZTBkYWMzMDJiMCIsInRzIjoxNzMxMTEyNjE4LjUwNDE5LCJzZW5kZXIiOiJhbmRyZXcuY29vcGVyQGNsb3VkLmNvbSIsInJlY2lwaWVudCI6Inhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZyJ9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1731112617; x=1731717417; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tMqDlkmdt/fddKZMacTV945+a8ec8UbBh+hwQOHboRo=; b=HyF5+bSdCpPyMid/LWhlsouFQ+wDFXwHJByvw2Np3MPTQe1X4ORNAwB8hChyWVer6C HXRVB3ilYQL3Buh/omnVsuBU7615HKbJWyK6DsOCEtZR32RSSYIPpqIeXMfUfMF4M92g l8odEsFKoVJj3gb005ZfqZxmNFI4bath/hdwI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731112617; x=1731717417; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tMqDlkmdt/fddKZMacTV945+a8ec8UbBh+hwQOHboRo=; b=NnBqocQ4P8nKLpNl/xojbEV5t9jTvjAf4fUT6rE2eFESXLVU7Tm4ClCiT5a4q/3pK1 +UbPQbh+AbCXkzDaYKWWbgywrHUoXuYnT5qS+ZBYUe2JnpZmBr2QYV0anf/6Idkh9B71 jOMOZEnvG2+USxrN6RhatcWR0YWx0t9z4QNvb9GH7DIaMH6s7oJbbqN2P3eR27+uxiOa GSskoVIOjc9PAvt7QXzgakPwEicZDllk7M9K2owBiJDkAJTECY4KsvJXg8FueVkVtjZe 8LZjP7TJDQXyyX83SKlRrYV++DqSCPhTfR3TSnvVnTvM1WVEXsaYf1/WTQWcRfNE4cxM KHKw== X-Gm-Message-State: AOJu0Yx9NsSJBkBEsiAYsv8UDgXkAIrO1fNvA+o+lMfJSNXBkIOUj9Xp QNsT5jb/AlCmghUj5QKNZR5VPYDVdsA2Jyo3WTp6dKW41Aw5BRQxHnExTe45iIBp+dokT6CChOQ M X-Google-Smtp-Source: AGHT+IEpoeQ7J/3kohUZZrrSK4cg7vHNUX8hAexOALYXq8HaLGo+LVJ53p2s0kGyl+IysZTEwliprA== X-Received: by 2002:a17:907:608a:b0:a99:499f:4cb7 with SMTP id a640c23a62f3a-a9eeff0e34fmr469881066b.23.1731112617267; Fri, 08 Nov 2024 16:36:57 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH] x86/wakeup: Fix code generation for bogus_saved_magic Date: Sat, 9 Nov 2024 00:36:54 +0000 Message-Id: <20241109003654.884288-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1731112662507116600 bogus_saved_magic() is in a .code64 section but invokved in 32bit mode. Th= is causes a real encoding difference. Before: 66 c7 04 25 14 80 0b 00 53 0e movw $0xe53,0xb8014(,%eiz,1) After: 66 c7 05 14 80 0b 00 53 0e movw $0xe53,0xb8014 The differnce happens to be benign, but move the logic back into a .code32 = for sanity sake. Annotate it with ELF metadata while doing so. Fixes: d8c8fef09054 ("Provide basic Xen PM infrastructure") Signed-off-by: Andrew Cooper Reviewed-by: Frediano Ziglio Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 This issue dates back to the very introduction of S3 support in Xen, in 200= 7. --- xen/arch/x86/boot/wakeup.S | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/boot/wakeup.S b/xen/arch/x86/boot/wakeup.S index 08447e193496..c929fe921823 100644 --- a/xen/arch/x86/boot/wakeup.S +++ b/xen/arch/x86/boot/wakeup.S @@ -153,15 +153,16 @@ wakeup_32: /* Now in compatibility mode. Long-jump to 64-bit mode */ ljmp $BOOT_CS64, $bootsym_rel(wakeup_64,6) =20 +FUNC_LOCAL(bogus_saved_magic, 0) + movw $0x0e00 + 'S', 0xb8014 + jmp bogus_saved_magic +END(bogus_saved_magic) + .code64 wakeup_64: /* Jump to high mappings and the higher-level wakeup code. */ movabs $s3_resume, %rbx jmp *%rbx =20 -bogus_saved_magic: - movw $0x0e00 + 'S', 0xb8014 - jmp bogus_saved_magic - /* Stack for wakeup: rest of first trampoline page. */ ENTRY(wakeup_stack_start) --=20 2.39.5