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 X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69302C43603 for ; Fri, 20 Dec 2019 18:52:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 22C8E206D8 for ; Fri, 20 Dec 2019 18:52:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="s2qGH5vy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 22C8E206D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id BA6DA8E01CC; Fri, 20 Dec 2019 13:52:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AE1168E019D; Fri, 20 Dec 2019 13:52:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 982078E01CC; Fri, 20 Dec 2019 13:52:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0190.hostedemail.com [216.40.44.190]) by kanga.kvack.org (Postfix) with ESMTP id 7BF718E019D for ; Fri, 20 Dec 2019 13:52:13 -0500 (EST) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id 33231180AD81A for ; Fri, 20 Dec 2019 18:52:13 +0000 (UTC) X-FDA: 76286414946.29.desk77_87bf991c4ce1e X-HE-Tag: desk77_87bf991c4ce1e X-Filterd-Recvd-Size: 6323 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf02.hostedemail.com (Postfix) with ESMTP for ; Fri, 20 Dec 2019 18:52:12 +0000 (UTC) Received: by mail-yb1-f202.google.com with SMTP id g19so7390665ybf.20 for ; Fri, 20 Dec 2019 10:52:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=hJjM/sM+ldYosApW8vKVM+ri9Nx2GQgp7DDtR5XgHU0=; b=s2qGH5vyUHV07KnZJKGLjCAGFpM/ParcsNgyi4sZeEMtMcvdm8A/zZW6PTJ+YZVSV9 pFu77s2ObETJB3nhwDnqdXCNXXSY7Dz4TSMmXw47P2oLPYyR4+UUQ/5+YfP68YdDIUXG ge53tuLjydBA2/8VX6NPmsZRG9SdlchRo1MIdvW8E5YzJXmY5QLJ9aPEoxXrIWWoAVWc Yy1EbSZ6EkMo/E6TvoPZzUa/r3y6UPaTEbS3CoAnmKhWbrEFFAqE/meaVjqDOIIhODRV QZsKkjLPoMAieDIEBe5jrSrgZproiUi5dDnYSeC70r7buzk9XxhG92P/9HOW4EtnYPW8 o/wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=hJjM/sM+ldYosApW8vKVM+ri9Nx2GQgp7DDtR5XgHU0=; b=rcEv2AhWfQng1q65EZTRg3DQVVJZ1tNr8oXf4uQMD1TpSjRR1l4E+VuiPDYYz/+WXm ScDtFt6biXsGVSDEYHE1yAvRXWxRIaA44R0C0H/3hu9lcuw0oO02AhpLAPqgxKN/MgN9 d7h/2SZEIEGPnG2IsvY/rWUIdrc9AwYYS0gdGxSGJUM5M5/faO6iPf/HqnH8piCE/pft OPq9CTjOQ3s7xzYBGGiq/SUsTuaPkNCYL2bbcQ1SHFqsWzf4NCnwQRa1Vyn8ZLzGxU9k dWN1w82cCANv8qPBjGsHGXCb44mHM5iOEhO3RHPHs0cgI1VHi6P35uK2c2h18/OL02K2 aAZw== X-Gm-Message-State: APjAAAXa6ts0SS5jPhtSK4HaEj7/z1cIVuL6v9xPZPG4ta1i11JEfc/q 2cpiInVNTFWq4kqiDzjk55IvvgOy4vQ= X-Google-Smtp-Source: APXvYqy5Ncy0r1ukTPdooFapERn5/5t5NhfhbR4y7H607+q6F7h41UNd+Zzfl99PESxc1xLxqsO6nGWImzM= X-Received: by 2002:a81:13cd:: with SMTP id 196mr12058113ywt.43.1576867932009; Fri, 20 Dec 2019 10:52:12 -0800 (PST) Date: Fri, 20 Dec 2019 19:49:54 +0100 In-Reply-To: <20191220184955.223741-1-glider@google.com> Message-Id: <20191220184955.223741-42-glider@google.com> Mime-Version: 1.0 References: <20191220184955.223741-1-glider@google.com> X-Mailer: git-send-email 2.24.1.735.g03f4e72817-goog Subject: [PATCH RFC v4 41/42] x86: kasan: kmsan: support CONFIG_GENERIC_CSUM on x86, enable it for KASAN/KMSAN From: glider@google.com To: Arnd Bergmann , Michal Simek , Andrey Ryabinin , Vegard Nossum , Dmitry Vyukov , Marco Elver , Andrey Konovalov , Randy Dunlap , linux-mm@kvack.org Cc: glider@google.com, viro@zeniv.linux.org.uk, adilger.kernel@dilger.ca, akpm@linux-foundation.org, luto@kernel.org, ard.biesheuvel@linaro.org, hch@infradead.org, hch@lst.de, darrick.wong@oracle.com, davem@davemloft.net, dmitry.torokhov@gmail.com, ebiggers@google.com, edumazet@google.com, ericvh@gmail.com, gregkh@linuxfoundation.org, harry.wentland@amd.com, herbert@gondor.apana.org.au, iii@linux.ibm.com, mingo@elte.hu, jasowang@redhat.com, axboe@kernel.dk, m.szyprowski@samsung.com, mark.rutland@arm.com, martin.petersen@oracle.com, schwidefsky@de.ibm.com, willy@infradead.org, mst@redhat.com, mhocko@suse.com, pmladek@suse.com, cai@lca.pw, robin.murphy@arm.com, sergey.senozhatsky@gmail.com, rostedt@goodmis.org, tiwai@suse.com, tytso@mit.edu, tglx@linutronix.de, gor@linux.ibm.com, wsa@the-dreams.de Content-Type: text/plain; charset="UTF-8" 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: This is needed to allow memory tools like KASAN and KMSAN see the memory accesses from the checksum code. Without CONFIG_GENERIC_CSUM the tools can't see memory accesses originating from handwritten assembly code. For KASAN it's a question of detecting more bugs, for KMSAN using the C implementation also helps avoid false positives originating from seemingly uninitialized checksum values. Signed-off-by: Alexander Potapenko To: Alexander Potapenko Cc: Arnd Bergmann Cc: Michal Simek Cc: Andrey Ryabinin Cc: Vegard Nossum Cc: Dmitry Vyukov Cc: Marco Elver Cc: Andrey Konovalov Cc: Randy Dunlap Cc: linux-mm@kvack.org --- v2: - dropped the "default n" (as requested by Randy Dunlap) v4: - changed "net:" to "x86:" in the patch name Change-Id: I645e2c097253a8d5717ad87e2e2df6f6f67251f3 --- arch/x86/Kconfig | 4 ++++ arch/x86/include/asm/checksum.h | 10 +++++++--- arch/x86/lib/Makefile | 2 ++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 8081bc31d5f0..dd4a6c233d18 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -273,6 +273,10 @@ config GENERIC_ISA_DMA def_bool y depends on ISA_DMA_API +config GENERIC_CSUM + bool + default y if KMSAN || KASAN + config GENERIC_BUG def_bool y depends on BUG diff --git a/arch/x86/include/asm/checksum.h b/arch/x86/include/asm/checksum.h index d79d1e622dcf..ab3464cbce26 100644 --- a/arch/x86/include/asm/checksum.h +++ b/arch/x86/include/asm/checksum.h @@ -1,6 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifdef CONFIG_X86_32 -# include +#ifdef CONFIG_GENERIC_CSUM +# include #else -# include +# ifdef CONFIG_X86_32 +# include +# else +# include +# endif #endif diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 5246db42de45..bca9031de9ff 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -55,7 +55,9 @@ endif lib-$(CONFIG_X86_USE_3DNOW) += mmx_32.o else obj-y += iomap_copy_64.o +ifneq ($(CONFIG_GENERIC_CSUM),y) lib-y += csum-partial_64.o csum-copy_64.o csum-wrappers_64.o +endif lib-y += clear_page_64.o copy_page_64.o lib-y += memmove_64.o memset_64.o lib-y += copy_user_64.o -- 2.24.1.735.g03f4e72817-goog