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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47BE2C05027 for ; Fri, 17 Feb 2023 11:07:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AABE06B0073; Fri, 17 Feb 2023 06:07:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A33616B0074; Fri, 17 Feb 2023 06:07:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8AD8F6B0075; Fri, 17 Feb 2023 06:07:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 7B2686B0073 for ; Fri, 17 Feb 2023 06:07:34 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 5E9991A15F8 for ; Fri, 17 Feb 2023 11:07:34 +0000 (UTC) X-FDA: 80476508028.28.F87A4BD Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by imf03.hostedemail.com (Postfix) with ESMTP id A625F2001E for ; Fri, 17 Feb 2023 11:07:32 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=EnMJ6h80; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf03.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.216.47 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676632052; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=/jA5JR6jmFA0atOq1lU4NeFnNlRF/LnXa1fUxjSCz8E=; b=H5UW8B3JPDEv6e2+Z0gyrFio/sqYGMK6rsLtAlv2BTKWo6CPwvtsbwqnE80MI+INoO5CzP vuP+cd4P18EE9VOFCKKcoc3epekZbZNSgs5IbsYzQM/QFhGlmU4kTWfxYntjXtl34m/7Pc faXnXCnr/SPc53XrA0m0MEN8bhX6yl8= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=EnMJ6h80; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf03.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.216.47 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676632052; a=rsa-sha256; cv=none; b=uP+TW3Z1NZZA1oh1bXyONEL2j9rNCo7NNrk8Oyjk5tztgnEUu0hEzrgFKvt04tCDIqz3oS 8u4BGHlduPpzmf/oLduqG07vialbb9Ps4sYlycjhTAkn8P4iVefTS1aygJK9/zKQyVmm29 F1Zr25Hc2lRmBvCOglPcbAJy0IRtJgQ= Received: by mail-pj1-f47.google.com with SMTP id ml23-20020a17090b361700b00234463de251so917083pjb.3 for ; Fri, 17 Feb 2023 03:07:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=/jA5JR6jmFA0atOq1lU4NeFnNlRF/LnXa1fUxjSCz8E=; b=EnMJ6h80J1qErLPgZlJpTRGkCcps7n7R6o6IDgCd6BjfWC0YCoCqAs5fXUKlWEiLXD dBc3kmBsiERY/pncllqOOLxkf/U6psaujOjaqzO5UOmF3xxwwIIzOSJa2GL59mDztLGX 2zp79Q2XPNlnL3pzmquol44icIE9JvZXLZRDYMga/Boz+6YSJCLOhBAIiHhKf5kW5Ud+ xiDg/hIK9HvHYpxowjZFYBPkdTvOHw6neAvWR9q2ghcFKUvKPpHiOMeHSDPKq2e7dRRm RbGTzRA0Da+3LbC2Pcz4xb0g1q2aKEUbcQyYtETfHv9bmfudt1G0NZG38AKd7vftnefS FCBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/jA5JR6jmFA0atOq1lU4NeFnNlRF/LnXa1fUxjSCz8E=; b=6aFVjXLJKs4Of0wR4KUlncahON06Z4nr39YC88mK6ewbUeKfaqxn3CuyXV9hPV3t09 34OkAgTQUPG72zoAU7tFQNVswiWAOhmE05hnV6bC2UKV+Tmq7DWIUFT90+LRuMv7rN6f lF/cJAclOTTjcuglvQsmUxTI4Agwqrgyxb0b4U5HWwXOMC6/VQkY4pF+CD1bG+FJXPOg 93fLY/OZURLeW0ajySOt7p80J4kP5SnlKHZUPXjQMmVrd5gPVdm1P5Ciu1vCMOEFgDtM je7yQa5nLO+ZW0bfw4+ceCQdl7k09HomjXhq0RLI32UjxYJ+hk6S5zJuNq+IBpqAEHLM FMGw== X-Gm-Message-State: AO0yUKXBl0ODKnEJnKqZAuWImyl+fFR9YZJWRhICWIdX25uuwyyymC2f gfA65l/mWf0jCUq3brhfBbKQJExrcEBwAsbH/ZA= X-Google-Smtp-Source: AK7set+L0zxQe7K8kbt2mwqElUnWRrsxvWMtas/LO1yjyT7i770qq8v6uZe1XDlAVHcS7O+dKR9ymQH5E0gZaVla91c= X-Received: by 2002:a17:90b:1f8f:b0:233:3c5a:b41b with SMTP id so15-20020a17090b1f8f00b002333c5ab41bmr1428932pjb.133.1676632051210; Fri, 17 Feb 2023 03:07:31 -0800 (PST) MIME-Version: 1.0 References: <20230216234522.3757369-1-elver@google.com> <20230216234522.3757369-2-elver@google.com> In-Reply-To: <20230216234522.3757369-2-elver@google.com> From: Andrey Konovalov Date: Fri, 17 Feb 2023 12:07:20 +0100 Message-ID: Subject: Re: [PATCH -tip v4 2/3] kasan: Treat meminstrinsic as builtins in uninstrumented files To: Marco Elver Cc: Peter Zijlstra , Ingo Molnar , Jakub Jelinek , linux-toolchains@vger.kernel.org, Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Andrew Morton , Nathan Chancellor , Nick Desaulniers , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kbuild@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: A625F2001E X-Stat-Signature: nue8zhhhy9679u3b3gynynne9bb6eoou X-HE-Tag: 1676632052-734424 X-HE-Meta: U2FsdGVkX1/QaawMq+H62lCu+6FvqrQ5KWQ+11hcRrw2dpH3B9RljfOlZVOgIt4NYtFXyEC5PgApuy9v0VtkXLk7xtR4p2yw2CkfGUYp+SveePrxBclhwLllHNCnnRA3wIxpmTn9lYfM0eIGtHd6nx4e/EEPygnnlf06qedMkuwZC1+l8/SXJwgbI3kYWz38Lboth8H61DRnaZBMbtqUOKX4ASC6Vw2QbT/+UXMbuShWYM8ShYibDmXUXyRZ8iAcBJO4a98Lf3wFswnkLtV/Hsn39hJQ9wPuWJmQO4YtO1rPNkh+ZnZ5c0V1U4HHEHoiMGqygUoha2av0+roKgrCiUnL4bxD9NAJJXnLrEris+4/V26XbQ5MWqpC2QMxQp4060WvLlaNKZZftlmbKE9kbP2ZAggOmkE+igcXheykOEmdlTG8c16TJ9Qvt20wx+pHamXmdUWkeqnCvANZrwNhgCuBpyByr44m8kg1f/BsMax9j+5dF8rtwRnFcL/61osxw3RsbBWTgrs4smjLnEq2m3qxP83LqjSYuuXNqfhDNhk9BvshhvxnRVtSJTwg/roYZ5E8PVTKqn9OdHOoMHTjFrL2Wefx8yuAU/67IUt7M13lagwSnJ9rX/4rSqNjHwZ87/lLvMtUCgrKWNvEQHn2ncIApfnQWTmczhDNApBG75YL7zsGCainmJTR4bsp/gX+zgQXNNQA77vyKTdgMiUkHQCjviZeQtQ2Bwa6Hg5dUbHGyHhYXMf2BAtvHrnWhCVTT6p4guf2PVJkCyTURF2RdPtz+wx3py18k8HvuddIOzOUx7iXQ2yIRPzKy32CKj/uugrnIK9YZ+zOBA3WF+a8RBjNa+cO9g1Y5u0EWKQvB/XiropOo+MQQLtjXiDokE4KtKFQqWQdjR9kCFbeRxPsqVvw+5RszMKQWRvx9hDKjoMhnDAj+jUBstGorsIIZu7c/kPabmfW7M7oVZfgQvq +1Fjd7pG rhTDWMVpDxBejqkj4IfiiTjtG2+9208XVK6Juxp7kzT3j/5ikx6hZPPI5G+H0Kz3SYY7RuLSXcQX3YmSdtDf+xjt3HGfmDnCD+cyHxxAfYdVX6XcHh8oNa1ALGGcxjN/WVjmPBurf5vcBAS9qKk+hu23p02tY+XfVLEx2kWxtS74Cr5mspPCNk+jBE02HlF0ey3j7xgTVhRVAmCPZTjrV5mo+eYVzYXnaYQqX8UWKVxKQJwg9QzG4Pg6KWZJxy5mjG1TJ0gL4pbVphr3FFmS7hj7PEhS9isNZd/aYd0eSA4I3R64D1BcWF0dNZLWzcUVNP2yVVmnaXOQXsH+1O46LODJFgsSf2JaxUp3hZOS+1ueD9ZOKb5dBgq8isjVMPGeUR9P11sc5G9UbC+FHodWaXEwMzpWNpF2q7VVL+vQexMbg3H6VTwhPryh7VVGwc4aSk/XsUvpCrLe6kG7zhy1njkKf179Nsesh06xwCFX8DAYcKR5Pn3nPpeOHBl7WpXnG9BUTmkIAJoWqvN6ifSJTKLmt9MA/zFv8hTG/rD/TRKiOPUA= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, Feb 17, 2023 at 12:45 AM Marco Elver wrote: > > Where the compiler instruments meminstrinsics by generating calls to > __asan/__hwasan_ prefixed functions, let the compiler consider > memintrinsics as builtin again. > > To do so, never override memset/memmove/memcpy if the compiler does the > correct instrumentation - even on !GENERIC_ENTRY architectures. > > Fixes: 69d4c0d32186 ("entry, kasan, x86: Disallow overriding mem*() functions") > Signed-off-by: Marco Elver > --- > v4: > * New patch. > --- > lib/Kconfig.kasan | 9 +++++++++ > mm/kasan/shadow.c | 5 ++++- > scripts/Makefile.kasan | 9 +++++++++ > 3 files changed, 22 insertions(+), 1 deletion(-) > > diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan > index be6ee6020290..fdca89c05745 100644 > --- a/lib/Kconfig.kasan > +++ b/lib/Kconfig.kasan > @@ -49,6 +49,15 @@ menuconfig KASAN > > if KASAN > > +config CC_HAS_KASAN_MEMINTRINSIC_PREFIX > + def_bool (CC_IS_CLANG && $(cc-option,-fsanitize=kernel-address -mllvm -asan-kernel-mem-intrinsic-prefix=1)) || \ > + (CC_IS_GCC && $(cc-option,-fsanitize=kernel-address --param asan-kernel-mem-intrinsic-prefix=1)) > + # Don't define it if we don't need it: compilation of the test uses > + # this variable to decide how the compiler should treat builtins. > + depends on !KASAN_HW_TAGS > + help > + The compiler is able to prefix memintrinsics with __asan or __hwasan. > + > choice > prompt "KASAN mode" > default KASAN_GENERIC > diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c > index f8a47cb299cb..43b6a59c8b54 100644 > --- a/mm/kasan/shadow.c > +++ b/mm/kasan/shadow.c > @@ -38,11 +38,14 @@ bool __kasan_check_write(const volatile void *p, unsigned int size) > } > EXPORT_SYMBOL(__kasan_check_write); > > -#ifndef CONFIG_GENERIC_ENTRY > +#if !defined(CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX) && !defined(CONFIG_GENERIC_ENTRY) > /* > * CONFIG_GENERIC_ENTRY relies on compiler emitted mem*() calls to not be > * instrumented. KASAN enabled toolchains should emit __asan_mem*() functions > * for the sites they want to instrument. > + * > + * If we have a compiler that can instrument meminstrinsics, never override > + * these, so that non-instrumented files can safely consider them as builtins. > */ > #undef memset > void *memset(void *addr, int c, size_t len) > diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan > index fa9f836f8039..c186110ffa20 100644 > --- a/scripts/Makefile.kasan > +++ b/scripts/Makefile.kasan > @@ -1,5 +1,14 @@ > # SPDX-License-Identifier: GPL-2.0 > + > +ifdef CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX > +# Safe for compiler to generate meminstrinsic calls in uninstrumented files. > +CFLAGS_KASAN_NOSANITIZE := > +else > +# Don't let compiler generate memintrinsic calls in uninstrumented files > +# because they are instrumented. > CFLAGS_KASAN_NOSANITIZE := -fno-builtin > +endif > + > KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET) > > cc-param = $(call cc-option, -mllvm -$(1), $(call cc-option, --param $(1))) > -- > 2.39.2.637.g21b0678d19-goog > Reviewed-by: Andrey Konovalov Is it also safe to remove custom mem* definitions from arch/x86/include/asm/string_64.h now? https://elixir.bootlin.com/linux/v6.2-rc8/source/arch/x86/include/asm/string_64.h#L88