From patchwork Tue Feb 20 01:02:06 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: 203362 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp124546dyc; Mon, 19 Feb 2024 17:03:09 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX7X0IXO0BYbmdjRB/pTSquIZa6TfXbkfeXgahpU6bA6WxIlEvoUOTJdFAP38HP5Kpp1G6tB9Pp+eOYjNhGbZ7p2OUWgA== X-Google-Smtp-Source: AGHT+IEX1B7CA2eU31q8UUBJjNKsoXhdj6C+ijwgQkpcu+dYKZunDnnwcy4sFx6a+Zry1nQ3wVjg X-Received: by 2002:a67:ee0d:0:b0:470:494d:64a0 with SMTP id f13-20020a67ee0d000000b00470494d64a0mr5171994vsp.5.1708390988922; Mon, 19 Feb 2024 17:03:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708390988; cv=pass; d=google.com; s=arc-20160816; b=kgSTeyfDRw7QMpA2u3EhJHCqt55owDjtHoHfTi14VcI//sNldFow2ElNXVATo7+UFU rm5nmvKMEa/8hYU8q6Sf4UU1U9bB2WVQoxT8jxtNvntsqan4OG5tX3nKyqphwWAbFDpL onlfHqU79Wi+QY+E9vFcGRVOixIXFfuCs/Nc8QjYHWPnV/kkKLYf+D0D3NJB92BKYXlR OX4qcSO1R79BJWmQaQZT3z2CWEa2NSRgIlCIHFrz49oKvv2F0Eyax9L5/RkGNM9UmsZo sr0jpH1TSYv/rYL98Q8n0CGsoMba9QJ3+DOsD6CWxQhf6VzeNEHJ0Os09V3bzR63TT0U iiJg== 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:cc:subject:to:reply-to:sender:from:dkim-signature :dkim-signature:date; bh=te/2U583Lf4tyee1I4+21+y3PWy7zV8t4y4NHb6fn/U=; fh=F3j5vJzznal/UB6e/yKmVNrMQh0yeZebCg5CK9TWA8g=; b=szANHdTxDOU+YsBRRHrpaWi1apZbT7qDU6j1AZfQKZKEXSl/BuOkZSdvUX4QOdH964 f+Ui08b2jUjdCKG1YyneF2P362pdNy144O+Q6gY4Lz95jst6HXji4GGSd/Ccf57blK48 xQHK93B3nTizSKU06Ttmgb86HbPGJzgGcTBEuv1cF3GhorPk8z0yN7cxMZGrd2+xnx5r iQh9YxLYoxUZXQ8hPuTewM4F/GSzqW7owm3wvjWYxCvpPrSg0MRpJJKnhLIQBOe4SDav L5vxLT2ZclCFmw4+LJUs3gfHIRx1FK7ecfeMZasUUfZKzUn4zV1+EvXgyWrgMk0J7bdE Jh2Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=vDQDrpfo; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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-72162-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72162-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. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id h7-20020a056102208700b0046d34d59b3fsi367893vsr.317.2024.02.19.17.03.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 17:03:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-72162-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=vDQDrpfo; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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-72162-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72162-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 AE6F81C22462 for ; Tue, 20 Feb 2024 01:03:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 23EA4405CF; Tue, 20 Feb 2024 01:02:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="vDQDrpfo"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="4OWF5R8K" 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 DAABA107B3; Tue, 20 Feb 2024 01:02:09 +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=1708390931; cv=none; b=t3hLbuvHzy0AbDSQzcKRnMiBuHxIP/lVE2coV9Yb6OO+YqskCCmZN78/VN0l8CoN0TTBjFff3BTg+aCWBBQvH7GJj48aRBXke5qHhVU9g2Ewk6rn+AIlcPStcpCxqCMeJ5JalFosc0MFvlyrvO/HxCyV/HCXsR1/RyWjuFbPeV8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708390931; c=relaxed/simple; bh=1TJF4aBsszoWK56Nl1o97ae4i1PRvc9OA8fu2mY2syI=; h=Date:From:To:Subject:Cc:MIME-Version:Message-ID:Content-Type; b=Qvzk1ITGOZMB65um7gbV2ZgEjiHtz0Qy7vaVkY5m5tnJC1uBRWqKojZOlj5ckGrCDB49U9/54aAm4G8uKfLoK1coPsYBtUDSM0RYfeZJuJtE6p4/3JQqLgDXCq8O2yr4Z/Bnsll3CqdbRtjgmsD56YCoauFuLNrL54bElCquV0w= 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=vDQDrpfo; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=4OWF5R8K; 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: Tue, 20 Feb 2024 01:02:06 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708390927; 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; bh=te/2U583Lf4tyee1I4+21+y3PWy7zV8t4y4NHb6fn/U=; b=vDQDrpfoFE0TRNsua4gP7FPekl1O8YZb/6fJA2boHhEQam1mw7ozfXgrgzP5Ewqb5A3dBX XXqaBn7sB5C6vL/Q6ocj0MezC2N8UlWdSyZDpjMLxUItE3pO/w1tUOLm4iv15q+jE3j/JA rYB/Amh/WW0eFTVMXOzO1tuHHRoSv5vjHVF58YWTFTOivF6IXrcGnjhdCetjJslxb+4HuX hdWNPMZMsu3U8925rBXq4+rHJK5n++jcq1CoRAStbVHHqnytYBx5shh79+DIJM3gL6KKNy wNPj+odDGWccFbdSB0Le4ycIDG1S0LnnFFD5YvXQisi+ki09VbIlMpqkIbUB0Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708390927; 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; bh=te/2U583Lf4tyee1I4+21+y3PWy7zV8t4y4NHb6fn/U=; b=4OWF5R8K/lfoBwMXxIgSR5a/HpvYomkmNsFy31kV7n+GXFG33au13hyeQFnESJGrVCe9wa 4ayZ0O5S2J9GSQBg== From: "tip-bot2 for Pawan Gupta" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] x86/entry_32: Add VERW just before userspace transition Cc: Pawan Gupta , Dave Hansen , x86@kernel.org, linux-kernel@vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170839092663.398.4327574535537349249.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: 1791377789538151135 X-GMAIL-MSGID: 1791377789538151135 The following commit has been merged into the x86/urgent branch of tip: Commit-ID: a0e2dab44d22b913b4c228c8b52b2a104434b0b3 Gitweb: https://git.kernel.org/tip/a0e2dab44d22b913b4c228c8b52b2a104434b0b3 Author: Pawan Gupta AuthorDate: Tue, 13 Feb 2024 18:22:08 -08:00 Committer: Dave Hansen CommitterDate: Mon, 19 Feb 2024 16:31:46 -08:00 x86/entry_32: Add VERW just before userspace transition As done for entry_64, add support for executing VERW late in exit to user path for 32-bit mode. Signed-off-by: Pawan Gupta Signed-off-by: Dave Hansen Link: https://lore.kernel.org/all/20240213-delay-verw-v8-3-a6216d83edb7%40linux.intel.com --- arch/x86/entry/entry_32.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index c73047b..fba4276 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -885,6 +885,7 @@ SYM_FUNC_START(entry_SYSENTER_32) BUG_IF_WRONG_CR3 no_user_check=1 popfl popl %eax + CLEAR_CPU_BUFFERS /* * Return back to the vDSO, which will pop ecx and edx. @@ -954,6 +955,7 @@ restore_all_switch_stack: /* Restore user state */ RESTORE_REGS pop=4 # skip orig_eax/error_code + CLEAR_CPU_BUFFERS .Lirq_return: /* * ARCH_HAS_MEMBARRIER_SYNC_CORE rely on IRET core serialization @@ -1146,6 +1148,7 @@ SYM_CODE_START(asm_exc_nmi) /* Not on SYSENTER stack. */ call exc_nmi + CLEAR_CPU_BUFFERS jmp .Lnmi_return .Lnmi_from_sysenter_stack: