From patchwork Fri Feb 17 12:53:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Elver X-Patchwork-Id: 13144665 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 54F0CC636D4 for ; Fri, 17 Feb 2023 12:53:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C2EE26B0072; Fri, 17 Feb 2023 07:53:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BB8656B0073; Fri, 17 Feb 2023 07:53:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A59636B0074; Fri, 17 Feb 2023 07:53:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 9233E6B0072 for ; Fri, 17 Feb 2023 07:53:21 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5F0EE4076A for ; Fri, 17 Feb 2023 12:53:21 +0000 (UTC) X-FDA: 80476774602.02.8550D29 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by imf13.hostedemail.com (Postfix) with ESMTP id 832AC2000A for ; Fri, 17 Feb 2023 12:53:19 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=BVGRp9vY; spf=pass (imf13.hostedemail.com: domain of elver@google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=elver@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676638399; 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=Ulgx+po/trB+4FXQcLmj6nxw3N0m6LL1KXnQpc+SYhI=; b=NFjCc58Uj0TFy8YDoXvjwyaqtUCG2LwlSpQyCW6TjZ6cwCdgDqzB1VMAc4RW8GwsJU1zE+ 1bb0qiAqXLQn3r5zxRT0EbjLgbZNSSjzi5sGK3xjmENMdNz1VwEu6cpFdmINU5hDJexubj cZ+/ehRxpNo8Ow6OqrF75kjqjgc2OwE= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=BVGRp9vY; spf=pass (imf13.hostedemail.com: domain of elver@google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=elver@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676638399; a=rsa-sha256; cv=none; b=w9zvoPIVWPiL9qmXb3twR52LQ8JzQ6I92dINMRStm6Co0AxjB6QPc47PT30Dt/DqIBKJIE fgHtovCg8tBMeR7/FuwWPcC/Oct65pHkM/z8tnE0GiafZ37FGSKtp4InYX8k/NePjkeaO1 /3tdciZrxmtbgl2DzUCNl+nZpowiEkw= Received: by mail-wr1-f46.google.com with SMTP id ba10so549301wrb.11 for ; Fri, 17 Feb 2023 04:53:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=Ulgx+po/trB+4FXQcLmj6nxw3N0m6LL1KXnQpc+SYhI=; b=BVGRp9vYDHaCoxsJwjIYvbuDVbtvx0mVDEmbX2XZy1ny1uCuSjxjVE1KzSyOk3rj68 k44oJEa1DPZ4PRmT7xT/Q0u4DRT2JSJ/yo8S1a7AaMmYCvBjLHcX2R10GNIz6orDQOsX caM8QvKnausu95V3Nykyrl6B1e4AjbF2MdOKqNLT54r0MUW5HnpnlqBmXGnGzka3U4KQ G+4xM3Mi9Rkg+zl7MNlhU3uRT5nCpv8Ej9bPU+mSGdU2obiShaU/RgpDqwmiPx6rPtwe npy5gWb5Kq7NBI0JHLXVs3DeTqD9M+5UWblWrMSfPkrJk1MR6fQPP9yWt51aSkt66MPZ QKHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ulgx+po/trB+4FXQcLmj6nxw3N0m6LL1KXnQpc+SYhI=; b=1KNEv2reFzxS5y/bEjcfydKX3IhzbmIvvJhifwva9XmETE3rDIgxXpM4+foUtxory6 R/TPKd+/bTZOOzobuIqyCKELfH2pZrPXxEh4Fq88MigK113vBwVonmUAuRlPMGoBs62o QYSxzoHhUuvsEyFybJw9fzBpVspHnDhThZIbOzABMCNK89InqCAsJcUZJtQbdZZeilKE RmPn2G+c9Fw8BTSdRkA9Z+jIG+P3ROQFkTelkREUUvp1rQDGbBMnChVtY6ex63S7RP5w BLg3/RMmRBTQngGzMTfoHxPi4OhNbwvAdfdNlup7idvV8yB96iyHbKDEcx+jlgUBV6r7 omzg== X-Gm-Message-State: AO0yUKXdio6qdk5EvUiBEZjw2tgKuoasx5jpUbiILoTfWN0wxL2qY/wp pOMdPi7qC5OeCQbaT3JYhUnFsw== X-Google-Smtp-Source: AK7set8a/gyHg3t36Zyr4mxRFV/aOKMOB5cnYYED79FZtuRdCJQaJGG18Ti/CRRpve9Jdk6dcbhgQA== X-Received: by 2002:adf:fb92:0:b0:2c5:5933:1752 with SMTP id a18-20020adffb92000000b002c559331752mr700692wrr.52.1676638397783; Fri, 17 Feb 2023 04:53:17 -0800 (PST) Received: from elver.google.com ([2a00:79e0:9c:201:34a3:b9c:4ef:ef85]) by smtp.gmail.com with ESMTPSA id s17-20020a5d4251000000b002c6e8cb612fsm1050348wrr.92.2023.02.17.04.53.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 04:53:17 -0800 (PST) Date: Fri, 17 Feb 2023 13:53:10 +0100 From: Marco Elver To: Peter Zijlstra Cc: Ingo Molnar , Jakub Jelinek , linux-toolchains@vger.kernel.org, Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , 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 Subject: [PATCH -tip v4 4/4] kasan, x86: Don't rename memintrinsics in uninstrumented files Message-ID: References: <20230216234522.3757369-1-elver@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230216234522.3757369-1-elver@google.com> User-Agent: Mutt/2.2.9 (2022-11-12) X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 832AC2000A X-Rspam-User: X-Stat-Signature: 1iut6b4durz767hodj7rcnseh5d8qng6 X-HE-Tag: 1676638399-217169 X-HE-Meta: U2FsdGVkX1+NLMk596PZ4USRKbdbVYUVW5uNG3i8+WdO4AQQTCxnZRZcCDZgrYj/rulJ3+B3OpOxMVDDsTbl3KB+HfRLtpvTq9RoVAhchqXdOxOdLCJrMxLC4sZC/zN5Rty23Ix+IhwzxKKEkgdg5VeCpl2SlH+CG6JG5YgDFSG1EXeXRarfjA6KHLyi3Qm2VA1nNu9tmDi9kUkEC+1CicvwfJZVfF0HqWkxTrA5kD1a410GcTq92AXaFaFoQEycwPldFMFDFvc+kEIGKUT4G+lp0gGHD8JFbnNj3ZDumUmzSP8DTNAMjfpbTEAdjSgFErDKOjv9iIBtJFGxFRIJGwcT0y1HeSQVbabnrwVNHVjrNLuUS8Wmq/xf+zfwdR3Cw1Q6dCkuZsSUFh/feOtQOncVZftjH1h5K5D68i8vHFCr0Rj93emrUsg/L0PyqsYnKIaioozu7SrHSRCYevIwoS9lPRtc4PElh59lpE9hrJUubJBmC7swU4tfT+256ixSoMjfsFD6+Py4ueq/SoVXjo61AQ3uyXEfhgnb4KOngr5w62GK0OZ+PsRNIcGik+Zy5WcPa+IEox7ltpN06mU4l4gU2FUy24U2TWaAAT43FLFaH5L7lnC67q6HfADC7M67r/EsvQncL0Pb9ZuviAl2eYG0kRMuM3Lzu9/HcG2SX6Q642Ao1ahxRCsoyi22V9G15K/Aai9o1mEXkgIW8s9aTpjxzER1WMYtsHwOZ3Tu6CSMtkNMrLscpZwRzl26Q2arA0m2Mu6tMaRwiqTS1JpZHY6gTk3kAJMgndbQvmQwPDc5HR80kRMf3uluZvOkK9pmKPegO/j/1dvgp5HuTpoUjtqLPz6Vammgh99p4ISql7eSpOf9iGMVPQd0qyNoZO8XpkyunTtGG5TyaW/BTlQyRyaPZd3KHXPjDPhorJzco3T35OHi9xxHMuKCCJXa0WEbyz8oN0UY+47prRQKChw WXPHpMOf qDNBFl06bbvzS4BulAhd5H7s86uxiD+G5m8yxO/dbiDeiMnt5YLqoLEJPd8loZG4QdxeQ3hJ6jjQMcFKzCS8vhZGleVOszWz/51h61bbHJuq2l/ax2Xp16IycqlcpILPXDkx4M5P/puUZhjFBBfxAUKefVQ9+vuMdJy/CK8Blawh0mUgGWLNxx4+t3tfCj4XVflb+FKugckkO3FzgvM5tsEppOpRyCavrs2Fq1jbOkFIxZwL55vOjsuaRRt6XX/dzHcj4eqadwAth6AuSO+xgf1xsVyu+F/cruIk3aqfNcD0NR01/195BsKyxbMBzohq3mJrh0s/I9HFEKZQ1gX2h+BCPMMe7IDeXSdDQa64XHT5UgceNjSfJlUkiA0wQgfRcMhbtdV1nOqVnCfcQ6T4vjzXLE4PMgkOm76HtfHnAnbff5zV0pyF7S+Rjf48As5t+xVxzz0CPKx/nDrvXZHvSCUTGaA== 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: 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 Reviewed-by: Andrey Konovalov --- 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);