From patchwork Sun Nov 6 09:05:06 2022 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: 16103 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1404211wru; Sun, 6 Nov 2022 01:11:15 -0800 (PST) X-Google-Smtp-Source: AMsMyM5w43iSHtpaG6kBXvZhjvrNVOUU3rFhu0fNd+TVrBauHZdwpjJuMURQP7Vmab90UWK/X+qq X-Received: by 2002:a17:906:6a03:b0:7ad:b51d:3a38 with SMTP id qw3-20020a1709066a0300b007adb51d3a38mr41399335ejc.202.1667725875466; Sun, 06 Nov 2022 01:11:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667725875; cv=none; d=google.com; s=arc-20160816; b=GfHWK8N+BQKrPLbxg11JFHAVzbFZW5a/RzDXp0usH9V/4LGqTBb0JRawJkMWRV23FD 7J1d1zvGIIcEYOdESkPlBDlRQWGQyw6IK//oLEhEbIOeBP3zDSdha7LR4jS+g7nKkI6G QdnES3iSa4s76G4B01LI+HW0Q6ZjDSSkbYmvpXH7B9WFUgI60X9a2g3qZIebLhqr4k6O v3IwiypcbTNVCwogIR3m4KO4UjOMscRoLOX/yC2iJBgXMDZ9U7YnSP9kuTfocokp1Mmi ZihKIdZjcE0ZHbGNgbY8znm9vu2SonoGKfuvA02NiqkrqNTbS+1L9s5UI6eDLJtleyjh FwUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=89gCVDJVAOWy3TSZEo3iFfGJsyh+x/Z/Kw/KHr7+1G4=; b=jOZLrlKrHEjwnALIrklCMHfqhwqWLdT2ZzylSe+Ni6Vl0DkmS+fMpYR8Cvr9D4aSke 8N0ad27GrHv6Y5hbTaDKPm8kFNu1VywU+94zZELCCha9VZrcLcREwToP2EV4vxr1M6hx u6KjBny/qR+OXzNSKmZCXkFYeAIPcwcwIfv3kbndpdw4k2ZVapW1bV6RVYHjkdD+lYmg QIHj7Qt1cXQuZ7iHoy+hj+VRjh1TwLkrOYg9cKGA4vyLgkMk+3grekVvZUgymMyZb/Kd ZT2cebkl7qb2H35ARLLzuRnlHTXetwJZHJQY1E7vWnxHR7kVgGsvQjniFXBi+B4VlYh8 GLYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=K0Z7rtmp; dkim=neutral (no key) header.i=@linutronix.de header.b=EBX8rKjE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qk44-20020a1709077fac00b007ae0ca417e4si5463239ejc.690.2022.11.06.01.10.51; Sun, 06 Nov 2022 01:11:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=K0Z7rtmp; dkim=neutral (no key) header.i=@linutronix.de header.b=EBX8rKjE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229764AbiKFJFM (ORCPT + 99 others); Sun, 6 Nov 2022 04:05:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229609AbiKFJFL (ORCPT ); Sun, 6 Nov 2022 04:05:11 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1A6355B0; Sun, 6 Nov 2022 01:05:10 -0800 (PST) Date: Sun, 06 Nov 2022 09:05:06 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1667725508; 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=89gCVDJVAOWy3TSZEo3iFfGJsyh+x/Z/Kw/KHr7+1G4=; b=K0Z7rtmpD1pSUjLm7CbE8heLq7Vnpq4ww8AwA/7Z1euaOKZr9xO6mhNP2ILcOoCKELb1VM sXWQbaftIxGmqv+3fkIm1o44Fn8WXWXe0cX8byoakqbWaaeA73NZpfAGmHBHifIRenPr9Y yJ1NSQVwdBSvirl4niZg2ZZHCOkzVFU+KX5OLCcCd4h4333brHzJCQymKXxG82ufHWPy03 x8qBJ0P/SVCirrpa/iSQZb1LnTxHFDRlfhWsPSEybvRyYnejvlc9l94CHJIpaxRlxtW8v+ xZlDtOjTJjAZFhHt0waBgLCQcyDx0KCdmTan8sVE4Miq6701CXBsV4wriJDXnA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1667725508; 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=89gCVDJVAOWy3TSZEo3iFfGJsyh+x/Z/Kw/KHr7+1G4=; b=EBX8rKjEXGPoJqRNsDF8f07P7YU2voxjRGh7vU0vuZQ7sn+s5aPLkVnHY+yeIJuQDRo/+3 1TbiaLSWIEwYiUCQ== From: "tip-bot2 for Ingo Molnar" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/core] x86/cpufeatures: Move X86_FEATURE_CALL_DEPTH from bit 18 to bit 19 of word 11, to leave space for WIP X86_FEATURE_SGX_EDECCSSA bit Cc: Peter Zijlstra , Thomas Gleixner , Borislav Petkov , Dave Hansen , x86@kernel.org, Linus Torvalds , linux-kernel@vger.kernel.org, Ingo Molnar MIME-Version: 1.0 Message-ID: <166772550650.4906.6007680313066821301.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748737327494352545?= X-GMAIL-MSGID: =?utf-8?q?1748737327494352545?= The following commit has been merged into the x86/core branch of tip: Commit-ID: b1599915f09157e98f59556e1b2eafe473603347 Gitweb: https://git.kernel.org/tip/b1599915f09157e98f59556e1b2eafe473603347 Author: Ingo Molnar AuthorDate: Sun, 06 Nov 2022 09:55:56 +01:00 Committer: Ingo Molnar CommitterDate: Sun, 06 Nov 2022 09:58:36 +01:00 x86/cpufeatures: Move X86_FEATURE_CALL_DEPTH from bit 18 to bit 19 of word 11, to leave space for WIP X86_FEATURE_SGX_EDECCSSA bit Reallocate a soft-cpufeatures bit allocated for call-depth tracking code, which clashes with this recent KVM/SGX patch being worked on: KVM/VMX: Allow exposing EDECCSSA user leaf function to KVM guest Instead of reallocating cpufeatures bits in evil merges, make the allocation explicit. Acked-by: Peter Zijlstra Cc: Thomas Gleixner Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.org Cc: Linus Torvalds Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar --- arch/x86/include/asm/cpufeatures.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index aefd081..864c9b0 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -304,7 +304,8 @@ #define X86_FEATURE_UNRET (11*32+15) /* "" AMD BTB untrain return */ #define X86_FEATURE_USE_IBPB_FW (11*32+16) /* "" Use IBPB during runtime firmware calls */ #define X86_FEATURE_RSB_VMEXIT_LITE (11*32+17) /* "" Fill RSB on VM exit when EIBRS is enabled */ -#define X86_FEATURE_CALL_DEPTH (11*32+18) /* "" Call depth tracking for RSB stuffing */ + /* Hole left for X86_FEATURE_SGX_EDECCSSA */ +#define X86_FEATURE_CALL_DEPTH (11*32+19) /* "" Call depth tracking for RSB stuffing */ /* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */ #define X86_FEATURE_AVX_VNNI (12*32+ 4) /* AVX VNNI instructions */