From patchwork Fri Mar 3 14:14:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 13158846 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 40407C64EC4 for ; Fri, 3 Mar 2023 14:14:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C6C9E6B0074; Fri, 3 Mar 2023 09:14:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C1E596B0075; Fri, 3 Mar 2023 09:14:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B0BB06B0078; Fri, 3 Mar 2023 09:14:43 -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 A1B0F6B0074 for ; Fri, 3 Mar 2023 09:14:43 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 61A9A408DA for ; Fri, 3 Mar 2023 14:14:43 +0000 (UTC) X-FDA: 80527782846.19.3AD0F47 Received: from mail-ed1-f73.google.com (mail-ed1-f73.google.com [209.85.208.73]) by imf02.hostedemail.com (Postfix) with ESMTP id 8DF8F80016 for ; Fri, 3 Mar 2023 14:14:41 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=hMY2yJzs; spf=pass (imf02.hostedemail.com: domain of 3zwACZAYKCP4mrojkxmuumrk.iusrot03-ssq1giq.uxm@flex--glider.bounces.google.com designates 209.85.208.73 as permitted sender) smtp.mailfrom=3zwACZAYKCP4mrojkxmuumrk.iusrot03-ssq1giq.uxm@flex--glider.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677852881; a=rsa-sha256; cv=none; b=eFQtSmYn65ZdLBLQ2t4h0Pzdhv086MPEFY0Wp5KEfkkEAKhcZlL6hh+CxDf6W/UlGDEoFt C4etSswwcGBmzzBhJ1Zm+8PwTDc1IZxIjFC3E5rezJGxMiXgrg+HwtwwETs/woW/OFECjP gkWHnbIdul2goaUL/YsKtQPspuQ+m2s= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=hMY2yJzs; spf=pass (imf02.hostedemail.com: domain of 3zwACZAYKCP4mrojkxmuumrk.iusrot03-ssq1giq.uxm@flex--glider.bounces.google.com designates 209.85.208.73 as permitted sender) smtp.mailfrom=3zwACZAYKCP4mrojkxmuumrk.iusrot03-ssq1giq.uxm@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=1677852881; 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=2N/CPy1IFmLQesHjkxJB5VDmlDO65TUQOL9xC78XNWQ=; b=j7e9vAyNK4tvKMfuz4zcyocuo27XksJSZ0zDj9CKkFW3x+41KM3LvcYbPOIUDFncAX/+2g HulYXA+YrMGeMPrNRwO0cJbDWueDd+vfxIkcLDzyeUE5hXIup/Y9qhbGtdOEsrHtTmcL1e vRnhT9ouGl3PUSJ9x1rTMX/n4SmFqEc= Received: by mail-ed1-f73.google.com with SMTP id t9-20020a056402524900b004af59c073abso4181457edd.6 for ; Fri, 03 Mar 2023 06:14:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1677852880; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=2N/CPy1IFmLQesHjkxJB5VDmlDO65TUQOL9xC78XNWQ=; b=hMY2yJzsPf2YWJ9SnaLFMvgZa7mnCcGkPNLMoITa/8FWMXegqQl7kIJo/qWbFtv42K JUF3gcDP0cfK67S+1mdFC2TbAWAnhoc3q+tRpdXFcLyhBGTf0Opvr/qYA8Z6Oj+oe1PO azhktU12eLJhoB1eKldndx4jeQwB0Xkm5Yro83Pn9TkvQpP34l1jQU1wvOMFDuojTwoy nr3zYZv12m4lPIMp4NLUZBH3EtP7QEL/MlNPFBicPOgSwAROS0En6PD9ETZi/dZ8EYZt S93zuhDgiY/Zn126O3o8Vab4eMVHJMeE2Mpw/mURlt/0t2gHwSJCXA5K1fqYu1PAdxYy lHZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677852880; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=2N/CPy1IFmLQesHjkxJB5VDmlDO65TUQOL9xC78XNWQ=; b=wE54duVG8PtUNetYMvjxtecXoJw3DinaopPcq+E1oyl0aRhWMTYx/VrIg35hZUwGjb fVqxAO8VHxXm3RPghwL/cJ5em1Qoi+BveZM/7dgDzxPbbG87DwkxYX9yiTceBfZD+CY3 Gset+G34b2F9K9EAxlpahU94vlxWGmRq1IQLc6ExdsWeDDpoqMHauo+PWRMOE4FqmrrN zIonodyJa4ZFeaQUlMMTs+TDzQ86s8vvUkrXqSUJIx+XJSgwRHfcKoVMwKf0RpP3hfJY 0vpHBeA82EYhjTxTbFm3IFyzz0U1kl9cikFFoGfZr0ugvgFSi/H3xbNFylewC07Ai3Vd LQow== X-Gm-Message-State: AO0yUKU9a3fdlU+nWnur8lpyugus7ioqIz3B9jBUV1MBNbGb6yT5PMYt PQyXld+cZBZX/N5ZZ7vul9spB4O0Y7Q= X-Google-Smtp-Source: AK7set/QK/eNvPtl5qmRXYLEBXFksBQrVDShOV/MqLWGsB02mS/d8mUxfHAqI+8j0Y0o6fWedP51UKjMacs= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:f11e:2fac:5069:a04d]) (user=glider job=sendgmr) by 2002:a50:ab1e:0:b0:4ab:4933:225b with SMTP id s30-20020a50ab1e000000b004ab4933225bmr1157914edc.6.1677852879922; Fri, 03 Mar 2023 06:14:39 -0800 (PST) Date: Fri, 3 Mar 2023 15:14:30 +0100 Mime-Version: 1.0 X-Mailer: git-send-email 2.40.0.rc0.216.gc4246ad0f0-goog Message-ID: <20230303141433.3422671-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 X-Rspam-User: X-Rspamd-Queue-Id: 8DF8F80016 X-Rspamd-Server: rspam01 X-Stat-Signature: y3tqhue7igsxrid3ktgydd6uusswjpky X-HE-Tag: 1677852881-825806 X-HE-Meta: U2FsdGVkX19sWXms9gR9igAVfKxhnUD1uh8QgeCGL5+KON+bck9RiLcmOipy4IASa2/dzwpqWGxLLA6PP3azHMOBVUcL8OSdfqYcPmMMUCA2+22g2ovvcSpR3o9VbbcRicANRFs5blO1Hkvmm2LyZRYnutfqW5Iu4RV4+Iy6OTF8IKxJMjxjIj9XcWpoZQ7fUnmH8qyg6g5grggrxfo9yIpxuQwiFHd38T3mxfSJhP4StPzKyWZ3NtCdybGcxu5S+1mPutHddx3ffrhU/yTQK9F8C7KbOdhWBrIbHrW/W/kbw6SnSjWsvUkoNu/DQnkQAMv5PBrDFUbC/Ds+DQyR7CnnLu+s/7+4WlsKaIsenBfawl62/cyt4VMWe25mi+WyR8VEB5n0Ofq1WUVNrC26hSrO4EjGD42XxwNpNlzeBxhxVDveOnj0F57Y9J76J/Cr0kjzJoeVFRn6W/S2A+5qtpCzMZtThpIW032mZX1+F0rxD7w847UH3zgP6QFE7mYvc9KSGtRyCwnYrK9n9cPiLnUkPskwVIW7gGoVGSYDn8KwmyMeRWxU/VQkFE4AsKjCZlqpCnY8VIwNu0ORfIEmmpK1kH4pyMazPtHLN4zZzlq3hgsizY6Kkgay0HpdXYBygElnPe6ETZvZDfoz/OdSyYjf1o+KIce4wdPptG4QeZqO0enZrVjCh+TXJSkvCLR3kiztCu2rN4VcxGyNvBotGRdILmon0mW+ciEEx1/Hbc3eeHevDMbdhEdMqNBkVflErStaXt2a1W/qHtGnAk8wtZZEC2dhi+13O/cNJOdwuHClFyRB1jbVov6DFXcBOu6JZTYVQebL4mBjo7B/nO5nGBrpG+TlaEFSKuYM63soQgAV2ve7mo843QflY4FoxtSxHGeNkCuNsh3EpmOlS4A1BT2MarLRkDlXWtnM3r2C8X6FSA/fF65MwJ+88duP92T3Vd1pmKkf3DWQ72bZTBe LR243cf0 7FkO0q8TSjrOus+LNAVckGYcLWv/Q5GLrh86i+eLQkUdZrmPCxbRpq422aJL9vlDv8NcoEV623S1G2pzjZwh5Lp9icKSWh1rBY0oFU39oDpw9T6qvURc7IVyhG60B6xbsuCqoKe6idAgzC8V1CRzxDrwT3xRh1PBf0K9ldDW53RE9Sh1ozyy77TFpZ9MuYO99WUNvjI3UmJWwRXTz4xPRxhfrzOilEPOk+Z93rTDOodFXC0HDTTbymzKEq2orCPx90TJiXqAM1AnSkXGkTHg/A3xNN9C1x/qyADmrn5uN7gqAzF4K0Iu9j4Vh/XsUsHEQ1nZFUNCZ9VYq6neCb06jekocbCjep8voNGsY8GaKVJoCQg2TKrp+vamXwwyXUO5cYhHNjQRtg6EAVID6KXzMQmI9Ee3A2wJwZZrAqTaZ5H08m+EtRFp83AEvlSDPOYkVYGopZjEdxiiLOSz7MIlivBQc5rbEVj6oauzjlH60ibO7cvkFi9Ep3rvTflREhN7ohrTar6DyMFgnTbyRFt/GbS9VSTSaMmn9W+A3BhyZjiFud8oG/n81Lnk7Vq0SHHtx9lFmJuh06Si/J/cz4VFYovVShsaBCDKOqLbQJqVRwp18b9SSTq4WCLAeubL99+HwaIf2mAKTygySjTs0mwABqbjxqKh75v6EkxF6W/KxpPofiDPM0UNRZjmkZA== 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: clang -fsanitize=kernel-memory already replaces calls to memset/memcpy/memmove and their __builtin_ versions with __msan_memset/__msan_memcpy/__msan_memmove 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 Reviewed-by: Marco Elver --- v2: - updated patch description --- 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);