From patchwork Fri Dec 20 18:49:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 11306211 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DF184139A for ; Fri, 20 Dec 2019 18:52:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A774C206D8 for ; Fri, 20 Dec 2019 18:52:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="VH37xF/9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A774C206D8 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 00B8C8E01CA; Fri, 20 Dec 2019 13:52:08 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E61DC8E019D; Fri, 20 Dec 2019 13:52:07 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BC9A18E01CA; Fri, 20 Dec 2019 13:52:07 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0032.hostedemail.com [216.40.44.32]) by kanga.kvack.org (Postfix) with ESMTP id 9F62B8E019D for ; Fri, 20 Dec 2019 13:52:07 -0500 (EST) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id 6026E4DA6 for ; Fri, 20 Dec 2019 18:52:07 +0000 (UTC) X-FDA: 76286414694.02.road38_86e8eb155314f X-Spam-Summary: 2,0,0,bf8a2de299404e61,d41d8cd98f00b204,3vrj9xqykchauzwrsfuccuzs.qcazwbil-aayjoqy.cfu@flex--glider.bounces.google.com,:axboe@kernel.dk:luto@kernel.org:vegard.nossum@oracle.com:dvyukov@google.com:elver@google.com:andreyknvl@google.com:hch@lst.de::glider@google.com:viro@zeniv.linux.org.uk:adilger.kernel@dilger.ca:akpm@linux-foundation.org:aryabinin@virtuozzo.com:ard.biesheuvel@linaro.org:arnd@arndb.de:hch@infradead.org: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: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:monstr@monstr.eu:pmladek@suse.com:cai@lca.pw:rdunlap@infradead.org:robin.murphy@arm.com:sergey.senozhatsky@gmail.com:rostedt@goodmis.org:tiwai@suse.c om:tytso X-HE-Tag: road38_86e8eb155314f X-Filterd-Recvd-Size: 5140 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Fri, 20 Dec 2019 18:52:06 +0000 (UTC) Received: by mail-wm1-f73.google.com with SMTP id 18so1947646wmp.0 for ; Fri, 20 Dec 2019 10:52:06 -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=YZPRwu9OAY0nzO7JFLiJ1r6RXEFL+tKj8adgO3cfPt0=; b=VH37xF/95Jn/KgRk3TJKDQT6c60NFj7HUU1NJRcTuSkDOgAW+/mlGP2D9FDRIiR6LH xLBEgOmfNSd4sUC+mDqLg8//lSKnh97UENysrMkx/+E6mqFuJ24FSvc284YzNAUoAGi5 CKk9jZDIHFxLmJoIDvNU+AnhTX9RfNIoZOjFoFDIVHsA3d9iIUvipgN3qAKMZXZmr5jo B7dzS3xddpvZKeuqOcffN6Tk5ZugONudllGLNxn1/s6AG0WWj4bqBW8Q4nMjQ/C3f+8L ZV0diaww/0Ao3ZKgP7n1hHxvwSc6UXA+Z18JCSueomW97oVap+13ZYPcoUp9calJWZ9h vbcA== 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=YZPRwu9OAY0nzO7JFLiJ1r6RXEFL+tKj8adgO3cfPt0=; b=C4F6o1ug2bYn95iUMih9faz+BqdY+MQP5gPqpwU8Q5vZTmAsdEAwX5efDxvvGjPvnx 3qDaRAdpg4drfxBcYcFM9eXnf8mmOiNAlvEIc3P3o5PqC9FiwgQXRFd6lWhZiN15H+sj TF+sMkZNHLWsf41LSpQ0NxhdPD6PaPiekh7bcAEJ5rF9aiYPuOCPvIxfCiDUiIuUsnC5 u7m5UX9HrZLiYAyWwEMT96OoPvoLmqAqdNXEZ1qRY5G1jQ5RCOgYmoJCTpiYYpOS5UP4 +n24BSAmzlgERnsOj9gX+mM5JQRG0MuDQJFIgIbj2fVVlIOGPxFSOpOFiezAm7hfmWvt ux0Q== X-Gm-Message-State: APjAAAV26MYIG0aTWol7eo9QY3/ne+v9YwV3RpD+0SQKReNY9p8ehoR+ z22VzOx255TqhK0TbyPq5ZPDixv7mvk= X-Google-Smtp-Source: APXvYqzqO572vjNgoQXSb3IEuAMLBLP5QZ3q4XyWMoeDb6PXiYNNfmiH7X5LDCkU0utB2FfzR3g2zOKP9Pk= X-Received: by 2002:a5d:6b88:: with SMTP id n8mr17353448wrx.288.1576867925515; Fri, 20 Dec 2019 10:52:05 -0800 (PST) Date: Fri, 20 Dec 2019 19:49:52 +0100 In-Reply-To: <20191220184955.223741-1-glider@google.com> Message-Id: <20191220184955.223741-40-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 39/42] kmsan: disable physical page merging in biovec From: glider@google.com To: Jens Axboe , Andy Lutomirski , Vegard Nossum , Dmitry Vyukov , Marco Elver , Andrey Konovalov , Christoph Hellwig , linux-mm@kvack.org Cc: glider@google.com, viro@zeniv.linux.org.uk, adilger.kernel@dilger.ca, akpm@linux-foundation.org, aryabinin@virtuozzo.com, ard.biesheuvel@linaro.org, arnd@arndb.de, hch@infradead.org, 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, 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, monstr@monstr.eu, pmladek@suse.com, cai@lca.pw, rdunlap@infradead.org, 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 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 metadata for consequent physical pages may be inconsequent, therefore accessing such pages together may lead to metadata corruption. We disable merging pages in biovec to prevent such corruptions. Signed-off-by: Alexander Potapenko To: Alexander Potapenko Cc: Jens Axboe Cc: Andy Lutomirski Cc: Vegard Nossum Cc: Dmitry Vyukov Cc: Marco Elver Cc: Andrey Konovalov Cc: Christoph Hellwig Cc: linux-mm@kvack.org --- v4: - use IS_ENABLED instead of #ifdef (as requested by Marco Elver) Change-Id: Id2f2babaf662ac44675c4f2790f4a80ddc328fa7 --- block/blk.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/block/blk.h b/block/blk.h index 6842f28c033e..b2363555ce78 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; + /* + * Merging consequent physical pages may not work correctly under KMSAN + * if their metadata pages aren't consequent. Just disable merging. + */ + if (IS_ENABLED(CONFIG_KMSAN)) + return false; + if (addr1 + vec1->bv_len != addr2) return false; if (xen_domain() && !xen_biovec_phys_mergeable(vec1, vec2->bv_page))