From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EDC2C43462 for ; Fri, 16 Apr 2021 20:39:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB45060FEA for ; Fri, 16 Apr 2021 20:39:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344030AbhDPUj7 (ORCPT ); Fri, 16 Apr 2021 16:39:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343968AbhDPUjl (ORCPT ); Fri, 16 Apr 2021 16:39:41 -0400 Received: from mail-qt1-x84a.google.com (mail-qt1-x84a.google.com [IPv6:2607:f8b0:4864:20::84a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB49CC06138D for ; Fri, 16 Apr 2021 13:39:12 -0700 (PDT) Received: by mail-qt1-x84a.google.com with SMTP id w21-20020ac871950000b02901b1a8294c46so2774956qto.7 for ; Fri, 16 Apr 2021 13:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=L00sBSj1ELLX/Krj/tO4geuDmUwEKOoDhO2GtbyEzGY=; b=tQpc8LYT+nLLdKLnwAODeiwTmYEi1/jJ0aNEkLBltpaGbhdVWc0+KaaXi8k3HcarW+ GdRqkLdtkXIlYhizJYvLuf0lzKsKhdhV1Ae+Qfyw90OvKhnSG7xB+p6X9VDFFOkgQSZp mHEGXW+hiHjirCI7ibaMRiLYFKqhLm9u4JAdjORGQ8yUbI/F5tTnTpLOQuayPAMDMXtq +6K5lugx7vpSFe07/YiaPPWqWKauJjeoW3rPM7SnBHq7hw3Ahmtz688DjELw6KRPccMy uXQXH805Yn26oCHIDRw1bddHahzkmEWEYK0vdu9d0ZMj0cJPd5qgql652R7uTp17TZ+D qAsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=L00sBSj1ELLX/Krj/tO4geuDmUwEKOoDhO2GtbyEzGY=; b=HAEccWmd/vKlBAIAPqaCKtuwafBs7bGCAy+5kSvhyUzPOicbPmzkD8wK4YGlpmYGQH H64NkBMW59UYxRz4hzl7lJq+ApbBUxPbg6XKeWH7oaJIv9rjkn/R+mYLjPHezW9WrnNZ TmYPMh4/LjL2+VQP8Zi8jDLRa+iDP/891fXHKzN5kw8AfgWi64DP7jILqPvWJ8sV02kC 9D54+GJuLXupAMX+wmaPjxtgkQABF4t83yfyzdwet0ynVoDRSmBLLtWlMTjkKInlx6AQ g5yIxoj+UhUC21Y35HlpSHYXdaKt9acJvBU1OPPKCricxVhBkjezUtmSk6UQYSnJSv3S cwaw== X-Gm-Message-State: AOAM530MvsH0/faAcOyrdkmtGu72YSHWVhLggvB1HTbMDeMtLMUy9+Vh 5mRbIWfdZPoYX1rl1Rk5x0M0rHNdrU+rHtn7fQ8= X-Google-Smtp-Source: ABdhPJyV6aw2CRxX5Ka4nkDEUs0zr6DNTz7zFBmr5kr8bNdUja0e+FxUztdUP/+nH7or7ogmyaJPg0f4LpP4gJiAOPs= X-Received: from samitolvanen1.mtv.corp.google.com ([2620:15c:201:2:e262:3d8e:cbf:6164]) (user=samitolvanen job=sendgmr) by 2002:a05:6214:13c2:: with SMTP id cg2mr10524752qvb.4.1618605551808; Fri, 16 Apr 2021 13:39:11 -0700 (PDT) Date: Fri, 16 Apr 2021 13:38:42 -0700 In-Reply-To: <20210416203844.3803177-1-samitolvanen@google.com> Message-Id: <20210416203844.3803177-14-samitolvanen@google.com> Mime-Version: 1.0 References: <20210416203844.3803177-1-samitolvanen@google.com> X-Mailer: git-send-email 2.31.1.368.gbe11c130af-goog Subject: [PATCH 13/15] x86, cpu: Use LTO for cpu.c with CFI From: Sami Tolvanen To: x86@kernel.org Cc: Kees Cook , Josh Poimboeuf , Peter Zijlstra , Nathan Chancellor , Nick Desaulniers , Sedat Dilek , linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, Sami Tolvanen Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org Allow LTO to be used for cpu.c when CONFIG_CFI_CLANG is enabled to avoid indirect call failures. CFI requires Clang >= 12, which doesn't have the stack protector inlining bug. Signed-off-by: Sami Tolvanen --- arch/x86/power/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/power/Makefile b/arch/x86/power/Makefile index 379777572bc9..a0532851fed7 100644 --- a/arch/x86/power/Makefile +++ b/arch/x86/power/Makefile @@ -4,9 +4,11 @@ # itself be stack-protected CFLAGS_cpu.o := -fno-stack-protector +ifndef CONFIG_CFI_CLANG # Clang may incorrectly inline functions with stack protector enabled into # __restore_processor_state(): https://bugs.llvm.org/show_bug.cgi?id=47479 CFLAGS_REMOVE_cpu.o := $(CC_FLAGS_LTO) +endif obj-$(CONFIG_PM_SLEEP) += cpu.o obj-$(CONFIG_HIBERNATION) += hibernate_$(BITS).o hibernate_asm_$(BITS).o hibernate.o -- 2.31.1.368.gbe11c130af-goog