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 2295CC43603 for ; Fri, 20 Dec 2019 18:51:56 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DD5AC206D8 for ; Fri, 20 Dec 2019 18:51:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HGctLIIc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD5AC206D8 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 70E0B8E01C6; Fri, 20 Dec 2019 13:51:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6BECE8E019D; Fri, 20 Dec 2019 13:51:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5FC378E01C6; Fri, 20 Dec 2019 13:51:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0046.hostedemail.com [216.40.44.46]) by kanga.kvack.org (Postfix) with ESMTP id 48E338E019D for ; Fri, 20 Dec 2019 13:51:55 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id 15AAA2466 for ; Fri, 20 Dec 2019 18:51:55 +0000 (UTC) X-FDA: 76286414190.19.light38_8514de006da2d X-HE-Tag: light38_8514de006da2d X-Filterd-Recvd-Size: 5302 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf29.hostedemail.com (Postfix) with ESMTP for ; Fri, 20 Dec 2019 18:51:54 +0000 (UTC) Received: by mail-wr1-f73.google.com with SMTP id b13so4113794wrx.22 for ; Fri, 20 Dec 2019 10:51:54 -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=VBsvvbQUH0uCDtaJdXUSwo8MkNmaOWSTJC2xuSLIVkM=; b=HGctLIIcyL6aTyenxBLGyVJms7jFp1eg+5pR190zW/mnVKEdXU9TOtPrxG3YjKKXvr qNAHG35I1dvlT22RUAJGneWN+aJOJC06xfr5TaAcAtw8R1R/nFjmkJYgfqaSpfl85l1V EiCLgLwLkeSYYGH0X/3Vs6SkMEeSr3eNBFI04LbyXMQ9VU7rk97RClfUZaP5WScR2Yr4 Un3PE8QFO2ACgKgm0MFl+zhaoIj154dae3Gef2RatEde0mWmj0kIHz8vO2vaVjyH1fD2 55BxcqmG/LExJgHZUtUC8AX4xO8Rkio/IIHtt/J323fQ3fqXKYMT5B3l3H5dNl7SOcfV t1jw== 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=VBsvvbQUH0uCDtaJdXUSwo8MkNmaOWSTJC2xuSLIVkM=; b=Tbaa1evFh5ftDGGhT3FsKNn7ZM+IJ3nEnGp3tyHInjeBG2/EXWbPW/JCHs3PizFVas 53ZTrOWAVr9pYzM9UQqMZGxXOrcmSKhRJDw3l1sG3Pkj0S5PQ/0TWUqwOsFh0ioBEzjT O1ab+/PbgznsMiNZY8gnc9wts6BO36DCiYfUPgiJ1HO22a8ioUVeHbd5T9MZQC1W4X04 akrI/3sOj7pYY62ro1lBBs54Xm2TxUE/pJruNXWrq8P2Asyqm5intOi6XeYwk5u9y3xV Z9dIm6HOjie4Yz6wFNNZiXHCHCS1SH4DIAa4VM8LLtaHyeiwAkK0xx01AluSCiCp8pJu ymIQ== X-Gm-Message-State: APjAAAW6F6w6mHTUM/E+qT8Re2103s/CVtK1Sq3qdZN+mpumRgXbipZD lbOHw/eWsJDQJ9jREkw2ruezG7NukZA= X-Google-Smtp-Source: APXvYqw65eJpAAtx5yJw3oaSXZjH6KhOJEL+vCCn37YB0p1SjxMFjVG5qkudy3TNtOym2i8AU9rkZYhCd90= X-Received: by 2002:adf:ef92:: with SMTP id d18mr16265543wro.234.1576867913045; Fri, 20 Dec 2019 10:51:53 -0800 (PST) Date: Fri, 20 Dec 2019 19:49:48 +0100 In-Reply-To: <20191220184955.223741-1-glider@google.com> Message-Id: <20191220184955.223741-36-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 35/42] 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 867c7ebd3f10..3b5fb08195df 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.24.1.735.g03f4e72817-goog