Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp575873pxp; Wed, 9 Mar 2022 08:26:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJxGQr3ioHvW9hIBiBTk0O8oiUxXEUzgVCBFkKYbVTc7PJSQH27JvKrsOifQUDVJGeSDwSam X-Received: by 2002:a63:1d65:0:b0:375:3d96:36b4 with SMTP id d37-20020a631d65000000b003753d9636b4mr418339pgm.165.1646843211512; Wed, 09 Mar 2022 08:26:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646843211; cv=none; d=google.com; s=arc-20160816; b=SfisBKuQpUaUC6HTYMxgsddSKTmcuy9mFCtHR7/1tD951k/hfQMIbAwnUr3nknM019 kC7g/KNfv70uTZEVEfVsUsdB4NThGNTlrLfG7NkQXapW5YX6bm0YPTJYt+fQfKq/wxAM 8Rn6ewfLq4iGMLgbZoZa4a9T3Pk+186TCBOcLch7oVG4HudSJwx7jZ9NgRZI/UZ4SWS4 CWCrNuxEXoT/CMaNz6HUzgZUEWd+zzA8TsJhR0/S8BqAKDYR9ljA8piWpGYCfP+OyU4N NYjzq3rB1K8Kw29vl0cFbu8w5XSB81dJ7KgrS45kr4rBdSWtK6RnwbUnTj9a3rf6fWgL hfnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:user-agent :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=tjmI5OGTnGLrMM6o7uFlNXSuSPjReiMagPCjLzMUPm8=; b=MTm998g/Vbju/aqF+Jot7DSjhmlTb+Xob77yxpDPkX9DgMHFV5nFJpDmhz+sDr5pGl k5PFVkmjjVhF7Aj51pVpf6UBVWx4Xhh0fE1eCdFCDclG6hrGnwou4WCjHQSTMEIdLbxf jCml6smp/0Zjg9sWYcy/ec7fO1ummOqgtw0DqVP5ogYIXb9bT04TCtXMCXVc9OUPlsNe Yh8x7ltLewDcASZWX/tCVZQUMSe9u0I5INype9OxIRaqD1ZlNuPIgwK/BOLiFOloicLU O/E00mi0jAxskuvZ3RieYgp7X6C9MJrNxCVz67jfEXfsmBebFtWMAy0pamH/CmZ6EE6w Ieng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iGxHGQAH; 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=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 6-20020a631846000000b0037604b9f7dfsi2144755pgy.423.2022.03.09.08.26.33; Wed, 09 Mar 2022 08:26:51 -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=@linuxfoundation.org header.s=korg header.b=iGxHGQAH; 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=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234127AbiCIQCm (ORCPT + 99 others); Wed, 9 Mar 2022 11:02:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234129AbiCIQCd (ORCPT ); Wed, 9 Mar 2022 11:02:33 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A714C179A28; Wed, 9 Mar 2022 08:01:23 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 3F37DB82228; Wed, 9 Mar 2022 16:01:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E0E9C340E8; Wed, 9 Mar 2022 16:01:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1646841681; bh=crFxha2El/BxF9Jr9N0PVID5S0hFVUc/9u8fbIfdO4I=; h=From:To:Cc:Subject:Date:From; b=iGxHGQAH6qqHEnGTnNu53PHoGeXU+vCv5jdreTVoe2jx1+ntjkiBPbEzQ/Y1LlCHs Wzmh2BfDAYV9YJL8iro6gqgZX53yCH3bPzCT+pcZh/gPlA5GavsVvZMYTTn+5B3drb WD3uCXkG3HcOOj1qTDyeYJIzDHd+6yZ4SMfrgP48= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, linux@roeck-us.net, shuah@kernel.org, patches@kernelci.org, lkft-triage@lists.linaro.org, pavel@denx.de, jonathanh@nvidia.com, f.fainelli@gmail.com, sudipm.mukherjee@gmail.com, slade@sladewatkins.com Subject: [PATCH 4.9 00/24] 4.9.306-rc1 review Date: Wed, 9 Mar 2022 16:59:13 +0100 Message-Id: <20220309155856.295480966@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 User-Agent: quilt/0.66 X-stable: review X-Patchwork-Hint: ignore X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.306-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.9.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.9.306-rc1 X-KernelTest-Deadline: 2022-03-11T15:58+00:00 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 This is the start of the stable review cycle for the 4.9.306 release. There are 24 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Fri, 11 Mar 2022 15:58:48 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.306-rc1.gz or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman Linux 4.9.306-rc1 Emmanuel Gil Peyrot ARM: fix build error when BPF_SYSCALL is disabled Russell King (Oracle) ARM: include unprivileged BPF status in Spectre V2 reporting Russell King (Oracle) ARM: Spectre-BHB workaround Russell King (Oracle) ARM: use LOADADDR() to get load address of sections Russell King (Oracle) ARM: early traps initialisation Russell King (Oracle) ARM: report Spectre v2 status through sysfs Mark Rutland arm/arm64: smccc/psci: add arm_smccc_1_1_get_conduit() Steven Price arm/arm64: Provide a wrapper for SMCCC 1.1 calls Josh Poimboeuf x86/speculation: Warn about eIBRS + LFENCE + Unprivileged eBPF + SMT Josh Poimboeuf x86/speculation: Warn about Spectre v2 LFENCE mitigation Kim Phillips x86/speculation: Update link to AMD speculation whitepaper Kim Phillips x86/speculation: Use generic retpoline by default on AMD Josh Poimboeuf x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting Peter Zijlstra Documentation/hw-vuln: Update spectre doc Peter Zijlstra x86/speculation: Add eIBRS + Retpoline options Peter Zijlstra (Intel) x86/speculation: Rename RETPOLINE_AMD to RETPOLINE_LFENCE Peter Zijlstra x86,bugs: Unconditionally allow spectre_v2=retpoline,amd Borislav Petkov x86/speculation: Merge one test in spectre_v2_user_select_mitigation() Lukas Bulwahn Documentation: refer to config RANDOMIZE_BASE for kernel address-space randomization Josh Poimboeuf Documentation: Add swapgs description to the Spectre v1 documentation Tim Chen Documentation: Add section about CPU vulnerabilities for Spectre Zhenzhong Duan x86/retpoline: Remove minimal retpoline support Zhenzhong Duan x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support Zhenzhong Duan x86/speculation: Add RETPOLINE_AMD support to the inline asm CALL_NOSPEC variant ------------- Diffstat: Documentation/hw-vuln/index.rst | 1 + Documentation/hw-vuln/spectre.rst | 785 +++++++++++++++++++++++++++++++ Documentation/kernel-parameters.txt | 8 +- Makefile | 4 +- arch/arm/include/asm/assembler.h | 10 + arch/arm/include/asm/spectre.h | 32 ++ arch/arm/kernel/Makefile | 2 + arch/arm/kernel/entry-armv.S | 79 +++- arch/arm/kernel/entry-common.S | 24 + arch/arm/kernel/spectre.c | 71 +++ arch/arm/kernel/traps.c | 65 ++- arch/arm/kernel/vmlinux-xip.lds.S | 37 +- arch/arm/kernel/vmlinux.lds.S | 37 +- arch/arm/mm/Kconfig | 11 + arch/arm/mm/proc-v7-bugs.c | 198 ++++++-- arch/x86/Kconfig | 4 - arch/x86/Makefile | 5 +- arch/x86/include/asm/cpufeatures.h | 2 +- arch/x86/include/asm/nospec-branch.h | 41 +- arch/x86/kernel/cpu/bugs.c | 223 ++++++--- drivers/firmware/psci.c | 15 + include/linux/arm-smccc.h | 74 +++ include/linux/bpf.h | 11 + kernel/sysctl.c | 8 + tools/arch/x86/include/asm/cpufeatures.h | 2 +- 25 files changed, 1596 insertions(+), 153 deletions(-)