Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp3599217rdh; Thu, 28 Sep 2023 17:32:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFjywNPMF/9F+BMUrBHnnNPXBkWzFCu2o6llKQ3j1dJJDsAKdGXUbDUdH88QleRvFFRY0qW X-Received: by 2002:a05:6a21:3d8d:b0:157:eb32:e775 with SMTP id bj13-20020a056a213d8d00b00157eb32e775mr2747993pzc.62.1695947548564; Thu, 28 Sep 2023 17:32:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695947548; cv=none; d=google.com; s=arc-20160816; b=qlNgpzCkkcPXJbF7XnBkkJoSL66O+aVMV0hI4G74D9vzMfb3D6VURvTypgkOHCJo43 tn8VbEjFuSch71kPFmmzlmUkWn+V9MHyPbZlPcgpg8sqXrX8IRZpHYDq8E0DNZLVwSBu TUHxEEOAAQfvJdWxl9vW/bvvgtqMZb81HtmWTDPldOdK4qzbCxfMYmZRG6DzqWquOV9U GazAicwUuON6k0wzugeCQq6exagLSlkRcUxDRPO/lItHf9+35HyjSfOcM4SOk/nLSrjD LhES9AMiUVdDfojijQaPJO9tV5EDsnk+OUsoPPdJ8EbXLQBvmuzwbVy3vnOVshjWrN74 56GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version:date :subject:cc:to:from:message-id:dkim-signature; bh=SiszJ3AInp3rrBHb2XuUaqcNBc77i/EMr6oPxAb1mLQ=; fh=IatSrlUk0hba+ZfbxtUbKpFMZuPyEGm2qBCi3QQOXrY=; b=n/QgWyl3PTphFGpuGV22tGVBoV2MbUWP8EUTXilvESSwf7EPMNLo+o44edk1+ZJOmF tJ935VHknTPgVxIoHRu/K2rUkO/d7Z0affEfiRjXL+rzkHZrAFbXgQjK0TFo9kZgfFj3 PCOVZspWkUBscGw65YgvDdxkOlf9ORHOqjtBoA8xeLwPoxZj7ZXxPF4uP5rjKcpP2QqE KxDng15O1KitkKfRB2oeaa5aq7tl6VlB+crmeu6Q8oqvXsuELxx7Rdjrss4qSUa0esD4 r7EDc8IMDmk/jcnj5dG9xfLMEGiw6vXbrvek9C3RXhj29FRpy+VkzXw/B2CB3fejiIfg fl0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@foxmail.com header.s=s201512 header.b=m4N4MDux; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id p6-20020a170902e74600b001c62d93585csi2462521plf.611.2023.09.28.17.32.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 17:32:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@foxmail.com header.s=s201512 header.b=m4N4MDux; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 30D5B807615D; Thu, 28 Sep 2023 00:00:32 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230081AbjI1HAV (ORCPT + 99 others); Thu, 28 Sep 2023 03:00:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230293AbjI1HAT (ORCPT ); Thu, 28 Sep 2023 03:00:19 -0400 Received: from out203-205-221-192.mail.qq.com (out203-205-221-192.mail.qq.com [203.205.221.192]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D60E6B7; Thu, 28 Sep 2023 00:00:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1695884404; bh=SiszJ3AInp3rrBHb2XuUaqcNBc77i/EMr6oPxAb1mLQ=; h=From:To:Cc:Subject:Date; b=m4N4MDux7v8DsHD1TjAz2x+u1B8D/h7p2UR4UnNms63zAd0EcpB381tPXhGpyeOv1 nyFywJaTL7RhH1Hh4Q2jc2jnMRDlZe3SNbc9sgs8y96mvProP9qmd2B2LPtPro23FT Ze71HQa9in2zbVb40Rf6EsEay7gQ9RExYO1rO9bM= Received: from hygon4.hygon.cn ([175.152.51.41]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id ED2B607C; Thu, 28 Sep 2023 14:59:18 +0800 X-QQ-mid: xmsmtpt1695884358t2s9z7rzc Message-ID: X-QQ-XMAILINFO: NT+xk6rB66UcYYsfhhQx3EfAgqLG6odk2aekW7AXMue/nhJp6JbDGwd5TY9dkW OQ7aLE5CN5/N72w3WZcav6MqKgB4AxXpW4zXfZQQI8PBcfC1Qi4jNjOgmAMHZnr040Tg84Lk5FaA YFrfh2PhZPP1yFgyJANO49boZGejJljubERD3lWR5KA2Q3FTf65vO7NmgU5xlszbrZ/jzfp8TTVk w0M5EGpHoFB+mnD6N1VMAFWrKpmqcqc8HpqSVD/gy5OS85RXUEQ4lJkhVpzIVOflLgNo5J0bULEK MX5wChYnJqq3Ww7pkAk0j9FQudpkbjblKgXL3vlG2DKKC7frulfYxyNDkdf+tL6bG12CoMBGOXQF Mouh+1K1qOCxv427F5jkx9Ps1COywEnkKtnUTtygRuiCKx/Ossyg5kNlwEhE1h5eEoL3PPuRCXfz krW1a4Orx/MwAq03aqSxobfpHfLjNj7XOUxROayTcd2SR1Ci7HQ8zDCEL4FmCeilja3lWbHgCVMW 80rClNv1dXCXPEaxHwRA6axUoanwPsG2miW4nKicbpbMrJMrH7xV7lUMss2ZP3CvvEhfLf4Q6MFF 9w+xfMWmxNScMih2yjZcu1OMeALZbT/I9wJJjlWWOTi1Ys0+PEpjDW/Dji7PY2EtN6N19pvDP6kk 116d8PRPj+DJv8Cy+4bZC93wnkNu1N6y9G9BZ/hyW9AFQDMTnCSfVI+w1/zbt9BaKePkLjtqp37m +CQ3fzkKJX2KSJCiPuh0ZCJIPMgknzj9Sd15ML379J9sI8ZkTYpmcuxGIv8tLG8ULrrTfhbPFqFX j+VGl7CPi8p8vTR1UIyedwMwmK6pTbUiT8IvDd1cuiRwbHvxtDfALGsrrA1fyASne5t99+qRZbtX csUsjav485D4q/VlNqKIZF62veTI7hM6Wg3cB9NLC3Xzy87FH5reeOOWeIE3N+5K1MrUbZ2qqos+ 9TMGZYQ9m1yXyBdyOk6JjzBApvIoY7Q1yjRFK3Sj+JnqhPWtaXmg== X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Pu Wen To: bp@alien8.de, mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, peterz@infradead.org, kim.phillips@amd.com Cc: linux-kernel@vger.kernel.org, Pu Wen , stable@vger.kernel.org Subject: [PATCH] x86/srso: Add SRSO mitigation for Hygon processors Date: Thu, 28 Sep 2023 14:59:16 +0800 X-OQ-MSGID: <20230928065916.133119-1-pu_wen@foxmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Thu, 28 Sep 2023 00:00:32 -0700 (PDT) From: Pu Wen Add mitigation for the speculative return stack overflow vulnerability which exists on Hygon processors. Signed-off-by: Pu Wen Cc: --- arch/x86/kernel/cpu/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 382d4e6b848d..4e5ffc8b0e46 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1303,7 +1303,7 @@ static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = { VULNBL_AMD(0x15, RETBLEED), VULNBL_AMD(0x16, RETBLEED), VULNBL_AMD(0x17, RETBLEED | SMT_RSB | SRSO), - VULNBL_HYGON(0x18, RETBLEED | SMT_RSB), + VULNBL_HYGON(0x18, RETBLEED | SMT_RSB | SRSO), VULNBL_AMD(0x19, SRSO), {} }; -- 2.23.0