From patchwork Thu Nov 17 09:19:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suleiman Souhlal X-Patchwork-Id: 13046395 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 842CBC4332F for ; Thu, 17 Nov 2022 09:22:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239942AbiKQJWn (ORCPT ); Thu, 17 Nov 2022 04:22:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239932AbiKQJW0 (ORCPT ); Thu, 17 Nov 2022 04:22:26 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EDB46E56D for ; Thu, 17 Nov 2022 01:22:25 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-36810cfa61fso13879027b3.6 for ; Thu, 17 Nov 2022 01:22:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=81PV7eQ82wZtT/VGDxs+jIe4AApJyHnlMlHWD6JrGrM=; b=F3/Op6WSMMmv5RhmNSmGi+exGfsS9gdsED8NVxclY8kenOQPoz1DEOoaMF7o7L7uyw hu/+pyzzxWHRKtpijx7NBD5xxeXPs8B3U4kiKEGQ14Eq54ux2eosD7hK23rXbRJLXzNF SyH5AvAarVc3w5iBYoozjqW085WGVm/zkrH7erK0Gc/tkwlh8WHxB00k5T81tN+aTZiK ZOuA86+vaK1psxie9Awyu2GoAkE0BsiSiRA4pLdFgS+y3iaZ273EmaNrxarHJPCYmaYf Yi0QSh5Xr41oWRqTWf7qIq6Y/MdGe+2lCViG9MoJY6DNmD6uSfPMKCr9usowEO9qyuSc tFjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=81PV7eQ82wZtT/VGDxs+jIe4AApJyHnlMlHWD6JrGrM=; b=tZsdZv/eGcHSgNnr4rJCBFvmB91LqXKsoidYGFkckGltsG5YcFPU15wPxGKajcoIEi /75ud+qLXgFncdYd5ve551nNq4ta6ba3bIUpOD7WsXjrh6cJYWBOmAzQ3snXSvur63XM sHxH06JI/v4CfFoS4T+riH97lvC99ab7/7kVG8ui8QMzND7wMVuZsc2ty4rD4CWOaQov 3PElcgPtauaB9tHzQUJhDPq8cYhT9PCF7C849LkEoyN3V32IwZCLdDgHStY4kfQcqiWy nMZIOdgZdoBPFP9/JbKbYpalwNfhzR1xJaP3x9s6u7Ls/nIrZe1raKqxUIQuFc03YPTf 8xsg== X-Gm-Message-State: ANoB5pkhv433Eql4y9DvLlNop2+zRH5WwYFHF/1f9/JVXz4HwAZjHcAA gHxgzr7/SKrVVEyxEJKZ7T6RcCFc93WDJA== X-Google-Smtp-Source: AA0mqf4VqWTzSEfBTfP7cw84aOqVhzOG+oj4GggA0/jixSpErKHUFqThF0SRpGy/ql+OqMDlOUs3d+3Rtc0Gwg== X-Received: from suleiman1.tok.corp.google.com ([2401:fa00:8f:203:416e:f3c7:7f1d:6e]) (user=suleiman job=sendgmr) by 2002:a05:690c:c19:b0:391:70ef:9e76 with SMTP id cl25-20020a05690c0c1900b0039170ef9e76mr683757ywb.42.1668676944266; Thu, 17 Nov 2022 01:22:24 -0800 (PST) Date: Thu, 17 Nov 2022 18:19:48 +0900 In-Reply-To: <20221117091952.1940850-1-suleiman@google.com> Message-Id: <20221117091952.1940850-31-suleiman@google.com> Mime-Version: 1.0 References: <20221117091952.1940850-1-suleiman@google.com> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog Subject: [PATCH 4.19 30/34] x86/bugs: Add Cannon lake to RETBleed affected CPU list From: Suleiman Souhlal To: stable@vger.kernel.org Cc: x86@kernel.org, kvm@vger.kernel.org, bp@alien8.de, pbonzini@redhat.com, peterz@infradead.org, jpoimboe@kernel.org, cascardo@canonical.com, surajjs@amazon.com, ssouhlal@FreeBSD.org, suleiman@google.com Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Pawan Gupta commit f54d45372c6ac9c993451de5e51312485f7d10bc upstream. Cannon lake is also affected by RETBleed, add it to the list. Fixes: 6ad0ad2bf8a6 ("x86/bugs: Report Intel retbleed vulnerability") Signed-off-by: Pawan Gupta Signed-off-by: Borislav Petkov Signed-off-by: Thadeu Lima de Souza Cascardo [ bp: Adjust cpu model name CANNONLAKE_L -> CANNONLAKE_MOBILE ] Signed-off-by: Suraj Jitindar Singh Signed-off-by: Greg Kroah-Hartman Signed-off-by: Suleiman Souhlal --- arch/x86/kernel/cpu/common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index c70be58b0a9b..da3819a43418 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1053,6 +1053,7 @@ static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = { VULNBL_INTEL_STEPPINGS(SKYLAKE_DESKTOP, X86_STEPPING_ANY, SRBDS | MMIO | RETBLEED), VULNBL_INTEL_STEPPINGS(KABYLAKE_MOBILE, X86_STEPPING_ANY, SRBDS | MMIO | RETBLEED), VULNBL_INTEL_STEPPINGS(KABYLAKE_DESKTOP,X86_STEPPING_ANY, SRBDS | MMIO | RETBLEED), + VULNBL_INTEL_STEPPINGS(CANNONLAKE_MOBILE,X86_STEPPING_ANY, RETBLEED), VULNBL_INTEL_STEPPINGS(ICELAKE_MOBILE, X86_STEPPING_ANY, MMIO | MMIO_SBDS | RETBLEED), VULNBL_INTEL_STEPPINGS(ICELAKE_XEON_D, X86_STEPPING_ANY, MMIO), VULNBL_INTEL_STEPPINGS(ICELAKE_X, X86_STEPPING_ANY, MMIO),