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 C9A39C64EC4 for ; Fri, 17 Feb 2023 13:10:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3BDE36B0072; Fri, 17 Feb 2023 08:10:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 346B96B0073; Fri, 17 Feb 2023 08:10:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E9EF6B0074; Fri, 17 Feb 2023 08:10:43 -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 0BEA56B0072 for ; Fri, 17 Feb 2023 08:10:43 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id C391D803AF for ; Fri, 17 Feb 2023 13:10:42 +0000 (UTC) X-FDA: 80476818324.15.9BF6B3D Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf16.hostedemail.com (Postfix) with ESMTP id 062FC18001C for ; Fri, 17 Feb 2023 13:10:40 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=dC0eKp2B; spf=pass (imf16.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676639441; 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=sIFlAqUfSEj1u08jK3w+qv2YAspHGSL2922Yed+agrA=; b=PwAzTlIdgJx0i5/kCfFsi5ypy0dFcqSCKAMfFbHibEeAn8LayCN24M76SNmjqmYZK1cKGo ZtAwU6VuJY3d8EVYyuhskaYSJDtcTc1W9Fyu1FCvPV3cPis89XkULWB7S8ZAGcTLdtn8v2 leKfCL5F5K9Nc4EYCyBUkF3NE63oQaI= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=dC0eKp2B; spf=pass (imf16.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676639441; a=rsa-sha256; cv=none; b=rFuXu+jTBnzKLj72ySlCwohgsvQpIjv2FmddAzsO2vfe0TY1BwQK81LDEv5iDw3tS+D1RY ZyiSO4GN+AKF+A/T5DqRHXj3sC4y7SIR0A6cAJnKW59PufWEO0YLfeQ4UUKabukP/44zPS EB8bFJf9x03HsIgdFcAKWGGnTIjWfXg= Received: by mail-pl1-f182.google.com with SMTP id f4so1376511plg.12 for ; Fri, 17 Feb 2023 05:10:40 -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=sIFlAqUfSEj1u08jK3w+qv2YAspHGSL2922Yed+agrA=; b=dC0eKp2BWvkVEGjSsfxVq2Kj1I5ANw72HvFPQV6u0K1jU4fjdVKr+HEc2yS9df18kf dwSzjgNNGGpPZbL1j7BEElKSckqzOzf1nAWpMPSe3KWBwmTHU8cpdj1yiBKz+iXdJkXL i5pX8K6EXhRT+jKdBj0iATVPhYFJgREvCoYvT7Xf9VoWnZhUtsQdZcIXi7d+IlEsZg08 S1q6qDDY4o5j34LDSWGs6HjSnDp0YfalKuuN5+SYcn3qA9xBP7nO2YL3/JIzvUDEHxWD CO4wm/O0L7brD8HvKNQ+2gycENysb2JjNYYuUdJtv3llkHUCQfKz8XmtuMF5pa19c4bU NWYg== 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=sIFlAqUfSEj1u08jK3w+qv2YAspHGSL2922Yed+agrA=; b=f6nVIS8q1J2IKruhs68AS8cyAhT9C+GFQ8UWy5p+B2TJVB06POS7oYctUU7jRk4cbE WIDMci2jKGc80gI3XvTfgGkw5Re+Co2mmw8ZEnOZx0j+7S1kAP3i1UjJi0W7g0RAYnIL d4FciVw3TkpDDmJwom9FglWNP6hvNZ1tm1m4jCIbs1NcXCjPQri1v5Ie/i7cpCiHcYW0 2Y9ULB6zF+bhUMtWKhnAZ4dYbDI1+piYP4UjehuZFPyHXu1TDbxYHBWuy6ICou3q22fi i50QBRwUhZjVH+3KKzdVQvUXWTRqPwU6x2LT7D30TCBDs4UQqf1Qr6aWu0eGKiOA7U5/ relw== X-Gm-Message-State: AO0yUKWD1iozFlE5GCcnu3eGG5SgrGuYiQoKLMDuBvg973Kr3igLnSDp /omcdgfzqCKNXTSBo3iL4PV0kKTDXZfEB6Ovd9E= X-Google-Smtp-Source: AK7set8LqHEC2iSU+ozWV+3LeFx1hIJa9bL71b7rZOWIfQWNP8Si5RJ5666R/xRB1CxdXIZDXRK/Cn+kildwsShx+1U= X-Received: by 2002:a17:90b:1f8f:b0:233:3c5a:b41b with SMTP id so15-20020a17090b1f8f00b002333c5ab41bmr1514654pjb.133.1676639439623; Fri, 17 Feb 2023 05:10:39 -0800 (PST) MIME-Version: 1.0 References: <20230216234522.3757369-1-elver@google.com> In-Reply-To: From: Andrey Konovalov Date: Fri, 17 Feb 2023 14:10:28 +0100 Message-ID: Subject: Re: [PATCH -tip v4 4/4] kasan, x86: Don't rename memintrinsics 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-Rspamd-Queue-Id: 062FC18001C X-Stat-Signature: gm1i5axoyyxjbceeyd9wcsr5n1ce85f6 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1676639440-140696 X-HE-Meta: U2FsdGVkX192BgnmdwQUq1kkbSQOVpEJMnlS9bhh7ItiY/xKvAR8J0BJBMhSzJEnZTzvEL2VAEzXVy1VQAu35wjJDcoR0QsaTmwCRI3wzFpE3GYhjNGYaqtOceoqyecRNsVZa+BhoWm+MOutWeXuEyLUrpEnSgGjVzqBEpZFX5faejTzgLYO86NbqlqqyRdUoY0DWE935GU9eKexeIJslRHSUwOOwsLUo9D0pVeih2S3wG2Gd801z2cDzLwtYcDs9eXqxGhGkeu+/zAEcveL8dktBAQnz3Co/eCz0gureTxtqztBk4iFZ57GrV/d846Q+du5l5wX7l/CCLVT3u74QCybO5gYoTKA20oR5qil+/kQG/RI3BME/IZaS78gy8QhVodRqijviubETlgeoqfHC0V2ah5M6nkpRGvneHhGZN3yCM720zrWef1VBwiQX1w+2T2VGFrDkpsZgXIhpkQDcCpWB+22j+D308FBKz0HDpUF2QB61qXmXO26VfhyUJ9Gkr53nD84xAG49Q22TEvl0mOA9dK+AtdhPXiUAyg85rYy5DkR8GblWGSjNcEu2toFtRRc9dwM+araUVM3LdkQwoWv1ECnHB1FfY+7alnkOtJz6FYem717OweR/1IDR1KmSyGaIezXNRT/QOtRAPAo3G18MkOGeckolxPRK7Jq3uKhM/zRypuYrbSu0kgfJw6cOT5gK/NxmuVwn4ZOWUkNGI4Gw08l4Rudrwd1fD06FH8jjx7ESgmChkYgMTznHlEFBDjhAVPrZNW4MLMu3yuOyxxWHpQ5If0gFZUERa1A5ba353LT+CyfFbrHdYj1PSswWtlF/ffrFppLeeT2cL+rb44doFQR87WqylSfK0DOT+/zUo+8s4o62n0vPLIhMRB0OaGFuEE1bu8Gh4XFbBcmc2pyV8L75r94PGkEk83eh6El2YNHMj81L1Z1/sBn9AFq5mWR7LGjvnowSX9dW3B sAi1j3sb 9z/otjew8Y1I0XiC+JwCE9ke+zBApcodFTD9l1Cz8AKXuJ5icBi/elPYQ7Grpl2SDKX/uyXPqDyZ1W3f8gji4O/0GJHukVR7AaC3uev2LxWImV5DPhHCKQAbDJ2R7q2p6FLAigpNYPr6sHhHtZVD4SIf+UtLWwMH527oQGmrIcgaFAsfOC4DlD4/dP+0JUDBk8GNBHu+q80EcHMuea0BemOYLrqUO7jfNJQzUEtAUYqIu7dzDs3ABQwnP7+T4P16PMzBel5LW8TD66Yd0Go2y1r5bGxxWkMGvHrTRPULNLRxWfawC3JeyoU1hRxLQJQKoVFW8rFCEEHfmDAmYM983nM437YmdkkiAVFP7rSKENEQygPOb2+Wmwx/qIH/BJ6C6OZqP28fN7X3i4Bng1JXmH84sXEDYg78LSX9V8tIcrv7K4KBznIyywTL8m9XvNCQzfxzOJtwcMAWMgjnL5wqt+Ul/i13Gis4H1evQE+Rx4dl8oXw= 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 1:53 PM Marco Elver wrote: > > Now that memcpy/memset/memmove are no longer overridden by KASAN, we can > just use the normal symbol names in uninstrumented files. > > Drop the preprocessor redefinitions. > > Fixes: 69d4c0d32186 ("entry, kasan, x86: Disallow overriding mem*() functions") > Signed-off-by: Marco Elver > --- > v4: > * New patch. > --- > arch/x86/include/asm/string_64.h | 19 ------------------- > 1 file changed, 19 deletions(-) > > diff --git a/arch/x86/include/asm/string_64.h b/arch/x86/include/asm/string_64.h > index 888731ccf1f6..c1e14cee0722 100644 > --- a/arch/x86/include/asm/string_64.h > +++ b/arch/x86/include/asm/string_64.h > @@ -85,25 +85,6 @@ char *strcpy(char *dest, const char *src); > char *strcat(char *dest, const char *src); > int strcmp(const char *cs, const char *ct); > > -#if (defined(CONFIG_KASAN) && !defined(__SANITIZE_ADDRESS__)) > -/* > - * For files that not instrumented (e.g. mm/slub.c) we > - * should use not instrumented version of mem* functions. > - */ > - > -#undef memcpy > -#define memcpy(dst, src, len) __memcpy(dst, src, len) > -#undef memmove > -#define memmove(dst, src, len) __memmove(dst, src, len) > -#undef memset > -#define memset(s, c, n) __memset(s, c, n) > - > -#ifndef __NO_FORTIFY > -#define __NO_FORTIFY /* FORTIFY_SOURCE uses __builtin_memcpy, etc. */ > -#endif > - > -#endif > - > #ifdef CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE > #define __HAVE_ARCH_MEMCPY_FLUSHCACHE 1 > void __memcpy_flushcache(void *dst, const void *src, size_t cnt); > -- > 2.39.2.637.g21b0678d19-goog > Reviewed-by: Andrey Konovalov Thank you, Marco!