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=-5.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 5593DCA9EC5 for ; Wed, 30 Oct 2019 14:36:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 10E1820656 for ; Wed, 30 Oct 2019 14:36:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 10E1820656 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B7ABC6B028B; Wed, 30 Oct 2019 10:36:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B29E46B028E; Wed, 30 Oct 2019 10:36:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A187F6B028F; Wed, 30 Oct 2019 10:36:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0008.hostedemail.com [216.40.44.8]) by kanga.kvack.org (Postfix) with ESMTP id 7FCA16B028B for ; Wed, 30 Oct 2019 10:36:41 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id 372BF180AD815 for ; Wed, 30 Oct 2019 14:36:41 +0000 (UTC) X-FDA: 76100702202.15.cloud03_1d385cf44541d X-HE-Tag: cloud03_1d385cf44541d X-Filterd-Recvd-Size: 2623 Received: from verein.lst.de (verein.lst.de [213.95.11.211]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Wed, 30 Oct 2019 14:36:40 +0000 (UTC) Received: by verein.lst.de (Postfix, from userid 2407) id 424D568C65; Wed, 30 Oct 2019 15:36:36 +0100 (CET) Date: Wed, 30 Oct 2019 15:36:35 +0100 From: Christoph Hellwig To: glider@google.com Cc: Jens Axboe , Andy Lutomirski , Vegard Nossum , Dmitry Vyukov , linux-mm@kvack.org, viro@zeniv.linux.org.uk, akpm@linux-foundation.org, aryabinin@virtuozzo.com, ard.biesheuvel@linaro.org, arnd@arndb.de, hch@lst.de, dmitry.torokhov@gmail.com, edumazet@google.com, ericvh@gmail.com, gregkh@linuxfoundation.org, harry.wentland@amd.com, herbert@gondor.apana.org.au, mingo@elte.hu, martin.petersen@oracle.com, schwidefsky@de.ibm.com, mst@redhat.com, monstr@monstr.eu, pmladek@suse.com, sergey.senozhatsky@gmail.com, rostedt@goodmis.org, tiwai@suse.com, tytso@mit.edu, tglx@linutronix.de, wsa@the-dreams.de, gor@linux.ibm.com, iii@linux.ibm.com, mark.rutland@arm.com, willy@infradead.org, rdunlap@infradead.org, andreyknvl@google.com, elver@google.com Subject: Re: [PATCH RFC v2 15/25] kmsan: Changing existing files to enable KMSAN builds Message-ID: <20191030143635.GB15015@lst.de> References: <20191030142237.249532-1-glider@google.com> <20191030142237.249532-16-glider@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191030142237.249532-16-glider@google.com> User-Agent: Mutt/1.5.17 (2007-11-01) 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: Changing existing files is not a very good changelog, and hints that this is doing multiple things at a time. > diff --git a/block/blk.h b/block/blk.h > index 47fba9362e60..9ee271a22423 100644 > --- a/block/blk.h > +++ b/block/blk.h > @@ -78,6 +78,13 @@ static inline bool biovec_phys_mergeable(struct request_queue *q, > phys_addr_t addr1 = page_to_phys(vec1->bv_page) + vec1->bv_offset; > phys_addr_t addr2 = page_to_phys(vec2->bv_page) + vec2->bv_offset; > > +#ifdef CONFIG_KMSAN > + /* > + * Merging consequent physical pages may not work correctly under KMSAN > + * if their metadata pages aren't consequent. Just disable merging. > + */ > + return false; > +#endif > if (addr1 + vec1->bv_len != addr2) > return false; > if (xen_domain() && !xen_biovec_phys_mergeable(vec1, vec2->bv_page)) e.g. this looks pretty standaline. And could be simplified to: if (IS_ENABLED(CONFIG_KMSAN)) return false;