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 86814C678D4 for ; Thu, 2 Mar 2023 11:14:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E604B6B0071; Thu, 2 Mar 2023 06:14:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DE8F16B0073; Thu, 2 Mar 2023 06:14:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C8A5F6B0078; Thu, 2 Mar 2023 06:14:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id B61E86B0071 for ; Thu, 2 Mar 2023 06:14:07 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 7B67CC0433 for ; Thu, 2 Mar 2023 11:14:07 +0000 (UTC) X-FDA: 80523698934.07.685403F Received: from mail-vs1-f45.google.com (mail-vs1-f45.google.com [209.85.217.45]) by imf19.hostedemail.com (Postfix) with ESMTP id C9E441A0012 for ; Thu, 2 Mar 2023 11:14:05 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=BGi2q0M3; spf=pass (imf19.hostedemail.com: domain of elver@google.com designates 209.85.217.45 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=1677755645; 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=zAvzWwN+/2QX88rMyJtxLyzDNIZ57vJV9SRYMAd7t2o=; b=hyHftk9csLEbE16WnK0N2JU39PgGrioarZTIIUSMWiOB3450XeLEiCs7k6lytG4/gGd6YW HpNtgv2xigQUmpzTyVlf7vpjqpDPd/aae2/gq4c0cUTeO0U1qVqBX0FaCpgGlqVNCWzTBA iDbj0kqxNiG+ZIuJ5EJPhpAVkfDob4k= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=BGi2q0M3; spf=pass (imf19.hostedemail.com: domain of elver@google.com designates 209.85.217.45 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=1677755645; a=rsa-sha256; cv=none; b=ddJy3Oo6V6gzPuY8MYaj5QxT5y4rJgq7plEmvlE7TQf1l3PFtEm36bnnJmkL0PpPxjWl+c cfO+RH6awMpC8iTIR4dHGUcxoJ7dECxFvwZDII+Y7PyzqqBpRcctuxnjebQVCKofiKv3xX DA/5n1vsb8u5x4TcIU1B2iETtWhlG54= Received: by mail-vs1-f45.google.com with SMTP id f31so22121227vsv.1 for ; Thu, 02 Mar 2023 03:14:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.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=zAvzWwN+/2QX88rMyJtxLyzDNIZ57vJV9SRYMAd7t2o=; b=BGi2q0M3pQsp3P3WersOoyDXsJStcmtz+k5/jVmmLRuDUMvGGFq2LDS/TfwEwx9/Sc /9CglYjDfSOqxZj851kObQnWeyg+4aXpNz5GslfGq7N2qWUduKLNhREXHc31k7nW7UwC BFO3NXyl8trKTo6kcgu8CeHWXUiHfHZN4sRPi10dNnsqXm4VVcya4MRZcGGjqsvRGvTa S5N7qlicPeph9b47V4s+0MWoZDG24SrnrQ988wFilBuQaNARtpgjhL/dSC93PouxFkO2 /VsWdKWgECr11t2rvecrvoZdRY9bnQA/IlZPKwq5kYH82UpoAU1vZR6D2J52OUHG383T MzbA== 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=zAvzWwN+/2QX88rMyJtxLyzDNIZ57vJV9SRYMAd7t2o=; b=EltyW0XxXwhz/kawLj8Wmv87622HI8pdWiMdclKnL3y5ZcbGHUGPE/UH79FVQkmW+2 h0Z6dLL9/s0vw139cqqsLPX7dyVuzMIrmtsB5wdIYABiE6qCfDs/bRtqgyKohGo3pmGE 5iCSouU0ICSCFJEGtKM5BzK3MoLRd2m3HfHDbYCAtbRBMNcg+9I0XeW5HwJCnLfmyF2d U4eiFludYAyNNxxQS6z+MDBuupPhxNdM8m6hg0tWg2609WGwzdTsBgmGjadHIlX1LHRF ebP/Mf5Jroyh7UALAnssacjGh/FhmT+w2eidiFFUcAgNuBl2Lfh2o21EssfVqNm9ZrCU 01ww== X-Gm-Message-State: AO0yUKX6yJ+A+B46yAfq3H0buIJ9GEygOpsSgJnQRwrspaiphOSBkJvT nKlaAPxrU9CWekqIRV/BT6iRdGPQ2iPKTWAyhqVq2Q== X-Google-Smtp-Source: AK7set9Hu0kf0ZyhwGcskogvHsCUbxn/OdsfErH/TtpN8lai7RAv9kPElZ9zp70cZIRWF8ix0H8+23FkRAol2ihBINc= X-Received: by 2002:a67:f311:0:b0:402:9b84:1be2 with SMTP id p17-20020a67f311000000b004029b841be2mr6391648vsf.4.1677755644783; Thu, 02 Mar 2023 03:14:04 -0800 (PST) MIME-Version: 1.0 References: <20230301143933.2374658-1-glider@google.com> In-Reply-To: <20230301143933.2374658-1-glider@google.com> From: Marco Elver Date: Thu, 2 Mar 2023 12:13:28 +0100 Message-ID: Subject: Re: [PATCH 1/4] x86: kmsan: Don't rename memintrinsics in uninstrumented files To: Alexander Potapenko Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, dave.hansen@linux.intel.com, hpa@zytor.com, akpm@linux-foundation.org, dvyukov@google.com, nathan@kernel.org, ndesaulniers@google.com, kasan-dev@googlegroups.com, Kees Cook Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: C9E441A0012 X-Stat-Signature: szgmfrmtpu4tdjc6q6tym13zt617dwxc X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1677755645-848599 X-HE-Meta: U2FsdGVkX1+oSHk0YAuoHey2nf5TDnWwA1Gp6HBzokh5fI6jieHzwIH7bcC2TDT48VZZ4h08QTbC1qzQqjggMe5+H8tsnUXn42/T2QgPbWfqoDOwpgeyB/tL5EG+K7/t5Zvvd3MUDSP713N/l5PFrG0uJdxDgIayNuxRgd2Qoa//hT3BWV8gejkVLagh3rPfBw/K0oOPca+U5OD5pf92WiIkDLrW/OCekqXKDdO1ebnZYLcLR+U2Rv23O6Bo6WLYsjuBLZGJvFaYi/ZotUnyrvtxFoAq14bjivzdQaVq7IuMwjW486GBnXjxh091GUvy7m1+weztVE//IU8RyRIMevThFgE/7AYDlIs5in9k47yFoakGFHj+erotj2EPZKOV/4mphR7uhFpeCC+2FB2J9AFFPs3e8Re48/vuXSz5GHUDQywwvUukdjgjH/0OQDf7BKeJwjoszQ2bgJfhw/jZ7ru122pZHkHngJrxDkyz0gg7c/1rtetTvdwvRa+KIdUnhj3xq9ZM7lpk5vPYjl8iKmDQT62ens3yI6Gsbh6ti9a+3D9C2aYCVuxIMI3aGigR3ni7NG11e/3OyN/teXt+BDPTVHkyzmIOfHfWpaGnDZwSRliDr+UOBKueIREeWaZL6jJCCB0K8PhhupnOGbM1vR8n9+pT5BeX+ZgnMdOF1LXDemnVttXI6VLGExpYR2alXsKFX8wZPOjOdscSLySYdNFhvBgtE1Tc6onvD2pCywwAgn175oBtDuxd6SWSYUInBYYTn7m9f51ncfCmr2kmFYxd239FmTSjPDedyNGUGIqNHsx+/KXB6uUhIdbR+jVneAjSDuo60WMnztYHweobP6Fy8Yw5rEycnndPDDJ2W8bsCt/f1R3BOpO9023fTH9E8pt0XrKz4k97OXbw5rGk6UTAFIG2T7g291cHgF2dpOC6hpiuqwtbWuk+z8N5GENIWY1iSls0ndXFugbgP5N dWh9sJiL fAYPIec3kzf08RbdxNxyDJdlawXdmvEr8QfXz0ZSLLrM3iG4F4KDnIUE2dibqF66JYZkofe3IEqF3SzKXNS1540ZDYgQSfCCbl/Cj62WLQoa4zpd5SGasY3KWrqhW0oV6Y/kA9hhi6JbqOaPOVvsLMt/8Ne/TbG8nDqy4bwytjNnIkIE0DRlZJ3Bolp3NRxaLGBot8Cmj//llieFI01cViPla6vi9jx61H7s0XVLr5iAQPxDJcrmjIxEAPXsN5BHVyCeQpwXrY539mxoKKerP2qFceKInZcYLU08rOhNPRl/E0cEaBeNK627ty//z1T3R8J+i6TQwE/Yr7Hg= 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 Wed, 1 Mar 2023 at 15:39, Alexander Potapenko wrote: > > KMSAN should be overriding calls to memset/memcpy/memmove and their You mean that the compiler will override calls? All supported compilers that have fsanitize=kernel-memory replace memintrinsics with __msan_mem*() calls, right? > __builtin_ versions in instrumented files, so there is no need to > override them. In non-instrumented versions we are now required to > leave memset() and friends intact, so we cannot replace them with > __msan_XXX() functions. > > Cc: Kees Cook > Suggested-by: Marco Elver > Signed-off-by: Alexander Potapenko Other than that, Reviewed-by: Marco Elver > --- > arch/x86/include/asm/string_64.h | 17 ----------------- > 1 file changed, 17 deletions(-) > > diff --git a/arch/x86/include/asm/string_64.h b/arch/x86/include/asm/string_64.h > index 888731ccf1f67..9be401d971a99 100644 > --- a/arch/x86/include/asm/string_64.h > +++ b/arch/x86/include/asm/string_64.h > @@ -15,22 +15,11 @@ > #endif > > #define __HAVE_ARCH_MEMCPY 1 > -#if defined(__SANITIZE_MEMORY__) && defined(__NO_FORTIFY) > -#undef memcpy > -#define memcpy __msan_memcpy > -#else > extern void *memcpy(void *to, const void *from, size_t len); > -#endif > extern void *__memcpy(void *to, const void *from, size_t len); > > #define __HAVE_ARCH_MEMSET > -#if defined(__SANITIZE_MEMORY__) && defined(__NO_FORTIFY) > -extern void *__msan_memset(void *s, int c, size_t n); > -#undef memset > -#define memset __msan_memset > -#else > void *memset(void *s, int c, size_t n); > -#endif > void *__memset(void *s, int c, size_t n); > > #define __HAVE_ARCH_MEMSET16 > @@ -70,13 +59,7 @@ static inline void *memset64(uint64_t *s, uint64_t v, size_t n) > } > > #define __HAVE_ARCH_MEMMOVE > -#if defined(__SANITIZE_MEMORY__) && defined(__NO_FORTIFY) > -#undef memmove > -void *__msan_memmove(void *dest, const void *src, size_t len); > -#define memmove __msan_memmove > -#else > void *memmove(void *dest, const void *src, size_t count); > -#endif > void *__memmove(void *dest, const void *src, size_t count); > > int memcmp(const void *cs, const void *ct, size_t count); > -- > 2.39.2.722.g9855ee24e9-goog >