From: "Isaac J. Manjarres" <isaacmanjarres@google.com>
To: stable@vger.kernel.org, Joerg Roedel <joro@8bytes.org>,
Will Deacon <will@kernel.org>,
Lu Baolu <baolu.lu@linux.intel.com>,
Tom Murphy <murphyt7@tcd.ie>
Cc: "Isaac J. Manjarres" <isaacmanjarres@google.com>,
Saravana Kannan <saravanak@google.com>,
Joerg Roedel <jroedel@suse.de>,
kernel-team@android.com, iommu@lists.linux-foundation.org,
iommu@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 5.15.y] iommu/dma: Trace bounce buffer usage when mapping buffers
Date: Mon, 22 Jan 2024 12:37:54 -0800 [thread overview]
Message-ID: <20240122203758.1435127-1-isaacmanjarres@google.com> (raw)
In-Reply-To: <2024012226-unmanned-marshy-5819@gregkh>
When commit 82612d66d51d ("iommu: Allow the dma-iommu api to
use bounce buffers") was introduced, it did not add the logic
for tracing the bounce buffer usage from iommu_dma_map_page().
All of the users of swiotlb_tbl_map_single() trace their bounce
buffer usage, except iommu_dma_map_page(). This makes it difficult
to track SWIOTLB usage from that function. Thus, trace bounce buffer
usage from iommu_dma_map_page().
Fixes: 82612d66d51d ("iommu: Allow the dma-iommu api to use bounce buffers")
Cc: stable@vger.kernel.org # v5.15+
Cc: Tom Murphy <murphyt7@tcd.ie>
Cc: Lu Baolu <baolu.lu@linux.intel.com>
Cc: Saravana Kannan <saravanak@google.com>
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
Link: https://lore.kernel.org/r/20231208234141.2356157-1-isaacmanjarres@google.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
(cherry picked from commit a63c357b9fd56ad5fe64616f5b22835252c6a76a)
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
---
drivers/iommu/dma-iommu.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index 48c6f7ff4aef..8cd63e6ccd2c 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -25,6 +25,7 @@
#include <linux/vmalloc.h>
#include <linux/crash_dump.h>
#include <linux/dma-direct.h>
+#include <trace/events/swiotlb.h>
struct iommu_dma_msi_page {
struct list_head list;
@@ -817,6 +818,8 @@ static dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page,
void *padding_start;
size_t padding_size, aligned_size;
+ trace_swiotlb_bounced(dev, phys, size, swiotlb_force);
+
aligned_size = iova_align(iovad, size);
phys = swiotlb_tbl_map_single(dev, phys, size, aligned_size,
iova_mask(iovad), dir, attrs);
--
2.43.0.429.g432eaa2c6b-goog
next parent reply other threads:[~2024-01-22 20:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <2024012226-unmanned-marshy-5819@gregkh>
2024-01-22 20:37 ` Isaac J. Manjarres [this message]
2024-01-22 20:44 ` Greg KH
2024-06-13 10:31 ` Bibek Kumar Patro
2024-06-13 11:15 ` Greg KH
2024-06-13 17:40 ` Bibek Kumar Patro
2024-06-14 5:18 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240122203758.1435127-1-isaacmanjarres@google.com \
--to=isaacmanjarres@google.com \
--cc=baolu.lu@linux.intel.com \
--cc=iommu@lists.linux-foundation.org \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=jroedel@suse.de \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=murphyt7@tcd.ie \
--cc=saravanak@google.com \
--cc=stable@vger.kernel.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®