From patchwork Mon Sep 5 12:24:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 12966060 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 CECC0ECAAD5 for ; Mon, 5 Sep 2022 12:26:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6A5948D0084; Mon, 5 Sep 2022 08:26:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 654108D0076; Mon, 5 Sep 2022 08:26:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4F6358D0084; Mon, 5 Sep 2022 08:26:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 3CBC08D0076 for ; Mon, 5 Sep 2022 08:26:19 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0CC1C120CA5 for ; Mon, 5 Sep 2022 12:26:19 +0000 (UTC) X-FDA: 79877954478.04.5BFE6F5 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.74]) by imf10.hostedemail.com (Postfix) with ESMTP id BC550C0060 for ; Mon, 5 Sep 2022 12:26:18 +0000 (UTC) Received: by mail-ed1-f74.google.com with SMTP id w17-20020a056402269100b0043da2189b71so5641276edd.6 for ; Mon, 05 Sep 2022 05:26:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=r3HZXk/BEn65kcaybENH+gdA6j04yycM3f96/pfDo3Y=; b=ASzeAsbMOdZf4WYpGmHP1pAOfqzeXvi1/mYmjoy1+gLpo2mFVGXt7YkxHdn2cGG7Th LhsyoqxduLzAWg9guBf7MeUGs5Sl556966lTsEax9VeA+GsBoCisGlbSkVEruCeqXdIL pmn8EWbkEJjYIFVr9fHMcvJQS7hgukxapq/1AYQ4UGaMetmJBsMlft+caiJ7o6VTTsRO /gBZA1HxzLhDIpKDjWeAuT4C4Rnv8Ae2OB/4lJ2Ca03N2vHUV4V1Gj7baRHl/poEsqyJ jflQ8NkbH5DBqPL8/Jio1X1Vv9nc7m22bqOJom4ePsHMKcBTNXLmYOpZp6cjj1DVwhN9 4O5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=r3HZXk/BEn65kcaybENH+gdA6j04yycM3f96/pfDo3Y=; b=luWHiphu5xgKA5p+9v1CC0e/AaqhVyrabK/HGvSgOyJAJWgtADFt5HZcDSRBjGCyIe 2aQLeT/ntuu13NFDir2bX9XImcQzIT3Er9XpoR7F/oXF/n6Agkblsz+G4UoreOeWRNKX JvGFvrSESoMF9Nl4sNJMvB+qe+gUSVeLwE2JEAvA1HQCKXAoXeXACc7gtElI5vcsjPd6 JnMEA3h7UB6fubdvNi+ENLtHQnSZbS0QrIQDNed6qNUFYNh3Cp/GStOXF3P3ljikEcaF Hnlltp8hHlKrvayO+I07eRz63k2hQ3/ztp2pfFvnAVvZu/LWbj9rpcnR4BvwFieaIuBl nseQ== X-Gm-Message-State: ACgBeo3/xYOVbuFLdToibCE60rohXGYWqiEGiJNOwtSfg1HlIN/tP3Wv Lu0RYF8B6ctDB9uLBOTtiPeHZDuL3+o= X-Google-Smtp-Source: AA6agR4ywNo4RURTtgkJzNxgjjBzX0rpx4pVEpcnNVzzj6eodf3zbpdzsA8Tkeoavta9Gzz8OJ5GJVPldJ8= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:b808:8d07:ab4a:554c]) (user=glider job=sendgmr) by 2002:a05:6402:348f:b0:448:6005:68af with SMTP id v15-20020a056402348f00b00448600568afmr32104195edc.184.1662380777495; Mon, 05 Sep 2022 05:26:17 -0700 (PDT) Date: Mon, 5 Sep 2022 14:24:37 +0200 In-Reply-To: <20220905122452.2258262-1-glider@google.com> Mime-Version: 1.0 References: <20220905122452.2258262-1-glider@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220905122452.2258262-30-glider@google.com> Subject: [PATCH v6 29/44] block: kmsan: skip bio block merging logic for KMSAN From: Alexander Potapenko To: glider@google.com Cc: Alexander Viro , Alexei Starovoitov , Andrew Morton , Andrey Konovalov , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Christoph Hellwig , Christoph Lameter , David Rientjes , Dmitry Vyukov , Eric Dumazet , Greg Kroah-Hartman , Herbert Xu , Ilya Leoshkevich , Ingo Molnar , Jens Axboe , Joonsoo Kim , Kees Cook , Marco Elver , Mark Rutland , Matthew Wilcox , "Michael S. Tsirkin" , Pekka Enberg , Peter Zijlstra , Petr Mladek , Steven Rostedt , Thomas Gleixner , Vasily Gorbik , Vegard Nossum , Vlastimil Babka , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Biggers ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662380778; a=rsa-sha256; cv=none; b=rc1iHnUqMmUx9zvDtcXL0A8wAaS6zJXG0LRhSo9bkTa9JZPIlm8l4MS0JwjZvOs2lrp1gs ZiXFuM0jYw3fJsExeYL6HxiN0eED1FCMMc9FyVlj+0VmM1xglwSOLXdmOzI489aW5n3++u p3CxD9FM8xjLlNmS9Ma7VIfdoYfI0rA= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=ASzeAsbM; spf=pass (imf10.hostedemail.com: domain of 36eoVYwYKCDYYdaVWjYggYdW.Ugedafmp-eecnSUc.gjY@flex--glider.bounces.google.com designates 209.85.208.74 as permitted sender) smtp.mailfrom=36eoVYwYKCDYYdaVWjYggYdW.Ugedafmp-eecnSUc.gjY@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=1662380778; 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:in-reply-to:references:references:dkim-signature; bh=r3HZXk/BEn65kcaybENH+gdA6j04yycM3f96/pfDo3Y=; b=dQPSnBH6K5oS2P1WrEfmehnePVmxPk8InFnzoDfzYJkNyTQNpDflF+j+wjOXiAMlMAxTZX G++qapWVBKanTEcrwgGCQXVc078avs2UEDsgOJtRekImwstqxHSQKQwFl+d5KpUq/DAA4/ fRn+9OAlCrLYZIGSZ0KtOxB1ihms/EE= Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=ASzeAsbM; spf=pass (imf10.hostedemail.com: domain of 36eoVYwYKCDYYdaVWjYggYdW.Ugedafmp-eecnSUc.gjY@flex--glider.bounces.google.com designates 209.85.208.74 as permitted sender) smtp.mailfrom=36eoVYwYKCDYYdaVWjYggYdW.Ugedafmp-eecnSUc.gjY@flex--glider.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspam-User: X-Rspamd-Server: rspam12 X-Stat-Signature: ke4muckw3e91xmzecurtrt3n1wtn84ze X-Rspamd-Queue-Id: BC550C0060 X-HE-Tag: 1662380778-562833 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 doesn't allow treating adjacent memory pages as such, if they were allocated by different alloc_pages() calls. The block layer however does so: adjacent pages end up being used together. To prevent this, make page_is_mergeable() return false under KMSAN. Suggested-by: Eric Biggers Signed-off-by: Alexander Potapenko --- v4: -- swap block: and kmsan: in the subject v5: -- address Marco Elver's comments Link: https://linux-review.googlesource.com/id/Ie29cc2464c70032347c32ab2a22e1e7a0b37b905 --- block/bio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/bio.c b/block/bio.c index 3d3a2678fea25..106ef14f28c2a 100644 --- a/block/bio.c +++ b/block/bio.c @@ -869,6 +869,8 @@ static inline bool page_is_mergeable(const struct bio_vec *bv, *same_page = ((vec_end_addr & PAGE_MASK) == page_addr); if (*same_page) return true; + else if (IS_ENABLED(CONFIG_KMSAN)) + return false; return (bv->bv_page + bv_end / PAGE_SIZE) == (page + off / PAGE_SIZE); }