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,URIBL_BLOCKED, 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 D41DEC1975A for ; Wed, 25 Mar 2020 16:14:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A0FA820409 for ; Wed, 25 Mar 2020 16:14:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Ap6VLbh1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A0FA820409 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 694F86B00A8; Wed, 25 Mar 2020 12:14:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 61DDF6B00AA; Wed, 25 Mar 2020 12:14:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4743E6B00AB; Wed, 25 Mar 2020 12:14:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0134.hostedemail.com [216.40.44.134]) by kanga.kvack.org (Postfix) with ESMTP id 24D996B00A8 for ; Wed, 25 Mar 2020 12:14:36 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 01FB95676D for ; Wed, 25 Mar 2020 16:14:36 +0000 (UTC) X-FDA: 76634382552.30.brass10_7f6d17edb5942 X-HE-Tag: brass10_7f6d17edb5942 X-Filterd-Recvd-Size: 5305 Received: from mail-qt1-f201.google.com (mail-qt1-f201.google.com [209.85.160.201]) by imf13.hostedemail.com (Postfix) with ESMTP for ; Wed, 25 Mar 2020 16:14:35 +0000 (UTC) Received: by mail-qt1-f201.google.com with SMTP id k46so2365726qta.2 for ; Wed, 25 Mar 2020 09:14:35 -0700 (PDT) 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=J+h0iEnWTkRG2NLExxLPCnEChpv3/sAmomh7lQSL40I=; b=Ap6VLbh1nr/g7HPsN85bH+He50TVNZKjm8mbQ67XUjm7N5GYD3YJI4IkP40aduyrl+ xwjd5PLEboIdfAlynCr2s0bHLCAb9/MFGyAJLO6Dx1INC68alDj08z4Eg3GDiKEXwQjT vqOs8uri5xwH/VytQTSzdcqNDMdRds3xw6cyeR8CaauCTy8PNm9Fx2kEC5FQxByGHyuN v/HM33BPhxYyZqLfWySi1CjPLB2VsIQ9DMPxrDswCNO18NWJNDOc9TUF9A5LE2PV45vL 5z8E7pv8OjWLy8BuiU/sWK+u1/HqEAuJ9oAjEvfqVe3lhbrh6KMOQwPlG5Qc4uV0pjI4 gYYg== 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=J+h0iEnWTkRG2NLExxLPCnEChpv3/sAmomh7lQSL40I=; b=C9VtnVK30dSC1XBM3A/zkjLekdwBK3LtJi57Gi9YNZCgE6/XuQhNm9v44SSTc44s8P bpyEYg9MRk80GCRFbVIfXOZ807DHvduw+NyQCUG1/ntk8Guk551Qk2JKZKH8OmBB2BpN wlXlW75IAkYXjWEcO0wfVo7QchrwGfw5wWe+pDiTm6qQiT9CVgZqy6UdA4P7f/mbMZTW VY0RL6JVpcl9maN9JYGs6bpCQrRXcXm5+F0wQl4wlQeo4V4Bw+LNQL9VxBdl+YaSWtGL iTKJDdyORvl6VVwnhxsToxUZBA4Z/KpOFscwXBf/RkZTm6nXFvt+VFrRCKQYO9ccHu3e 8deg== X-Gm-Message-State: ANhLgQ0SC76Rbf3exF2qYWK0U8QvyZZuDMLH0imSlceb4hI40WSP6VPL i2bjOdylfkGm/3S/0mBtghc88byPoPk= X-Google-Smtp-Source: ADFU+vtc3ssCRbxQQhTVV5kqjyH/E8hfiLbgFgdTIhyuHgKj4w3GvV01MQ0MpCGx8nekkibvHTvg7Uf104c= X-Received: by 2002:a05:6214:186c:: with SMTP id eh12mr3770740qvb.131.1585152874479; Wed, 25 Mar 2020 09:14:34 -0700 (PDT) Date: Wed, 25 Mar 2020 17:12:42 +0100 In-Reply-To: <20200325161249.55095-1-glider@google.com> Message-Id: <20200325161249.55095-32-glider@google.com> Mime-Version: 1.0 References: <20200325161249.55095-1-glider@google.com> X-Mailer: git-send-email 2.25.1.696.g5e7596f4ac-goog Subject: [PATCH v5 31/38] kmsan: virtio: check/unpoison scatterlist in vring_map_one_sg() From: glider@google.com To: Vegard Nossum , Dmitry Vyukov , Marco Elver , Andrey Konovalov , "Michael S. Tsirkin" , Jason Wang , linux-mm@kvack.org Cc: glider@google.com, viro@zeniv.linux.org.uk, adilger.kernel@dilger.ca, akpm@linux-foundation.org, aryabinin@virtuozzo.com, luto@kernel.org, ard.biesheuvel@linaro.org, arnd@arndb.de, 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, axboe@kernel.dk, m.szyprowski@samsung.com, mark.rutland@arm.com, martin.petersen@oracle.com, schwidefsky@de.ibm.com, willy@infradead.org, 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 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: If vring doesn't use the DMA API, KMSAN is unable to tell whether the memory is initialized by hardware. Explicitly call kmsan_handle_dma() from vring_map_one_sg() in this case to prevent false positives. Signed-off-by: Alexander Potapenko Cc: Vegard Nossum Cc: Dmitry Vyukov Cc: Marco Elver Cc: Andrey Konovalov Cc: "Michael S. Tsirkin" Cc: Jason Wang Cc: linux-mm@kvack.org --- Change-Id: Icc8678289b7084139320fc503898a67aa9803458 --- drivers/virtio/virtio_ring.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 58b96baa8d488..8b6dee1dfde58 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #ifdef DEBUG @@ -326,8 +327,15 @@ static dma_addr_t vring_map_one_sg(const struct vring_virtqueue *vq, struct scatterlist *sg, enum dma_data_direction direction) { - if (!vq->use_dma_api) + if (!vq->use_dma_api) { + /* + * If DMA is not used, KMSAN doesn't know that the scatterlist + * is initialized by the hardware. Explicitly check/unpoison it + * depending on the direction. + */ + kmsan_handle_dma(sg_virt(sg), sg->length, direction); return (dma_addr_t)sg_phys(sg); + } /* * We can't use dma_map_sg, because we don't use scatterlists in -- 2.25.1.696.g5e7596f4ac-goog