drm/ttm: Add DMA map/unmap tracepoint (v3)
Subsystems (4)
PATCH 1/2 drm/ttm: Add DMA map/unmap tracepoint (v3)
Also exports two functions that vendor drivers can call to trace DMA mappings. This is meant to help translate IOMMU mappings of bus addresses back to physical pages.
Used by the umr amdgpu debugger for instance.
(v2): Use dev_name() to get PCI path instead.
(v3): Use correct types for dma/phys addresses
--- drivers/gpu/drm/ttm/Makefile | 4 +- drivers/gpu/drm/ttm/ttm_debug.c | 75 ++++++++++++++++++++++++++++++ drivers/gpu/drm/ttm/ttm_trace.h | 87 +++++++++++++++++++++++++++++++++++ drivers/gpu/drm/ttm/ttm_tracepoints.c | 46 ++++++++++++++++++ include/drm/ttm/ttm_debug.h | 31 +++++++++++++ 5 files changed, 241 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/ttm/ttm_debug.c create mode 100644 drivers/gpu/drm/ttm/ttm_trace.h create mode 100644 drivers/gpu/drm/ttm/ttm_tracepoints.c create mode 100644 include/drm/ttm/ttm_debug.h
drivers/gpu/drm/ttm/Makefile +2 -2
@@ -1,11 +1,11 @@ # # Makefile for the drm device driver. This driver provides support for the -ccflags-y := -Iinclude/drm +ccflags-y := -Iinclude/drm -I$(src)/. ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \ ttm_bo_util.o ttm_bo_vm.o ttm_module.o \ ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o \ - ttm_bo_manager.o ttm_page_alloc_dma.o + ttm_bo_manager.o ttm_page_alloc_dma.o ttm_debug.o ttm_tracepoints.o ttm-$(CONFIG_AGP) += ttm_agp_backend.o obj-$(CONFIG_DRM_TTM) += ttm.o
drivers/gpu/drm/ttm/ttm_debug.c new file +75 -0
75 lines not on this page · raw message
drivers/gpu/drm/ttm/ttm_trace.h new file +87 -0
87 lines not on this page · raw message
drivers/gpu/drm/ttm/ttm_tracepoints.c new file +46 -0
46 lines not on this page · raw message
include/drm/ttm/ttm_debug.h new file +31 -0
@@ -0,0 +1,31 @@ +/************************************************************************** +* +* Copyright (c) 2017 Advanced Micro Devices, Inc. +* All Rights Reserved. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the +* "Software"), to deal in the Software without restriction, including +* without limitation the rights to use, copy, modify, merge, publish, +* distribute, sub license, and/or sell copies of the Software, and to +* permit persons to whom the Software is furnished to do so, subject to +* the following conditions: +* +* The above copyright notice and this permission notice (including the +* next paragraph) shall be included in all copies or substantial portions +* of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, +* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +* USE OR OTHER DEALINGS IN THE SOFTWARE. +* +**************************************************************************/ +/* +* Authors: Tom St Denis <[email protected]> +*/ +extern void ttm_trace_dma_map (struct device *dev,struct ttm_dma_tt *tt); +extern void ttm_trace_dma_unmap (struct device *dev,struct ttm_dma_tt *tt);
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/2 drm/amd/amdgpu: Remove AMDGPU tracepoint and use new TTM tracepoint (v2)
Switches the AMDGPU driver over to the TTM tracepoint and removes our old one. Now you can enable traces before loading the module and trace all mappings.
(v2): Use struct device instead of pci in trace.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 56 ------------------------------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 21 ++---------- 2 files changed, 3 insertions(+), 74 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +0 -56
@@ -14,62 +14,6 @@#define AMDGPU_JOB_GET_TIMELINE_NAME (job) \ job->base.s_fence->finished.ops->get_timeline_name(&job->base.s_fence->finished) -TRACE_EVENT (amdgpu_ttm_tt_populate, - TP_PROTO(struct amdgpu_device *adev, uint64_t dma_address, uint64_t phys_address), -TP_ARGS (adev, dma_address, phys_address), -TP_STRUCT__entry ( - __field(uint16_t, domain) - __field(uint8_t, bus) - __field(uint8_t, slot) - __field(uint8_t, func) - __field(uint64_t, dma) -__field (uint64_t, phys) - ), -TP_fast_assign ( - __entry->domain = pci_domain_nr(adev->pdev->bus); - __entry->bus = adev->pdev->bus->number; - __entry->slot = PCI_SLOT(adev->pdev->devfn); - __entry->func = PCI_FUNC(adev->pdev->devfn); - __entry->dma = dma_address; - __entry->phys = phys_address; - ), -TP_printk ("%04x:%02x:%02x.%x: 0x%llx => 0x%llx" , - (unsigned )__entry->domain, - (unsigned )__entry->bus, - (unsigned )__entry->slot, - (unsigned )__entry->func, - (unsigned long long )__entry->dma, - (unsigned long long )__entry->phys) -); - -TRACE_EVENT (amdgpu_ttm_tt_unpopulate, - TP_PROTO(struct amdgpu_device *adev, uint64_t dma_address, uint64_t phys_address), -TP_ARGS (adev, dma_address, phys_address), -TP_STRUCT__entry ( - __field(uint16_t, domain) - __field(uint8_t, bus) - __field(uint8_t, slot) - __field(uint8_t, func) - __field(uint64_t, dma) -__field (uint64_t, phys) - ), -TP_fast_assign ( - __entry->domain = pci_domain_nr(adev->pdev->bus); - __entry->bus = adev->pdev->bus->number; - __entry->slot = PCI_SLOT(adev->pdev->devfn); - __entry->func = PCI_FUNC(adev->pdev->devfn); - __entry->dma = dma_address; - __entry->phys = phys_address; - ), -TP_printk ("%04x:%02x:%02x.%x: 0x%llx => 0x%llx" , - (unsigned )__entry->domain, - (unsigned )__entry->bus, - (unsigned )__entry->slot, - (unsigned )__entry->func, - (unsigned long long )__entry->dma, - (unsigned long long )__entry->phys) -); - TRACE_EVENT(amdgpu_mm_rreg, TP_PROTO(unsigned did, uint32_t reg, uint32_t value), TP_ARGS(did, reg, value),
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -18
@@ -34,6 +34,7 @@#include <ttm/ttm_placement.h> #include <ttm/ttm_module.h> #include <ttm/ttm_page_alloc.h> +#include <ttm/ttm_debug.h> #include <drm/drmP.h> #include <drm/amdgpu_drm.h> #include <linux/seq_file.h>
@@ -667,32 +668,16 @@ static void amdgpu_trace_dma_map(struct ttm_tt *ttm) {struct amdgpu_device *adev =amdgpu_ttm_adev (ttm->bdev);struct amdgpu_ttm_tt *gtt = (void *)ttm; -unsigned i; -if (unlikely (trace_amdgpu_ttm_tt_populate_enabled ())) { -for (i =0 ; i < ttm->num_pages; i++) { -trace_amdgpu_ttm_tt_populate ( - adev, - gtt->ttm.dma_address[i], -page_to_phys (ttm->pages[i])); - } - } +ttm_trace_dma_map (adev->dev, >t->ttm); }static void amdgpu_trace_dma_unmap (struct ttm_tt *ttm) {struct amdgpu_device *adev =amdgpu_ttm_adev (ttm->bdev);struct amdgpu_ttm_tt *gtt = (void *)ttm; -unsigned i; -if (unlikely (trace_amdgpu_ttm_tt_unpopulate_enabled ())) { -for (i =0 ; i < ttm->num_pages; i++) { -trace_amdgpu_ttm_tt_unpopulate ( - adev, - gtt->ttm.dma_address[i], -page_to_phys (ttm->pages[i])); - } - } +ttm_trace_dma_unmap (adev->dev, >t->ttm); }/* prepare the sg table with the user pages */
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx