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 304C2C77B71 for ; Thu, 13 Apr 2023 14:14:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231434AbjDMOOp (ORCPT ); Thu, 13 Apr 2023 10:14:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230281AbjDMOOo (ORCPT ); Thu, 13 Apr 2023 10:14:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D42742D4E; Thu, 13 Apr 2023 07:14:42 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 6FFC563EFF; Thu, 13 Apr 2023 14:14:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76A3DC433EF; Thu, 13 Apr 2023 14:14:37 +0000 (UTC) Date: Thu, 13 Apr 2023 15:14:34 +0100 From: Catalin Marinas To: Marco Elver Cc: Andrew Morton , Peter Zijlstra , Jakub Jelinek , linux-toolchains@vger.kernel.org, Alexander Potapenko , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Andrey Ryabinin , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , Kees Cook , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-kbuild@vger.kernel.org, linux-hardening@vger.kernel.org, Linux Kernel Functional Testing , Naresh Kamboju Subject: Re: [PATCH v5 1/4] kasan: Emit different calls for instrumentable memintrinsics Message-ID: References: <20230224085942.1791837-1-elver@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230224085942.1791837-1-elver@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-toolchains@vger.kernel.org Hi Marco, On Fri, Feb 24, 2023 at 09:59:39AM +0100, Marco Elver wrote: > Clang 15 provides an option to prefix memcpy/memset/memmove calls with > __asan_/__hwasan_ in instrumented functions: https://reviews.llvm.org/D122724 > > GCC will add support in future: > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108777 > > Use it to regain KASAN instrumentation of memcpy/memset/memmove on > architectures that require noinstr to be really free from instrumented > mem*() functions (all GENERIC_ENTRY architectures). > > Fixes: 69d4c0d32186 ("entry, kasan, x86: Disallow overriding mem*() functions") > Signed-off-by: Marco Elver > Acked-by: Peter Zijlstra (Intel) > Reviewed-by: Andrey Konovalov > Tested-by: Linux Kernel Functional Testing > Tested-by: Naresh Kamboju [...] > diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan > index b9e94c5e7097..fa9f836f8039 100644 > --- a/scripts/Makefile.kasan > +++ b/scripts/Makefile.kasan > @@ -38,6 +38,11 @@ endif > > CFLAGS_KASAN += $(call cc-param,asan-stack=$(stack_enable)) > > +# Instrument memcpy/memset/memmove calls by using instrumented __asan_mem*() > +# instead. With compilers that don't support this option, compiler-inserted > +# memintrinsics won't be checked by KASAN on GENERIC_ENTRY architectures. > +CFLAGS_KASAN += $(call cc-param,asan-kernel-mem-intrinsic-prefix=1) > + > endif # CONFIG_KASAN_GENERIC > > ifdef CONFIG_KASAN_SW_TAGS > @@ -54,6 +59,9 @@ CFLAGS_KASAN := -fsanitize=kernel-hwaddress \ > $(call cc-param,hwasan-inline-all-checks=0) \ > $(instrumentation_flags) > > +# Instrument memcpy/memset/memmove calls by using instrumented __hwasan_mem*(). > +CFLAGS_KASAN += $(call cc-param,hwasan-kernel-mem-intrinsic-prefix=1) This patch breaks the arm64 kernel builds with KASAN_SW_TAGS enabled and clang prior to version 15. Those prior clang versions don't like the '-mllvm -hwasan-kernel-mem-intrinsic-prefix=1' option, end up printing the help text instead of generating the object. Do we need some combination of cc-option and cc-param? Or at least disable this instrumentation if earlier clang versions are used. It's already in mainline as commit 51287dcb00cc715c27bf6a6b4dbd431621c5b65a. Thanks. -- Catalin