From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 997032C028F for ; Tue, 30 Dec 2025 10:16:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767089769; cv=none; b=qkdpg8EeQ7jySsPQzQT1YEftyzzJ+YgPJdzJxaqaBSu3ZHSnCmVMQsiE6OgucQ3iMaX2Iqc0CGF2Tivhta4XUAJox1XWMa8mZseFjjtkBiV3pcEWr5V/O2DjPSGN6QIya+RUWfaDM0UXyCzxlMV20TGhi34WsYYWAFDIWCENvwc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767089769; c=relaxed/simple; bh=LXvIBwQKlwN2aW+nel9nihwfIG/BNCGtqaNljMXS3c4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=gyyRVYQIvYSMSfanIOc6NVDPJMDu21GVGsYolzIWOFuXc1iy7zWHjYjA+c6ijw0pVFnjySZ5Xfr3AA8pH0BLmEh/OzLMQnRApom04Upwlz0WCWrRJk24Blh9EYmvcftrpPcPaoDMDsXQEmMiOqUiLoeUJqFzVZDGOhQ3igM+ueo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=b5mWhlFM; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=Bt254Tfa; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="b5mWhlFM"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="Bt254Tfa" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767089766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CbbLRn5SB4hmqpKO67RyzNkOjJr20Ge6MiEXlRieQIA=; b=b5mWhlFMcAhJf5HHdiDR2c+GwG4NDncHv3QaphrnnAmHJ2W0f8uaXjGq84AqZaug3wk0Kw +McRoAikSlwp2cbFKxwPy8UVkWluP6Td3pu3JOuGxnd0zf9qfMYGbY4n4P+6ID1Ycf9BDo VF2YjugYxCwMlyrmE/gx6RMdieuiTG8= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-692-9Ta6XW32N2qDgoAT-Ns1aw-1; Tue, 30 Dec 2025 05:16:05 -0500 X-MC-Unique: 9Ta6XW32N2qDgoAT-Ns1aw-1 X-Mimecast-MFC-AGG-ID: 9Ta6XW32N2qDgoAT-Ns1aw_1767089764 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-43284edbbc8so1829768f8f.0 for ; Tue, 30 Dec 2025 02:16:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1767089764; x=1767694564; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=CbbLRn5SB4hmqpKO67RyzNkOjJr20Ge6MiEXlRieQIA=; b=Bt254TfaH40bxBLxxz/5PJL5tMkim9plomSHRIKOLweJ0ULeIwYjMOOodWhM3WK//P UymTDcx5T/76e6zQA5wl6k6H93lMN9mTTgBmA5esGeKjeD1Mhg8ocnWjdfxPB9BBFgQF j3fdS68fB7LUzhD9scOZuWhrXFMLFMJDw/Yu3dQNCsu5cZRj7sVy1+rzWBHeB7BpvBFc wLynWNnvzZtHrWQVI8zQxRsCRzHZIIcWpvNGF2l+95QVNBecdrjYemcNz1AR1GJqfHNj ZXTLKRq/pX6OrNPTEiM8u/fjDpJWmP9UZgXfRWZqPtLtcBKSBJf8RrGd6bNB289+Fq2l m7sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767089764; x=1767694564; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CbbLRn5SB4hmqpKO67RyzNkOjJr20Ge6MiEXlRieQIA=; b=vgTT1XEzDq/Az2URytDOiUmsoETL2/g7bPxe3ltRyppI5/oV7vssFneYR7hMyGVcoE MMc5l6UCyf/soP5dv0+zORRK9H77TSMCPcuNg8O6bPfpN4I3Q3eXsF2P6S9JB8pdSPUQ jmpVwpdZnGGyh8/A7tdy0KdZ3B75dBTG6suhsvExIutJrTg2HJqaHTfAMuZ7To67XIHV DVLQGDTb2RTbNDbqUxoppSJaUAJjvMdndy2sEChoJPLHqqlV9YuK54hb6bfuzk6fNoXG vBQIW9/0FqkmROaFmslypXnZ+oZAkyR3JAl1nEKctxEtjPnPhnqjmVTkjhWAdFLlFx2F Q3Mw== X-Forwarded-Encrypted: i=1; AJvYcCWbBMvdnJ0b4zW6RjEambebdjEBYkzZqfqi4HCT9L9qH9/P/vyuOQbKcp8lofKjBSz+JfY9iQgBXSE=@vger.kernel.org X-Gm-Message-State: AOJu0YyJl/UQev26MyF81sKlz3LmT8gFcwlJ4LHx+GtgQPptIwlDmyqv yY5xBpZmv7YoMXcHpiSzGJLQWcIbg/JInPsjk7yokNmX3t4mBJeBiTJ5sVOxhPQr10hx6S8sPm7 GXsHvHtZKcTlHL+alarmmmGkwGbUW+KyvXss0FV3sGqswNpvnVJn855n6yiHPvg== X-Gm-Gg: AY/fxX5fPDrxYGixgd33B2ynSSpEAKLerX66P2IauOs3ELgnjCmIhrEWPTMvNtyG+8T gbQEJciJ62/GFe79i6idrTHGBXUse6JlmzRJ3jdDCgoNKbSJEPxmBlNWUjRQRa+e56VsjEW9TXN 1SpJKPA/iRAPHtHKq026Oty15wxG3xUlFEzJmPsHkKNAjPo2/H1GMpcAUSslLHhrB+DVTtyuXZ3 MLiq27DUs2eJuL+qlO6LO9AxpRx/MWQTkdPaitoBn0fR8ECVdTuwqOgPUgTEqwYDoyF2M+JvDvB BvqtYyoSGpEFsvw62lHk9N/vw1CPcK5MEqdZS+wJWcjI5CYGXO31Um1/excDzNHo1nX+j9lmZdo 6xT10eCF5zNqhr7fvF6SdYsn+Q4a2rHNh4g== X-Received: by 2002:a05:6000:200e:b0:430:fcf5:4937 with SMTP id ffacd0b85a97d-4324e4c3e1emr38658325f8f.7.1767089764001; Tue, 30 Dec 2025 02:16:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IHK1atjAKrkdoWQy4jxFj2rw+qTn5U0Lh0sTEHql45jv1yC6jgv8gOxch8xQ2S/3gi1ay54uA== X-Received: by 2002:a05:6000:200e:b0:430:fcf5:4937 with SMTP id ffacd0b85a97d-4324e4c3e1emr38658276f8f.7.1767089763428; Tue, 30 Dec 2025 02:16:03 -0800 (PST) Received: from redhat.com (IGLD-80-230-31-118.inter.net.il. [80.230.31.118]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4324ea1b1bdsm66936468f8f.8.2025.12.30.02.16.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Dec 2025 02:16:03 -0800 (PST) Date: Tue, 30 Dec 2025 05:16:00 -0500 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Cong Wang , Jonathan Corbet , Olivia Mackall , Herbert Xu , Jason Wang , Paolo Bonzini , Stefan Hajnoczi , Eugenio =?utf-8?B?UMOpcmV6?= , "James E.J. Bottomley" , "Martin K. Petersen" , Gerd Hoffmann , Xuan Zhuo , Marek Szyprowski , Robin Murphy , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Petr Tesarik , Leon Romanovsky , Jason Gunthorpe , linux-doc@vger.kernel.org, linux-crypto@vger.kernel.org, virtualization@lists.linux.dev, linux-scsi@vger.kernel.org, iommu@lists.linux.dev, kvm@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH RFC 05/13] dma-debug: track cache clean flag in entries Message-ID: References: Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent If a driver is bugy and has 2 overlapping mappings but only sets cache clean flag on the 1st one of them, we warn. But if it only does it for the 2nd one, we don't. Fix by tracking cache clean flag in the entry. Shrink map_err_type to u8 to avoid bloating up the struct. Signed-off-by: Michael S. Tsirkin --- kernel/dma/debug.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c index 7e66d863d573..9bd14fd4c51b 100644 --- a/kernel/dma/debug.c +++ b/kernel/dma/debug.c @@ -63,6 +63,7 @@ enum map_err_types { * @sg_mapped_ents: 'mapped_ents' from dma_map_sg * @paddr: physical start address of the mapping * @map_err_type: track whether dma_mapping_error() was checked + * @is_cache_clean: driver promises not to write to buffer while mapped * @stack_len: number of backtrace entries in @stack_entries * @stack_entries: stack of backtrace history */ @@ -76,7 +77,8 @@ struct dma_debug_entry { int sg_call_ents; int sg_mapped_ents; phys_addr_t paddr; - enum map_err_types map_err_type; + u8 map_err_type; + bool is_cache_clean; #ifdef CONFIG_STACKTRACE unsigned int stack_len; unsigned long stack_entries[DMA_DEBUG_STACKTRACE_ENTRIES]; @@ -472,12 +474,15 @@ static int active_cacheline_dec_overlap(phys_addr_t cln) return active_cacheline_set_overlap(cln, --overlap); } -static int active_cacheline_insert(struct dma_debug_entry *entry) +static int active_cacheline_insert(struct dma_debug_entry *entry, + bool *overlap_cache_clean) { phys_addr_t cln = to_cacheline_number(entry); unsigned long flags; int rc; + *overlap_cache_clean = false; + /* If the device is not writing memory then we don't have any * concerns about the cpu consuming stale data. This mitigates * legitimate usages of overlapping mappings. @@ -487,8 +492,14 @@ static int active_cacheline_insert(struct dma_debug_entry *entry) spin_lock_irqsave(&radix_lock, flags); rc = radix_tree_insert(&dma_active_cacheline, cln, entry); - if (rc == -EEXIST) + if (rc == -EEXIST) { + struct dma_debug_entry *existing; + active_cacheline_inc_overlap(cln); + existing = radix_tree_lookup(&dma_active_cacheline, cln); + if (existing) + *overlap_cache_clean = existing->is_cache_clean; + } spin_unlock_irqrestore(&radix_lock, flags); return rc; @@ -583,20 +594,24 @@ DEFINE_SHOW_ATTRIBUTE(dump); */ static void add_dma_entry(struct dma_debug_entry *entry, unsigned long attrs) { + bool overlap_cache_clean; struct hash_bucket *bucket; unsigned long flags; int rc; + entry->is_cache_clean = !!(attrs & DMA_ATTR_CPU_CACHE_CLEAN); + bucket = get_hash_bucket(entry, &flags); hash_bucket_add(bucket, entry); put_hash_bucket(bucket, flags); - rc = active_cacheline_insert(entry); + rc = active_cacheline_insert(entry, &overlap_cache_clean); if (rc == -ENOMEM) { pr_err_once("cacheline tracking ENOMEM, dma-debug disabled\n"); global_disable = true; } else if (rc == -EEXIST && - !(attrs & (DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_CPU_CACHE_CLEAN)) && + !(attrs & DMA_ATTR_SKIP_CPU_SYNC) && + !(entry->is_cache_clean && overlap_cache_clean) && !(IS_ENABLED(CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC) && is_swiotlb_active(entry->dev))) { err_printk(entry->dev, entry, -- MST