From patchwork Mon Oct 17 14:53:27 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: 3498 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1493034wrs; Mon, 17 Oct 2022 07:55:34 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5gDnY6XgxEWoRROiALUXJin1oM4W4v59Eops5+FMolKhF1GMUWFov+JbUOglRQ0o8jrnZh X-Received: by 2002:a50:eb05:0:b0:457:c6f5:5f65 with SMTP id y5-20020a50eb05000000b00457c6f55f65mr10384380edp.311.1666018533808; Mon, 17 Oct 2022 07:55:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666018533; cv=none; d=google.com; s=arc-20160816; b=wqMtRgqC33B9oCg+9tbwBkTvtT9/UWFqcYWc9N4vNqyCMysnkUw/NARh4DE9sOTJID 41gCuAF942rkSB505kzO3T+QeafSaZHvqMoZHzxZeJjYhbmPOupo9PUr9RzLIPrFrtC/ V9Bo3AfJwRY0hc2jIiDGoYsswrUy9q6s58cTSzCcoL+gdqOHoIOw1mcDuCQzglEQOAPm ew3aQylwJbyBXWA2dwaY/jT27K+bqpYfgThoFxJBx0OcgjCcDIPXf4QDQIZYTGtXvhkr My7Fy5RHL9Y+Il9RHwKSapp0smD0CyRNDf0ybun0TTEZak198v1eKbAeMFByJEcmAHYa J2lQ== 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=xg0xHXej0kpXb8D+dFwquGdGQDndJ4sP04mdgb/MTKk=; b=zX0ab/40eH2MU4EDaEevn7im1QgqVS9gXvU7T/apDVVPwVLOEJgbLbVmV9ivfWp3fm cks5fjTBKzpO3Snw6oH8DNH+HSw0u1VlfnIa/g4YLluviNCTiDeUzvQ+gkKOZ/V3mDAe Yp9f+RdjZdtx7sq/itPAfSZYSb6F+8QgdqPZAU/WxFlRdQcOz65joYYJwgZAK3koPypQ ei0B9mL/7b7RUlNyPls1wTicsPg/t3CFkl4rlLCStN/Clo52rXbQ6yYxTebsCnofcPFs cg1D9LJiTbvMS+/9/WgzDtSp/okY1c2C0eenGqbd23q1Z5mEibNomstzowIkvSxLonBa Uo7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=hnDUyaja; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=Vl0FhSBj; 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 hb38-20020a170907162600b0078e28a52d59si7993731ejc.927.2022.10.17.07.55.07; Mon, 17 Oct 2022 07:55:33 -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=hnDUyaja; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=Vl0FhSBj; 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 S230515AbiJQOyL (ORCPT + 99 others); Mon, 17 Oct 2022 10:54:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230382AbiJQOxt (ORCPT ); Mon, 17 Oct 2022 10:53:49 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E88A168CFA; Mon, 17 Oct 2022 07:53:31 -0700 (PDT) Date: Mon, 17 Oct 2022 14:53:27 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1666018409; 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=xg0xHXej0kpXb8D+dFwquGdGQDndJ4sP04mdgb/MTKk=; b=hnDUyaja6MpvH6W+3iQ0Au0xFHD2W8lf49eJF79hPNd8tW3kjYLsRojUqsSohXN7PMAmHH JrlMPJSAnY312Yx8y4hI1GV+pHfpbxHH/VzP/lbmnEyj21miVGx9k7goCPgc5MYanwYMkK 5/gRLE9GOm7+Nfv6wy0So3TQc5yrJcAeO4SHFlDds6d61JzdEkRv2vLm7b42ZTLG0D30wS OrGuV9XDBOSf6eOsIY7vN+/Z4WLkVx0ZvNpupTdoe4KIH1Iq8L03ZoJ7Q23sGdnlr19i4h 8BCTfwEDOu4b4qAQAubFEggifrqY+jhDpM3k4+bkLJwsbb6VqCK7BSV0NEB82Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1666018409; 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=xg0xHXej0kpXb8D+dFwquGdGQDndJ4sP04mdgb/MTKk=; b=Vl0FhSBjCYeHckk5G/NUn/Zh4ua8nqiq16T/OeHnlYTRdNP2rGQ9mHR40Gidh0N6DQSeG7 b6R0FmH9BndPUuBQ== From: "tip-bot2 for Peter Zijlstra (Intel)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/core] x86/bugs: Add retbleed=force Cc: "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <166601840772.401.17827404870424990971.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?1746947049708247396?= X-GMAIL-MSGID: =?utf-8?q?1746947049708247396?= The following commit has been merged into the x86/core branch of tip: Commit-ID: 5c9a92dec3235b0c1d51e92860f8014753161593 Gitweb: https://git.kernel.org/tip/5c9a92dec3235b0c1d51e92860f8014753161593 Author: Peter Zijlstra (Intel) AuthorDate: Mon, 17 Oct 2022 16:41:20 +02:00 Committer: Peter Zijlstra CommitterDate: Mon, 17 Oct 2022 16:41:20 +02:00 x86/bugs: Add retbleed=force Debug aid, allows running retbleed=force,stuff on non-affected uarchs Signed-off-by: Peter Zijlstra (Intel) --- arch/x86/kernel/cpu/bugs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index e6c23ea..b307b83 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -838,6 +838,8 @@ static int __init retbleed_parse_cmdline(char *str) retbleed_cmd = RETBLEED_CMD_STUFF; } else if (!strcmp(str, "nosmt")) { retbleed_nosmt = true; + } else if (!strcmp(str, "force")) { + setup_force_cpu_bug(X86_BUG_RETBLEED); } else { pr_err("Ignoring unknown retbleed option (%s).", str); }