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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A8F2C433EF for ; Fri, 10 Jun 2022 23:40:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349483AbiFJXke (ORCPT ); Fri, 10 Jun 2022 19:40:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349266AbiFJXkb (ORCPT ); Fri, 10 Jun 2022 19:40:31 -0400 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD03FE12 for ; Fri, 10 Jun 2022 16:40:29 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id d19so655169lji.10 for ; Fri, 10 Jun 2022 16:40:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=TS2dWkXH8XlZd5sL60zfsL+sc90yCJgLJMyjv2lHnXE=; b=oHik6Hczo89wBPZ/dDgD5TFhvpe+fyOMAOoTAMjJs65nr0gDLGEPoSsraJU0Q7oOtM O2ukn6J/kan5d1pizuTACOyL4AJMqq0TFSLAp9Nt2lKgu3kqQZW9UxvT0qNjLOLxVo2L VdOGNPR6TPWNd/CtXdpIJ7N2EBt48nIvTZG9aKik7rJCTjhAkUV4z93XCIDKCDjjb4xr Eka0ieDZibKew3gntWlhI1epJPmtu91/TEYdSYVyLPLxmXVPx/Ud5NTxrwHMoq7M8LXI Yay127WCX0aUnUu0ll1oXJYUbRIJB+uwqsk/wtall2ha0sXClujatVgr8lf3Ylw7R7On 8Sqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=TS2dWkXH8XlZd5sL60zfsL+sc90yCJgLJMyjv2lHnXE=; b=Hjxe5q+tPIohv5QyaRwUKfb7JDV4/HlwWBpl9d4Gh1oDmJ/yS6C+I6uV4Nd5TCSL53 v3nAXx8udVwaIq4A7GXeHPuSKkQ/v3QEJg1g/spZ2Z7QJiwAiC/UUAY39PRouXJs/cS1 ucdAVuINry/geopetc0dsxftDJM3Il6WFJh3Yg47w8sA6ZlSyRYpek1f/xmZxzWVlld4 Gm9KOXT6UcuYFBgaOVQbqFqJsro/OBzVtUrQmGhwBNAtrkdvcPmSKX5Fi4ofxbDUfojd fMxlcxExF5KMLYlUMQYtpAsJvfMuezCmeYGcZzJU4KrcyMJhgl4xiT/oimUeoyichCLk jbbQ== X-Gm-Message-State: AOAM532zPHT3+yA53HXrQaRoo+CIOEmpnCTnMQ4bUXyiD47hE79q8tzU CL5dINu16OgNdQc/YvKY24OnoNpn77R+GX93houJkQ== X-Google-Smtp-Source: ABdhPJw86FbfqG8WmSA2UZEs9tshGtQTRPcCpdyUo1Eq8v8++ykofWmHBq3OGcBcqBQ711Hi3BEoaiAVfzLB2UfnGtw= X-Received: by 2002:a2e:7802:0:b0:258:e918:23f0 with SMTP id t2-20020a2e7802000000b00258e91823f0mr2695378ljc.400.1654904427866; Fri, 10 Jun 2022 16:40:27 -0700 (PDT) MIME-Version: 1.0 References: <20220610233513.1798771-1-samitolvanen@google.com> <20220610233513.1798771-17-samitolvanen@google.com> In-Reply-To: <20220610233513.1798771-17-samitolvanen@google.com> From: Nick Desaulniers Date: Fri, 10 Jun 2022 16:40:16 -0700 Message-ID: Subject: Re: [RFC PATCH v3 16/20] kallsyms: Drop CONFIG_CFI_CLANG workarounds To: Sami Tolvanen Cc: LKML , Kees Cook , Josh Poimboeuf , Peter Zijlstra , "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , Catalin Marinas , Will Deacon , Mark Rutland , Nathan Chancellor , Joao Moreira , Sedat Dilek , Steven Rostedt , linux-hardening@vger.kernel.org, Linux ARM , clang-built-linux Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 10, 2022 at 4:35 PM Sami Tolvanen wrote: > > With -fsanitize=kcfi, the compiler no longer renames static > functions with CONFIG_CFI_CLANG + ThinLTO. Drop the code that cleans > up the ThinLTO hash from the function names. Good riddance! Reviewed-by: Nick Desaulniers > > Signed-off-by: Sami Tolvanen > --- > kernel/kallsyms.c | 17 ----------------- > 1 file changed, 17 deletions(-) > > diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c > index fbdf8d3279ac..2fbb94817e02 100644 > --- a/kernel/kallsyms.c > +++ b/kernel/kallsyms.c > @@ -179,7 +179,6 @@ static bool cleanup_symbol_name(char *s) > * character in an identifier in C. Suffixes observed: > * - foo.llvm.[0-9a-f]+ > * - foo.[0-9a-f]+ > - * - foo.[0-9a-f]+.cfi_jt > */ > res = strchr(s, '.'); > if (res) { > @@ -187,22 +186,6 @@ static bool cleanup_symbol_name(char *s) > return true; > } > > - if (!IS_ENABLED(CONFIG_CFI_CLANG) || > - !IS_ENABLED(CONFIG_LTO_CLANG_THIN) || > - CONFIG_CLANG_VERSION >= 130000) > - return false; > - > - /* > - * Prior to LLVM 13, the following suffixes were observed when thinLTO > - * and CFI are both enabled: > - * - foo$[0-9]+ > - */ > - res = strrchr(s, '$'); > - if (res) { > - *res = '\0'; > - return true; > - } > - > return false; > } > > -- > 2.36.1.476.g0c4daa206d-goog > -- Thanks, ~Nick Desaulniers