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 A7BFAC64ED6 for ; Wed, 1 Mar 2023 14:39:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 334B96B0073; Wed, 1 Mar 2023 09:39:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2E4FB6B0074; Wed, 1 Mar 2023 09:39:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1AE556B0075; Wed, 1 Mar 2023 09:39:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 0C8F46B0073 for ; Wed, 1 Mar 2023 09:39:42 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id CEBB01A07C4 for ; Wed, 1 Mar 2023 14:39:41 +0000 (UTC) X-FDA: 80520588162.20.51B905D Received: from mail-ed1-f73.google.com (mail-ed1-f73.google.com [209.85.208.73]) by imf03.hostedemail.com (Postfix) with ESMTP id 185D720015 for ; Wed, 1 Mar 2023 14:39:38 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=hwwsMSyO; spf=pass (imf03.hostedemail.com: domain of 3qWP_YwYKCJQ49612F4CC492.0CA96BIL-AA8Jy08.CF4@flex--glider.bounces.google.com designates 209.85.208.73 as permitted sender) smtp.mailfrom=3qWP_YwYKCJQ49612F4CC492.0CA96BIL-AA8Jy08.CF4@flex--glider.bounces.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=1677681579; 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: references:dkim-signature; bh=JhZ8SEDoNzl+E2htjsUuUTMZqyHgHOmh7ac72ddETYs=; b=gP9MJ5nvJFqgs6fhIgOdmVsXfkUxFWOugZRw0cp62+MJJCi3mBxoiLK8aQl+OezKDMKlmb 9EgXVw+fc0+j6dR3dv3zrAG/rpGTPA0JOBq12UUnHR7fYOiJIgLbLOtyHpt/qVo0hr/V7e lnZyvDACptPnJxiAjG3YrV2dpJ/mY14= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=hwwsMSyO; spf=pass (imf03.hostedemail.com: domain of 3qWP_YwYKCJQ49612F4CC492.0CA96BIL-AA8Jy08.CF4@flex--glider.bounces.google.com designates 209.85.208.73 as permitted sender) smtp.mailfrom=3qWP_YwYKCJQ49612F4CC492.0CA96BIL-AA8Jy08.CF4@flex--glider.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677681579; a=rsa-sha256; cv=none; b=10JrzKOm3CLBPFq4qKIYx5abd6N0ccQ1wgnRA6UgPTzAomE1Hhl94wjAlic9v/lUZwN66I 09k34xJB3GUILJ8fJC91cYX0knyWJAvqSnvnY2tAQ7nqwAm6Tb6QTBA7WZX6ZGY3iAsz41 Mq9J2RkO4CMSSJU79CibabPy6tb2LrI= Received: by mail-ed1-f73.google.com with SMTP id q13-20020a5085cd000000b004af50de0bcfso19760228edh.15 for ; Wed, 01 Mar 2023 06:39:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=JhZ8SEDoNzl+E2htjsUuUTMZqyHgHOmh7ac72ddETYs=; b=hwwsMSyOzkoBWayzQKOdFKIZfN+8rn6K+uZRqXexu7jTOCYjQq9ACST/vXXGgUa8CT 9PbkYANDhENEWpCTAac5mNG7ZIAElA8E4TlfoSG2z+sTpCuZtWZwUNcme6Nz5ZOi8bmI WuyGwo5xiOk2ylqXeLH4a6J07LtGg7Ap91k/9Mcx8NUjgjoD00YVOtKBU9sHuoMA8yE3 Onih1jNZmnQe2nEJA1yFuRFt5+jQMY1R2GMyNKX1qCR4BhaJrAA/7d3oi5VEphgCi5fm cZRBWCikluD1F4OG5qcDUFzHLUwgyg0Swg3+bo7tCkfOYvarkHR+O8quNjT/Nzoz7/3D eJkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=JhZ8SEDoNzl+E2htjsUuUTMZqyHgHOmh7ac72ddETYs=; b=Qrk9VE5kfCWHcaC8Uf2TIfw8cxWGExIFitCnSJRnUiU8xUL1VzLKURkaolLkVpiyBy JzLEKuwi+ErKunG/tuW0UMUEsvZNDIxVpOMEOd52NsZjlgnSZzu7NRmvVWusfeT6q48V Y8gN5KD467b0ZlErEzcmSNv+bOE4LUdyXjnq/tXiGUDAE/VjQif9MQt5PXWpzd4c0Svd qQEqYYgRRHG+6e3rCRWIBNYrovIeLZJNRA3hiOKy3uqqrNOp/gu/kyle1n6Y8G83oPQw 7KJnKthQMhrUNnsR0WW6pnLqMtYIx3wActUrD+H9oncN+pO1FxIUnQNVC0ZpbL8EAFah qpUg== X-Gm-Message-State: AO0yUKWCQ70wE2bLb5YHpUBbWcph02v2Xpvnsr8M0joBczHs1gomGVA/ 38kVojaXj8zi1jmgaI+xMx+vqi1Rb6g= X-Google-Smtp-Source: AK7set/soLRTnmi/Q6cCoxB5T4A5ekmdZ3mGiPUd6HKEr7VaR2a3N3ZNKHKp69dd1Rxd9h+HwywF0ggPLBQ= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:3c31:b0cf:1498:e916]) (user=glider job=sendgmr) by 2002:a17:907:9491:b0:8ee:babc:d3f8 with SMTP id dm17-20020a170907949100b008eebabcd3f8mr5683794ejc.3.1677681577396; Wed, 01 Mar 2023 06:39:37 -0800 (PST) Date: Wed, 1 Mar 2023 15:39:30 +0100 Mime-Version: 1.0 X-Mailer: git-send-email 2.39.2.722.g9855ee24e9-goog Message-ID: <20230301143933.2374658-1-glider@google.com> Subject: [PATCH 1/4] x86: kmsan: Don't rename memintrinsics in uninstrumented files From: Alexander Potapenko To: glider@google.com 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, elver@google.com, 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: 185D720015 X-Stat-Signature: k3eggixxqjqxzfjpjgdjiztkwyhid7io X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1677681578-905608 X-HE-Meta: U2FsdGVkX1/eFzZNdePJOwHgMPyus+1F+G8BrgG4Qc/JG/Ug9ScPtrD3iiCfI3KzlK5284ymTuOcWMJOXQMEJsK3f8NzMPZI3HRP4LT/e/EQ57zFDIUy57x3eh/IYaqtGn2DyeGx78Rzux3TLKhkPD1wRUqsUSr5sptgmYiCKme0mpc4hjgqJKjsseCdFbf9+GN0B5uPe90Gpke21/54rHR+SugdPFr0cO8imbpdEoWTB+1Em8XlDuw8Q7dbI9/ob355K89RlNhdgdcYRyfrItC+iG8eU9vbcm8wSRe6+wdDBqApSY351sM3l7MwxFWjzUdM1pxMp61TTaYJGcewRoMjL7+p8GVVMTc9Lu+3LmR7t9tUOVEhdJwRuMrkSGroM50LQ9tvzi4xo4JOp53Mr+HTdODEeZqRJQYM4T81WsbWaiTpXvQfo754/1Frf0oUtkRilMQQiHwDraTy8WFAvHPgeD6iuTtaRUuh4n3pIU6iU1lnbi0uefug/h98dzXP1+rjD5RUpHqWde6PRxUm49eLf5LJjIEPQ4x5z3rUwXXxe6irXHse/1FUHzIZUsuEmB+H2T6dE58TwlERr0NisqcrlBwEFoN/W10xLMarISr3HThnXuQd5+JhP9P7gocPRAX6N3JAjl8unCTPFMb4K+tzBbljw0StuGw/07CKZmqXj9uiz1vaEAaUZiLMq5ywTRyPRhZwUCkK0aBl8ReAMbrjuZphKyae82D2EQGr3w0yyW8W/q0eLK1Pxjdmc7YOUujOVgCqYvhcoGI/GyKWSD+WPBLuZHDAWa42ra1McG8BKjG6PFBvuHMc4qfUUXny1NC6H9SIPnZZsobzNeBivbSslb56NnmaFzh5PsXEV5BMWAwaTKrL9hkd6iIAPH3ylklWXtUAtkaXjs4ZquZxX05F9+XTsnUipBXTX6QlA3GprQWZHJ3tAksVVkMePhEAFXPrLiGjEAjCtE1tSdd UxojVlC0 pJ7KLEwQToesrr3Yekni+q8ARQKxSUbOQkU+KW0zSvY7fmSrzz3cbvEkVcirtaRwbqmD9f05CtLAy4eNbkGBS2S/60EHd4bysmsHdNjcGNhaFBoRCxnktpP4oStQ4VsLd5fkfGnYYbxGHRmkZg9sP8G+wUuIVoZwMuz+rM9Lh33M4UyPrMK4dy6tJRIm2Mla+dydf31m2OMPVjH/00Fef6t++2rAxyKPfGgYo1IF+LBrINdWV/tdp5FR8ppbPuXQbf6+DWXm2n3a5g97vJxIQx+m0Jk0lZANfJ6oiq4ZapsX1Fzgf5rr6mueLT2moJa1pDvZ/vCClvV/QrsNvpRkmlKFd6GY7dKmHIRNcRIZajWDYPB8Ua/729cHzdv3iLCtNXAcWXfHIvj7knhUgjgz7w+pEHlb6Hj6SItiuiFntOWGLHPVMhqn3LE5dw0lteys08SutfzznpatRcYbFHM2ghWv2tsHUuWreA94WezEMcC18ZDev/MEnAjD7sW/tybRB+0U4cw1pjUKX0q+z/6ov5NhGgD2S9+YaETh4S7Hkh5MP0EaY8m4b3qpMa6mkrxBC/dEVeDyppoENRid8FevyUoEXVpAmNhWvtp9yM+DuYZIYCCJlCDcSlx5XNaU96FQ/lcAdSiQcW5CRQaK8bvFllHonUVNcsR/OK+nfCBeT/+iTxqwyIiDnaOj0/g== 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: KMSAN should be overriding calls to memset/memcpy/memmove and their __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 --- 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