From nobody Sat Oct 4 23:45:03 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=1759532065; cv=none; d=zohomail.com; s=zohoarc; b=ChPw/is9x8TSu10A/O0oewMj5g5gdD9P7QY9FZUhXYhEgpv2XhcHt/w1JAQmLtfEAGNwFYOnuWGCADg0679mvgwURSv37+AhTi0WYJTtKdg1c8v8PDQBEFFqhBE54+zuiUjaDZTkbcSS13pnb7t6DWb+VVtqVHD1ZfanpSCjB6E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759532065; h=Content-Type: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=egy9XQtSd+4RovGW/slEPJzeLJH9pzKr20RQT1jfE7o=; b=m1H46QWzw9NlOsNt1QdlNnguvOk8Y5aMW3VQ8aFqxrb9dDbgSSvyIR6oKxHLUeHS7Pxxvv6FkXP/WWbKkibhpApNhG7E+p/yT6QisddnHsqh+/yB5rwAQEWKcrD1ncI8JR0H73ix+xf4hYaTCc8SWi555DoloG0M4Jd/qkj7oo4= 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 17595320658432.5666424029664086; Fri, 3 Oct 2025 15:54:25 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1136894.1473371 (Exim 4.92) (envelope-from ) id 1v4oeu-0006Qn-TI; Fri, 03 Oct 2025 22:53:52 +0000 Received: by outflank-mailman (output) from mailman id 1136894.1473371; Fri, 03 Oct 2025 22:53:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v4oeu-0006Qg-Oi; Fri, 03 Oct 2025 22:53:52 +0000 Received: by outflank-mailman (input) for mailman id 1136894; Fri, 03 Oct 2025 22:53:51 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v4oet-0004mK-Fx for xen-devel@lists.xenproject.org; Fri, 03 Oct 2025 22:53:51 +0000 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [2a00:1450:4864:20::42d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id d38ebc6e-a0ab-11f0-9809-7dc792cee155; Sat, 04 Oct 2025 00:53:49 +0200 (CEST) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3f0ae439bc3so1431509f8f.1 for ; Fri, 03 Oct 2025 15:53:49 -0700 (PDT) Received: from localhost.localdomain (host-92-22-57-86.as13285.net. [92.22.57.86]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4255d8a6bbesm9616571f8f.12.2025.10.03.15.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Oct 2025 15:53:48 -0700 (PDT) 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: d38ebc6e-a0ab-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1759532029; x=1760136829; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=egy9XQtSd+4RovGW/slEPJzeLJH9pzKr20RQT1jfE7o=; b=WRNJem83pjebqXEDrsReTnpufgiqBqASUlGogbTOaK3T+c54DywCdZemK/+Jesmvco tCN9s4i3aAZi4FjKIG6Enqth0kVnWWSLCj/SxP6E1GR/SM1Ik1UdRjqDlcMfQShTksrK zMlRFWnZ+ZufsILkT1rfJSOBNsq6fUiCyhaZY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759532029; x=1760136829; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=egy9XQtSd+4RovGW/slEPJzeLJH9pzKr20RQT1jfE7o=; b=vtG14IklNPmd/KRFToKhw6Dlg0i9otYp+sTHSIPyvGw3XwGagQ4TJGF3i3BT1cGUgW rBfYnZ5z8qHPnfx9zigeUh4LUlIKWf3/eVOqddJAIR1a2+yEAD6zHs9KyNnBPY0FYHMt Yp/nsi60JXPQ9hJLD88OgnwT5smbts0tF5QQ8VwnWnoa7jTDGOq5BgqQ3Nwr2XxIaCeQ 5pgne6UjZo/FMD5BdWdR37CNE/En0bOJ1o6TcpF34bP/sEiKQM6cGJSRiCNtppDGfs2g IitaKYzWIsPtwphcHs8+aeKHiEN1s7bIqMT3Tuh9iqzgajhaaAbF+tTe/GsYYJXJzj1H b7Tw== X-Gm-Message-State: AOJu0YzU/Ptuyp2hJmK6hy+Xgn8vYDJdb4QdbclFBb1kteI1Sb+9bG/k 1FR6uBuWWbHq0Iiof7gBNtNi9lpuiZtaW88+ZT2aQmvSN0nqwHO0hIapkmakWkVhyhr48Z9gEkA oAWhMGwsuZQ== X-Gm-Gg: ASbGncsHT38Bm9UeT51Xy5UYGQMyEwSBNO7ylBH7VKPfJLp7APuGr2UUfgANOCcTqQd GGsCB7tO81usqkZgkk8jqqVdn5/MkS2MS8dIuxXFdaM/DNJncnMPoHuN9Eq2JPY+mfvpINV+s3X NtAnK1bLuhBrEmgGmZK5+i5F/AHqgbyyDoYET3AqolQ+cMoGbp4cgcE8QV4Wb6gmBZYlkgM++MX 8gyr9rBf35kb/LH35ynENZDrQtWvJzYdIZjRpChtzlrX17SYUtW6riFNILcC4twCst+IOsY4s4e hy0KIPfLoMaU9STTCuweSTURJbgobE6kWfO57hN+KgV0wSIifF4rxLYrMeLAzG6kGQpP2h71Zju qzaXuYgI3bkG9PT5enUNUQtVkTweiMShtC1/i3DChNjTQJGgPbpStjg9QrALrvOUOZjfycC1Ns+ 0nw2tTpONWMWQYkPUVmWJI7jGw4NuoSXI= X-Google-Smtp-Source: AGHT+IGtvZy7Y0lcTeWbgV03qNMHhHkYQjEPeUOIGpdUskckyAr1jrPc6VfxAO5QqrfVmrd51d5Ohw== X-Received: by 2002:a05:6000:2c0c:b0:3ec:6259:5079 with SMTP id ffacd0b85a97d-4256713a066mr3255902f8f.11.1759532029079; Fri, 03 Oct 2025 15:53:49 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH v3 07/22] x86/traps: Alter switch_stack_and_jump() for FRED mode Date: Fri, 3 Oct 2025 23:53:19 +0100 Message-Id: <20251003225334.2123667-8-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251003225334.2123667-1-andrew.cooper3@citrix.com> References: <20251003225334.2123667-1-andrew.cooper3@citrix.com> 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: 1759532066778116600 FRED and IDT differ by a Supervisor Token on the base of the shstk. This means that switch_stack_and_jump() needs to discard one extra word when FRED is active. Fix a typo in the parameter name, which should be shstk_base. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 Leave as $%c. Otherwise it doesn't assemble correctly presented with $$245= 68 to parse as an instruction immediate. v3: * Fix a typo in the parameter name. v2: * Use X86_FEATURE_XEN_FRED --- xen/arch/x86/include/asm/current.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/include/asm/current.h b/xen/arch/x86/include/asm/= current.h index c1eb27b1c4c2..62817e8476ec 100644 --- a/xen/arch/x86/include/asm/current.h +++ b/xen/arch/x86/include/asm/current.h @@ -154,7 +154,9 @@ unsigned long get_stack_dump_bottom (unsigned long sp); "rdsspd %[ssp];" \ "cmp $1, %[ssp];" \ "je .L_shstk_done.%=3D;" /* CET not active? Skip. */ \ - "mov $%c[skstk_base], %[val];" \ + ALTERNATIVE("mov $%c[shstk_base], %[val];", \ + "mov $%c[shstk_base] + 8, %[val];", \ + X86_FEATURE_XEN_FRED) \ "and $%c[stack_mask], %[ssp];" \ "sub %[ssp], %[val];" \ "shr $3, %[val];" \ @@ -188,7 +190,7 @@ unsigned long get_stack_dump_bottom (unsigned long sp); [ssp] "=3D&r" (tmp) \ : [stk] "r" (guest_cpu_user_regs()), \ [fun] constr (fn), \ - [skstk_base] "i" \ + [shstk_base] "i" \ ((PRIMARY_SHSTK_SLOT + 1) * PAGE_SIZE - 8), \ [stack_mask] "i" (STACK_SIZE - 1), \ _ASM_BUGFRAME_INFO(BUGFRAME_bug, __LINE__, \ --=20 2.39.5