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.129.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 DF9B8314A82 for ; Mon, 5 Jan 2026 08:23:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767601400; cv=none; b=LnPMBXJLhBXAmpiPiFV7YUfDuLK/dwLrIicPGN/99BJ60imxE+q7AuJMyuzKnUU2AB73mNZZ0IleueQMNVVUxFXWiCiJzGV3YIFsNIcibkp5JETIwVKAXUiVg+1Ag4vSyB+Sn0gdx4a4FtWkw9Mr5ldRjr9aNuT6OV8Evug5P6k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767601400; c=relaxed/simple; bh=9iEzgPHvQMQc1JPQHZR4+0WH0pS0RVDvpJpTVteo84E=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=AUU38NbfGlRvBNZpt3Lpg80YqgnOjH7JbAAyCowpNfPA/x9iSQWfLvI0nr5iSIwA0Kr5EaI/10nMtN5hC5qv57WDWRxrPrSIN4gpBmpaFuc/6VItpfuyGVOuV61/gh9PFJgIMYQKmdG4h9sbquA9CLqx82hweKiCe69bkDAqMLk= 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=ddGXyFUp; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=VZcWQa1q; arc=none smtp.client-ip=170.10.129.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="ddGXyFUp"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="VZcWQa1q" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767601396; 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=Ceg01Cw9H4aJK1m/G33nz2CzBje4q7tNz5vOwZlPzjQ=; b=ddGXyFUpV+ZOxT78IncITDRXo+RMY+dONX1wNmTDULiu22BGkN4H+au5jwprxAAHt2e5wK OtGWvHqaIOzCe5ouhe3BbNOAESyQ2/ON123PeM9YYtsETUL2lUPYBd3zcLDiN2ZWOqMtUG DLPh+3YRaeIptD6EX1IX7eXrHwk0aos= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-367-RnGJsiMCO2OM2PYQln7GWw-1; Mon, 05 Jan 2026 03:23:15 -0500 X-MC-Unique: RnGJsiMCO2OM2PYQln7GWw-1 X-Mimecast-MFC-AGG-ID: RnGJsiMCO2OM2PYQln7GWw_1767601394 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-47a97b785bdso95837195e9.3 for ; Mon, 05 Jan 2026 00:23:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1767601394; x=1768206194; 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=Ceg01Cw9H4aJK1m/G33nz2CzBje4q7tNz5vOwZlPzjQ=; b=VZcWQa1qe1Jsgfjpqig0asowpCApYa2eecngGEWLmC8TnpZr9mMiVTb0FNYSqZFbsc 6YO7u39UlcI8nUODOltXH4XeMzmlo2hJcsGo+AxGNg+UUfoWJok0zK8atoP1LeAOTpn/ XNUzOLQhTvYog47OacKq3ax8btPEDwfWVhzmQSRnwSGRno/Cvi98pkidMV0kJykd6R2h DwmlkMytnLHf2iWS7fv83jUjeo3EsOiHPpMAywJT6HBreDCJoWsLFTr1ryrCzK76E9PI gWquKjl8xaR5ZCBCzRKdYmxnbP+LIyrWgnDGNDy+eJIC1cI5slv16lHgOtEZMJnaFItj mC3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767601394; x=1768206194; 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=Ceg01Cw9H4aJK1m/G33nz2CzBje4q7tNz5vOwZlPzjQ=; b=ZaT5FtaRek981QYVkV+0VfdvVi1kSkVeCu7YGwbYtsCDnYjOnVU27mc4Ka9iDAIkM0 gjB6pXjYwPTpgSrvMTGGfosJhTUZFb+j7v6o58c8YUI5XBfhYbhXhJTOc6qKTsRvW/VL HQqrCQIEgfaZQoP4jBltvehlfye0DcY7wJp6Ym/kILv/B0wpomGj58j+7Is1mEqG+UVu Nqji0e+w04wnsJmUVKXwDV8m5mPsNILYHTa9mH9KBtxtBaC0UVl4R/HGfNSTupEb/B7a h1nmxxXq0QkiFiDwiSbhSIlOfKV3auI2c3hU6l79mCJzHvO1uJMY3RJ6ZjEmJGyG3VGv 7waQ== X-Forwarded-Encrypted: i=1; AJvYcCVKWZm83JS29rA1NdBY3Lpa/ekPLE20fPBHGfq3pvKNYY/2wLG8Gk8+Y1fjPFQRaiw6YkTKCBUSHFlj6jA=@vger.kernel.org X-Gm-Message-State: AOJu0YzunLRdTjaXm48aCvKkBZUPqF2HE7GJMFyylbO0ZMEFHIK7AV24 Hn32sRsDJDHTHho8As9REOBLASmtDTYt8Jif5hzMQecXbxHHyH9SHYBVXVabQmjwaarUOSlke/N RYJkPd2nOWcgXDenBcvJrZpO8iL2ylNRDkoDvxP0VTc1lLOTurFVfpusYcQnTOSUeNw== X-Gm-Gg: AY/fxX4GJXLg5rpg6l4NKFLx8k5dggt/zOB9zNXUy48Zo1EccSN46YP2s6hM63OOu07 EN4l35kUUTZXUt87tltVMVk3i97AH7iS/yxlLX4IZYeNjtKHVJ/IN2TOu6GmGi/CpXHdPViUpdW EnkFHZHzmpGgi6EALuGM/G97RCysFyKGF7gWs37CtGuGA31PY5Lwyl34VCpftx4qoFcn1TBhcx2 SCahSyusZFobIgASmyKE+DVjgTRIQhktd2kKCuo+81tZ4UJBcG6z64OMf5UNCCZOn+oNvwNlqyV z0uDqZa8BSyhLKMSAQ53PBgEnvh/xNN3YIl8CcH4b2UXo3ejcKOBHxj6Wc2YvW476+iEoS8VXD5 FeEh+aW1+knrKhRb4YZ9qhrVZ0LhcfOKoNw== X-Received: by 2002:a05:600c:8710:b0:475:da13:2568 with SMTP id 5b1f17b1804b1-47d19592102mr548338355e9.25.1767601394179; Mon, 05 Jan 2026 00:23:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IHQnvRLWDf0aCqCDaI87q/fN7cE8aCZoYxHw4jznq03tUl25BjWNTLdD3S8QBVZUoY2t9i3vg== X-Received: by 2002:a05:600c:8710:b0:475:da13:2568 with SMTP id 5b1f17b1804b1-47d19592102mr548337795e9.25.1767601393663; Mon, 05 Jan 2026 00:23:13 -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 5b1f17b1804b1-47d6d13ed34sm142315025e9.2.2026.01.05.00.23.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jan 2026 00:23:13 -0800 (PST) Date: Mon, 5 Jan 2026 03:23:10 -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 , Bartosz Golaszewski , 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 v2 05/15] dma-debug: track cache clean flag in entries Message-ID: <0ffb3513d18614539c108b4548cdfbc64274a7d1.1767601130.git.mst@redhat.com> References: Precedence: bulk X-Mailing-List: linux-crypto@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 buggy 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. Signed-off-by: Michael S. Tsirkin --- kernel/dma/debug.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c index 7e66d863d573..43d6a996d7a7 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; + enum map_err_types 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,16 @@ 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); + /* A lookup failure here after we got -EEXIST is unexpected. */ + WARN_ON(!existing); + if (existing) + *overlap_cache_clean = existing->is_cache_clean; + } spin_unlock_irqrestore(&radix_lock, flags); return rc; @@ -583,20 +596,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