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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A35DC7EE30 for ; Wed, 25 Jun 2025 13:19:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1A95E8D000B; Wed, 25 Jun 2025 09:19:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 15B8B8D0001; Wed, 25 Jun 2025 09:19:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F164B8D000B; Wed, 25 Jun 2025 09:19:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id DE1EA8D0001 for ; Wed, 25 Jun 2025 09:19:37 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 7BD99B890E for ; Wed, 25 Jun 2025 13:19:37 +0000 (UTC) X-FDA: 83593979994.21.A412A30 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf07.hostedemail.com (Postfix) with ESMTP id D04FA40009 for ; Wed, 25 Jun 2025 13:19:35 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=DKvWYDHn; spf=pass (imf07.hostedemail.com: domain of leon@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750857575; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=bgxMrc8fF7Z5NJiku3nKrAQz6RTWRZrSyMf5Xj8pQMs=; b=SofqqSgOKISw5ckcWn6oRZJF0NiNwIf4kzbIdQDlM4u6ylrp46FI0WFuWZVX+W9zehC2gN VoddBOf7CfSicKsW/wQqzE48sloQLpC0v61oSgLlR4if99Frs2tRasQTUlJl7lpi7wA03k 6Pq8y7TtAnimoEbaRkAVqX4VI36EkQA= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=DKvWYDHn; spf=pass (imf07.hostedemail.com: domain of leon@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750857575; a=rsa-sha256; cv=none; b=dDVn1zLr3ENoWSG8MRAvExeHgoBGcd0zzo7nPdY9wi1LjxAUJI09mmbD3Q9n228LxFiD+b Hh/khmzjSoDPpEpIoiP+ITedrAbkFjTUtSdpA0IvSEEqlMxMFgZ1UuUpb7JFeX83cqvGaQ fOGeMxRzAgdoOypgmp4474nERORg1j4= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 91187A52616; Wed, 25 Jun 2025 13:19:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 962DEC4CEF4; Wed, 25 Jun 2025 13:19:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750857574; bh=ofFH7lyPLUqr67tQilbxRRQzne1tZ8ChYg2mo49x+DM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DKvWYDHnU6FbZFwFOnVaAQdw0mr4e0/aKQai8rFK8PLJiWYS/4rqj7AZ0fN4Ulkt/ yv3PHD2t0jMvZNaZSz+Z9UTvya58PO0QNUgFgB+zK9tOiM7UQ3EiA7uP4KDWo582Pb Zg5DwSgbJJvs0KzyT9o9Et+xwig8daMWdlmk0GO9sTO2DaQkWUjmeyX9Ts6/Rg4nra 0SwHZOI9TXyps68oZSAbK2qmuFNpHmCqhiqcRREBWtkVE/3ejcthld5UF0Abgc5i6G I/8CxoABIaxcG24R1Sk2Er7iYtBmXiDqLm6zJChw56Oc3+S19pOljRJ4vlBbrTWneY m766xQEX2v/JQ== From: Leon Romanovsky To: Marek Szyprowski Cc: Leon Romanovsky , Christoph Hellwig , Jonathan Corbet , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Robin Murphy , Joerg Roedel , Will Deacon , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Alexander Potapenko , Marco Elver , Dmitry Vyukov , Masami Hiramatsu , Mathieu Desnoyers , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Andrew Morton , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, iommu@lists.linux.dev, virtualization@lists.linux.dev, kasan-dev@googlegroups.com, linux-trace-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 5/8] kmsan: convert kmsan_handle_dma to use physical addresses Date: Wed, 25 Jun 2025 16:19:02 +0300 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D04FA40009 X-Stat-Signature: 9a5y8pycz9t9sc3x3qfo3dhd1pbt76g5 X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1750857575-883697 X-HE-Meta: U2FsdGVkX18p8G6LDfhmBITDrw3VzAnXIKWMF+BQdctCUiiIyRz4Bx1NuxJkWvZIedprF7UexdmhXfXLLYeQkNoO8inJqKl9TQXvfjZ2pRhL6tKzt4AcWaV6BOpI8s0PNYHtPX+pMXzC3Y5mUAEX8ANZ+yiWnHRfIRerA04aj4AQcvHiASjUD2rOvcKENLOAvt2KqL1FPJMDlhm61HW1MQDKAe+xjL3bpFmyT/QiourKFjXn6M8xHc7DGd0NYHRmo+L4yGMr2R0ovhLONerihEnDQEwfK5uNT3R9iLWsYhmtwM0YwUQ5uHPwn8LYM8ryEHm+7IcjVKNQmLUqrmPwNTKVSI/V2+E6sEuCZn7Wbnzq9vKJ8OVBGDG9FgGufQ7ZlQjMCKGgAJvIvlSjxnCueCccIx3JtSCgKMnc65VDBlaRcMSF/h+51vNvSW2jX6k7OoeJ0U6FZb63sAoKiAPRICZw+IWY7WdW9jZ/2tp8W6yt/Dh/4FlsUVTwXQhkUoJEHwbL9a/fxdLOZJC1GJq67hgIwH3ioqel1N0eIGcjphdJbYOkx8EqSt9TxPA+X7QFqIu6hHlc1tOvOux5vlY1ruDBcWzEv4uxzqVf068hxkLRlAa3gpsyijTNvORJA0shrdyjEibijycsUyZbS1lhstFPx71dRBX1daLLkq7LzcGydcYCF/oVQMdprGWqHyrGlDvH1C32OZiVPUhFEvKiEEayvdZH2zaU0ud7IqtOOxvNnFb9Kq0xyB7SOmJT2x/KkoVomDbgmp/idfVW8VDGu/LjlQ1I522dZi3gZPqQaplQKalhb8nVUxbKdFhZLdDO6KFAsWSN+lytes2EjnLiv2GNa+DUOaydzkhTrpsonu4yCJhBCop8XSrzw2MDwzth1LUDmCNMZzazn4UxqxR+wJpfoapKnCrqxHXBcTIattS729wEzoDNBAemD7XfuVCnJN5MCIFR4YVxq/Ywao0 9yIWR3gP Nnvxou6Lwn1TuX1jiXjtu87tT6MQHEI6A9X06vkrncFTitBhiTMd4yzqz0OX38LzyEGVVGJl7MDxwJJQvqg9zSnWjKO9qkKUhrhlLDPCio6Aa7Mfob6BzIQMaXKIgtgpsxiIL3RUYmsFFpq0rSthpMleHv1yN9J7+xZ+5JpoCByvQ6X/fw/5fozZBQvF9a9Uag/eLHXqW8uvufbygpYJ/3iv/A5ZuNoEAk23TbTq3b2G36AkMbvUeMgnzHswmyIcmX6WYjQ0Z9ihy3coMDO89YsgYdmv8vsZR/efJ7OyUbOTnug7UQ7BKvABy2HlUeKmqKpD9 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: List-Subscribe: List-Unsubscribe: From: Leon Romanovsky Convert the KMSAN DMA handling function from page-based to physical address-based interface. The refactoring renames kmsan_handle_dma() parameters from accepting (struct page *page, size_t offset, size_t size) to (phys_addr_t phys, size_t size). A PFN_VALID check is added to prevent KMSAN operations on non-page memory, preventing from non struct page backed address, As part of this change, support for highmem addresses is implemented using kmap_local_page() to handle both lowmem and highmem regions properly. All callers throughout the codebase are updated to use the new phys_addr_t based interface. Signed-off-by: Leon Romanovsky --- drivers/virtio/virtio_ring.c | 4 ++-- include/linux/kmsan.h | 12 +++++++----- kernel/dma/mapping.c | 2 +- mm/kmsan/hooks.c | 36 +++++++++++++++++++++++++++++------- tools/virtio/linux/kmsan.h | 2 +- 5 files changed, 40 insertions(+), 16 deletions(-) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index b784aab66867..dab49385e3e8 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -378,7 +378,7 @@ static int vring_map_one_sg(const struct vring_virtqueue *vq, struct scatterlist * is initialized by the hardware. Explicitly check/unpoison it * depending on the direction. */ - kmsan_handle_dma(sg_page(sg), sg->offset, sg->length, direction); + kmsan_handle_dma(sg_phys(sg), sg->length, direction); *addr = (dma_addr_t)sg_phys(sg); return 0; } @@ -3149,7 +3149,7 @@ dma_addr_t virtqueue_dma_map_single_attrs(struct virtqueue *_vq, void *ptr, struct vring_virtqueue *vq = to_vvq(_vq); if (!vq->use_dma_api) { - kmsan_handle_dma(virt_to_page(ptr), offset_in_page(ptr), size, dir); + kmsan_handle_dma(virt_to_phys(ptr), size, dir); return (dma_addr_t)virt_to_phys(ptr); } diff --git a/include/linux/kmsan.h b/include/linux/kmsan.h index 2b1432cc16d5..6f27b9824ef7 100644 --- a/include/linux/kmsan.h +++ b/include/linux/kmsan.h @@ -182,8 +182,7 @@ void kmsan_iounmap_page_range(unsigned long start, unsigned long end); /** * kmsan_handle_dma() - Handle a DMA data transfer. - * @page: first page of the buffer. - * @offset: offset of the buffer within the first page. + * @phys: physical address of the buffer. * @size: buffer size. * @dir: one of possible dma_data_direction values. * @@ -191,8 +190,11 @@ void kmsan_iounmap_page_range(unsigned long start, unsigned long end); * * checks the buffer, if it is copied to device; * * initializes the buffer, if it is copied from device; * * does both, if this is a DMA_BIDIRECTIONAL transfer. + * + * The function handles page lookup internally and supports both lowmem + * and highmem addresses. */ -void kmsan_handle_dma(struct page *page, size_t offset, size_t size, +void kmsan_handle_dma(phys_addr_t phys, size_t size, enum dma_data_direction dir); /** @@ -372,8 +374,8 @@ static inline void kmsan_iounmap_page_range(unsigned long start, { } -static inline void kmsan_handle_dma(struct page *page, size_t offset, - size_t size, enum dma_data_direction dir) +static inline void kmsan_handle_dma(phys_addr_t phys, size_t size, + enum dma_data_direction dir) { } diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c index 80481a873340..709405d46b2b 100644 --- a/kernel/dma/mapping.c +++ b/kernel/dma/mapping.c @@ -172,7 +172,7 @@ dma_addr_t dma_map_page_attrs(struct device *dev, struct page *page, addr = iommu_dma_map_phys(dev, phys, size, dir, attrs); else addr = ops->map_page(dev, page, offset, size, dir, attrs); - kmsan_handle_dma(page, offset, size, dir); + kmsan_handle_dma(phys, size, dir); trace_dma_map_phys(dev, phys, addr, size, dir, attrs); debug_dma_map_phys(dev, phys, size, dir, addr, attrs); diff --git a/mm/kmsan/hooks.c b/mm/kmsan/hooks.c index 97de3d6194f0..eab7912a3bf0 100644 --- a/mm/kmsan/hooks.c +++ b/mm/kmsan/hooks.c @@ -336,25 +336,48 @@ static void kmsan_handle_dma_page(const void *addr, size_t size, } /* Helper function to handle DMA data transfers. */ -void kmsan_handle_dma(struct page *page, size_t offset, size_t size, +void kmsan_handle_dma(phys_addr_t phys, size_t size, enum dma_data_direction dir) { u64 page_offset, to_go, addr; + struct page *page; + void *kaddr; - if (PageHighMem(page)) + if (!pfn_valid(PHYS_PFN(phys))) return; - addr = (u64)page_address(page) + offset; + + page = phys_to_page(phys); + page_offset = offset_in_page(phys); + /* * The kernel may occasionally give us adjacent DMA pages not belonging * to the same allocation. Process them separately to avoid triggering * internal KMSAN checks. */ while (size > 0) { - page_offset = offset_in_page(addr); to_go = min(PAGE_SIZE - page_offset, (u64)size); + + if (PageHighMem(page)) + /* Handle highmem pages using kmap */ + kaddr = kmap_local_page(page); + else + /* Lowmem pages can be accessed directly */ + kaddr = page_address(page); + + addr = (u64)kaddr + page_offset; kmsan_handle_dma_page((void *)addr, to_go, dir); - addr += to_go; + + if (PageHighMem(page)) + kunmap_local(page); + + phys += to_go; size -= to_go; + + /* Move to next page if needed */ + if (size > 0) { + page = phys_to_page(phys); + page_offset = offset_in_page(phys); + } } } EXPORT_SYMBOL_GPL(kmsan_handle_dma); @@ -366,8 +389,7 @@ void kmsan_handle_dma_sg(struct scatterlist *sg, int nents, int i; for_each_sg(sg, item, nents, i) - kmsan_handle_dma(sg_page(item), item->offset, item->length, - dir); + kmsan_handle_dma(sg_phys(item), item->length, dir); } /* Functions from kmsan-checks.h follow. */ diff --git a/tools/virtio/linux/kmsan.h b/tools/virtio/linux/kmsan.h index 272b5aa285d5..6cd2e3efd03d 100644 --- a/tools/virtio/linux/kmsan.h +++ b/tools/virtio/linux/kmsan.h @@ -4,7 +4,7 @@ #include -inline void kmsan_handle_dma(struct page *page, size_t offset, size_t size, +inline void kmsan_handle_dma(phys_addr_t phys, size_t size, enum dma_data_direction dir) { } -- 2.49.0