From patchwork Wed Nov 2 09:20:09 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: 14151 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp3509104wru; Wed, 2 Nov 2022 02:26:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4ax6BKXF4XAOp2Uve5hdSz/ypmaWnqGmVoQbks4K134Mn9E8s4FJwGzbm6w2s+ddM2bIBx X-Received: by 2002:a17:906:5a56:b0:7ad:c391:42ee with SMTP id my22-20020a1709065a5600b007adc39142eemr17860389ejc.127.1667381213329; Wed, 02 Nov 2022 02:26:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667381213; cv=none; d=google.com; s=arc-20160816; b=wQ8yFSiiSbVMzl9OiYDyT5BmSErHKfhj9n5HhqfeuQkTuk1Stz4nsFEcCGXfzcoVUW 2sbGazQ+nmJEeZbt9rgNjhe6bYftQddmSexcBIEFxPAGSiXOlg6o3ZAzRQ9h7TTpUico kYeXU/+Bqnv5mr+I3rlF1ay8+8WrGdQWZQRj4kkyJrE5zsIM1USYh5m7S7yJGvHJbRBa ES3SwuVI/EM6fNW5U7ssDKZjlaDXKVqaQI5+8OS+h2W/nXyOD8h0YWTWDYWhr96qorxp FJuQw+GbeKTsVV3kIPpLd9sFYem8TWED8ZtxNsnfE4aUjnW+FMA7dyxvlfuumHhM2iOa h7tg== 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:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=gekW2k4HioQEvgXlGpgUbXsFnaC1UdihEoBTHF91PPQ=; b=bYGiizyQjksQlGsF65gvNgM5Y6T3+RtV8bUsHTgZrSchfgn7IIh8+sQNLlTVW3dhkf ymwx/mGtkRt4/ebrMM4d2SmSDAAyoLr3cLgQi6B0kH4jHHwNrE+4kTlPBxlNd3/vTuN8 OrJPwmKeGtPTpgRlGMifBmbkMPWBq7s3uniX2iv2WNuoX++QtgzLG869ru540A154hUj pS9KtHSUqOCukLJib0ZXpSpsozpKskjv14fievkDbxNkoq/gB2u57WMaHiDaK4YsDIHV A0BmlY/s1NHlKvkzMkULgxzyFl45Rf5kVkl6QnOAXI9VgKa3ZgIzELEdXO0b+g/3XPIt zzRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=QotaKAXM; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=EUEpKhXz; 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 o7-20020a056402038700b0045cc36d6d8fsi11513776edv.336.2022.11.02.02.26.28; Wed, 02 Nov 2022 02:26:53 -0700 (PDT) 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=QotaKAXM; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=EUEpKhXz; 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 S231496AbiKBJXM (ORCPT + 99 others); Wed, 2 Nov 2022 05:23:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230317AbiKBJVW (ORCPT ); Wed, 2 Nov 2022 05:21:22 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03B5965FB; Wed, 2 Nov 2022 02:20:11 -0700 (PDT) Date: Wed, 02 Nov 2022 09:20:09 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1667380810; 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: in-reply-to:in-reply-to:references:references; bh=gekW2k4HioQEvgXlGpgUbXsFnaC1UdihEoBTHF91PPQ=; b=QotaKAXMjo/QCPjtlD2sqG1wVxSq8Sd0mN55mFCsZ/MXAxzvDpSlec9oT9bTFdq4dnVMGg 4NFTg7zo2BdU6Vffn72YtUSSRzFfHyl5i16ypllZ0EczSWUSDsJiz4Wvngvqcjf4Pa21a5 FIwe8SqbjQRqEktj7KUO+OgkHYQhEUCmTmK1RrbMQD3tyfvLiHV/x/M2z5L+lJoFIAVASG P/EQpPpx7is9otfafkmBiMxBAFG5fj8gQzwi/07RKcv0muUBwGpSyEdiPCA6/BvxLYOJuG FyNKbBi98WTfXa3IEJcxQanTLi43Ud7VRfZSU0Qur9io0f0YQjJ2ApN+YQiJ3g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1667380810; 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: in-reply-to:in-reply-to:references:references; bh=gekW2k4HioQEvgXlGpgUbXsFnaC1UdihEoBTHF91PPQ=; b=EUEpKhXzTtazEZ/EfzvuZsU4SEV0H9rWi5kPGRFQUP9aju7ZATf0HSr60CbV/oPlEmhfYI pabq2po6YJDSWdBg== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/core] x86: Unconfuse CONFIG_ and X86_FEATURE_ namespaces Cc: Lukas Bulwahn , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <166738080914.7716.7783697764206767069.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?1748375923173073313?= X-GMAIL-MSGID: =?utf-8?q?1748375923173073313?= The following commit has been merged into the x86/core branch of tip: Commit-ID: b1f37ef655cf372f96015bf54abdb76a91aff27e Gitweb: https://git.kernel.org/tip/b1f37ef655cf372f96015bf54abdb76a91aff27e Author: Peter Zijlstra AuthorDate: Mon, 31 Oct 2022 11:10:56 +01:00 Committer: Peter Zijlstra CommitterDate: Tue, 01 Nov 2022 13:44:07 +01:00 x86: Unconfuse CONFIG_ and X86_FEATURE_ namespaces Lukas reported someone fat fingered the CONFIG_ symbol; fix er up. Fixes: 5d8213864ade ("x86/retbleed: Add SKL return thunk") Reported-by: Lukas Bulwahn Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/Y1+fL4qQEIGZEEKB@hirez.programming.kicks-ass.net --- arch/x86/include/asm/nospec-branch.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index 82580ad..3ab90f2 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -285,7 +285,7 @@ */ .macro UNTRAIN_RET #if defined(CONFIG_CPU_UNRET_ENTRY) || defined(CONFIG_CPU_IBPB_ENTRY) || \ - defined(CONFIG_X86_FEATURE_CALL_DEPTH) + defined(CONFIG_CALL_DEPTH_TRACKING) ANNOTATE_UNRET_END ALTERNATIVE_3 "", \ CALL_ZEN_UNTRAIN_RET, X86_FEATURE_UNRET, \ @@ -296,7 +296,7 @@ .macro UNTRAIN_RET_FROM_CALL #if defined(CONFIG_CPU_UNRET_ENTRY) || defined(CONFIG_CPU_IBPB_ENTRY) || \ - defined(CONFIG_X86_FEATURE_CALL_DEPTH) + defined(CONFIG_CALL_DEPTH_TRACKING) ANNOTATE_UNRET_END ALTERNATIVE_3 "", \ CALL_ZEN_UNTRAIN_RET, X86_FEATURE_UNRET, \