From nobody Sat Apr 11 12:29:56 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6452DC19F2A for ; Thu, 11 Aug 2022 11:40:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235004AbiHKLkK (ORCPT ); Thu, 11 Aug 2022 07:40:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234994AbiHKLkI (ORCPT ); Thu, 11 Aug 2022 07:40:08 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0D1926106 for ; Thu, 11 Aug 2022 04:40:07 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 41747612CB for ; Thu, 11 Aug 2022 11:40:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57569C433D7; Thu, 11 Aug 2022 11:40:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660218006; bh=Z4qaRS2jDH1FfZ/YS8lbGKxY62ovUELq+Igus94QIo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XNK1wq1zBKZV7iIrv9+dfXQG9IdsrrStB38yqyMV5buuOPWHohrq8jQGa88pVRsqi rbZNHtk0jV0iASP3FTrDhmyYlHZCrisxkw4GbYkq5SfXaj5cUjVxVBPAjMDW4wjiKk r2T2yGj2n3MQbabYqNA/lS1upxV6SabcebC0I/az22+M5CXpcS7JwqKQpBpBsV/+4C uCfWlNLmGT28hxAdT8nM9YFXlWiUnaZs+WgGPiLwRSsynIWjIOBHgjSsD1z88WxamY BpUUJ4TpKRXnSMT9MxZWkqb0FIPW1ok0Z6AA77o4DPhmnK8TI5CZNbKVDoPEu1eNbe sdDaqATYq0LTw== From: Oded Gabbay To: rostedt@goodmis.org Cc: linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, Ohad Sharabi Subject: [PATCH 1/3] habanalabs: define trace events Date: Thu, 11 Aug 2022 14:39:51 +0300 Message-Id: <20220811113953.1963412-2-ogabbay@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220811113953.1963412-1-ogabbay@kernel.org> References: <20220811113953.1963412-1-ogabbay@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Ohad Sharabi This patch adds trace events for habanalabs driver to gain all the benefits such an infrastructure can supply. The following events were added: - MMU map/unmap: to be able to track driver's memory allocations - DMA alloc/free: to track our DMA allocation the above trace points in conjunction will help us map the device memory usage as well as to be able to track memory violations. Signed-off-by: Ohad Sharabi Acked-by: Oded Gabbay Signed-off-by: Oded Gabbay Reviewed-by: Steven Rostedt (Google) --- MAINTAINERS | 1 + .../misc/habanalabs/common/habanalabs_drv.c | 3 + include/trace/events/habanalabs.h | 90 +++++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 include/trace/events/habanalabs.h diff --git a/MAINTAINERS b/MAINTAINERS index b7221f4143cb..7b2fc3463cae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8873,6 +8873,7 @@ T: git https://git.kernel.org/pub/scm/linux/kernel/gi= t/ogabbay/linux.git F: Documentation/ABI/testing/debugfs-driver-habanalabs F: Documentation/ABI/testing/sysfs-driver-habanalabs F: drivers/misc/habanalabs/ +F: include/trace/events/habanalabs.h F: include/uapi/misc/habanalabs.h =20 HACKRF MEDIA DRIVER diff --git a/drivers/misc/habanalabs/common/habanalabs_drv.c b/drivers/misc= /habanalabs/common/habanalabs_drv.c index 8026793d9083..e12148428731 100644 --- a/drivers/misc/habanalabs/common/habanalabs_drv.c +++ b/drivers/misc/habanalabs/common/habanalabs_drv.c @@ -14,6 +14,9 @@ #include #include =20 +#define CREATE_TRACE_POINTS +#include + #define HL_DRIVER_AUTHOR "HabanaLabs Kernel Driver Team" =20 #define HL_DRIVER_DESC "Driver for HabanaLabs's AI Accelerators" diff --git a/include/trace/events/habanalabs.h b/include/trace/events/haban= alabs.h new file mode 100644 index 000000000000..4fb592247ae8 --- /dev/null +++ b/include/trace/events/habanalabs.h @@ -0,0 +1,90 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * Copyright 2016-2021 HabanaLabs, Ltd. + * All Rights Reserved. + * + */ + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM habanalabs + +#if !defined(_TRACE_HABANALABS_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_HABANALABS_H + +#include + +DECLARE_EVENT_CLASS(habanalabs_mmu_template, + TP_PROTO(struct device *dev, u64 virt_addr, u64 phys_addr, u32 page_size,= bool flush_pte), + + TP_ARGS(dev, virt_addr, phys_addr, page_size, flush_pte), + + TP_STRUCT__entry( + __string(dname, dev_name(dev)) + __field(u64, virt_addr) + __field(u64, phys_addr) + __field(u32, page_size) + __field(u8, flush_pte) + ), + + TP_fast_assign( + __assign_str(dname, dev_name(dev)); + __entry->virt_addr =3D virt_addr; + __entry->phys_addr =3D phys_addr; + __entry->page_size =3D page_size; + __entry->flush_pte =3D flush_pte ? 1 : 0; + ), + + TP_printk("%s: vaddr: %#llx, paddr: %#llx, psize: %#x, flush: %u", + __get_str(dname), + __entry->virt_addr, + __entry->phys_addr, + __entry->page_size, + __entry->flush_pte) +); + +DEFINE_EVENT(habanalabs_mmu_template, habanalabs_mmu_map, + TP_PROTO(struct device *dev, u64 virt_addr, u64 phys_addr, u32 page_size,= bool flush_pte), + TP_ARGS(dev, virt_addr, phys_addr, page_size, flush_pte)); + +DEFINE_EVENT(habanalabs_mmu_template, habanalabs_mmu_unmap, + TP_PROTO(struct device *dev, u64 virt_addr, u64 phys_addr, u32 page_size,= bool flush_pte), + TP_ARGS(dev, virt_addr, phys_addr, page_size, flush_pte)); + +DECLARE_EVENT_CLASS(habanalabs_dma_alloc_template, + TP_PROTO(struct device *dev, u64 cpu_addr, u64 dma_addr, size_t size), + + TP_ARGS(dev, cpu_addr, dma_addr, size), + + TP_STRUCT__entry( + __string(dname, dev_name(dev)) + __field(u64, cpu_addr) + __field(u64, dma_addr) + __field(u32, size) + ), + + TP_fast_assign( + __assign_str(dname, dev_name(dev)); + __entry->cpu_addr =3D cpu_addr; + __entry->dma_addr =3D dma_addr; + __entry->size =3D size; + ), + + TP_printk("%s: cpu_addr: %#llx, dma_addr: %#llx, size: %#x", + __get_str(dname), + __entry->cpu_addr, + __entry->dma_addr, + __entry->size) +); + +DEFINE_EVENT(habanalabs_dma_alloc_template, habanalabs_dma_alloc, + TP_PROTO(struct device *dev, u64 cpu_addr, u64 dma_addr, size_t size), + TP_ARGS(dev, cpu_addr, dma_addr, size)); + +DEFINE_EVENT(habanalabs_dma_alloc_template, habanalabs_dma_free, + TP_PROTO(struct device *dev, u64 cpu_addr, u64 dma_addr, size_t size), + TP_ARGS(dev, cpu_addr, dma_addr, size)); + +#endif /* if !defined(_TRACE_HABANALABS_H) || defined(TRACE_HEADER_MULTI_R= EAD) */ + +/* This part must be outside protection */ +#include --=20 2.25.1 From nobody Sat Apr 11 12:29:56 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F10DC19F2A for ; Thu, 11 Aug 2022 11:40:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234965AbiHKLkR (ORCPT ); Thu, 11 Aug 2022 07:40:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235019AbiHKLkO (ORCPT ); Thu, 11 Aug 2022 07:40:14 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32B6D2A94E for ; Thu, 11 Aug 2022 04:40:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D6960B82008 for ; Thu, 11 Aug 2022 11:40:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 39EAFC433C1; Thu, 11 Aug 2022 11:40:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660218008; bh=jPHPCbb8J3hHIWeS73AXO0ijMmGt+cW0kQ2jbZLCWkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rvztIFa/XPc8E0DgQ9p0gmb/W8HyAnWIUksdgz6evzLNXzOetqR1vESSL5dXwAZcl +9SzVmiFX5CDKbf3bB1QGt867Ak/fXWP+JZOidLbQMUaF+mn4R4f1MssLGLf3YbNcj YP7dwjTf/mllThvMW1/xZAK0TTTim5KEEZBrA2tICDW2AlSE0PpvfDnNbGvdCPwwhb 5ZDMDcshQm0JTME+Fk2adtHeC6uBNnaycRugFtO0XJh+dHYAsAQh4qD4CAypiL6gRj MSsW6cXcVGCwZpyGulgAjWlaZ4/DYfWwgzVIN+WnckRc+PqRjLlANLR6jh6vx2Njhv nSKCX6RvOBMzA== From: Oded Gabbay To: rostedt@goodmis.org Cc: linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, Ohad Sharabi Subject: [PATCH 2/3] habanalabs: trace MMU map/unmap page Date: Thu, 11 Aug 2022 14:39:52 +0300 Message-Id: <20220811113953.1963412-3-ogabbay@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220811113953.1963412-1-ogabbay@kernel.org> References: <20220811113953.1963412-1-ogabbay@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Ohad Sharabi This patch utilize the defined tracepoint to trace the MMU's pages map/unmap operations. Signed-off-by: Ohad Sharabi Reviewed-by: Oded Gabbay Signed-off-by: Oded Gabbay --- drivers/misc/habanalabs/common/mmu/mmu.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/misc/habanalabs/common/mmu/mmu.c b/drivers/misc/habana= labs/common/mmu/mmu.c index 60740de47b34..60d2a3f8af13 100644 --- a/drivers/misc/habanalabs/common/mmu/mmu.c +++ b/drivers/misc/habanalabs/common/mmu/mmu.c @@ -9,6 +9,8 @@ =20 #include "../habanalabs.h" =20 +#include + /** * hl_mmu_get_funcs() - get MMU functions structure * @hdev: habanalabs device structure. @@ -259,7 +261,12 @@ int hl_mmu_unmap_page(struct hl_ctx *ctx, u64 virt_add= r, u32 page_size, bool flu if (flush_pte) mmu_funcs->flush(ctx); =20 - return rc; + if (rc) + return rc; + + trace_habanalabs_mmu_unmap(hdev->dev, virt_addr, 0, page_size, flush_pte); + + return 0; } =20 /* @@ -344,6 +351,8 @@ int hl_mmu_map_page(struct hl_ctx *ctx, u64 virt_addr, = u64 phys_addr, u32 page_s if (flush_pte) mmu_funcs->flush(ctx); =20 + trace_habanalabs_mmu_map(hdev->dev, virt_addr, phys_addr, page_size, flus= h_pte); + return 0; =20 err: --=20 2.25.1 From nobody Sat Apr 11 12:29:56 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD3C3C19F2A for ; Thu, 11 Aug 2022 11:40:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235053AbiHKLkV (ORCPT ); Thu, 11 Aug 2022 07:40:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235008AbiHKLkP (ORCPT ); Thu, 11 Aug 2022 07:40:15 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B0DDDF9 for ; Thu, 11 Aug 2022 04:40:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 04772B82060 for ; Thu, 11 Aug 2022 11:40:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DAD9C433D7; Thu, 11 Aug 2022 11:40:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660218010; bh=UbxKtPwdDmtUwCcze+RUbPoWu0eXsP/mpEAuHDM1BvM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s0PMdpTmrwT8HsIVX33ErLrL51QlwLT5AGSSfJ9HnbX9lMnF0SYud5+gB/r0dAgdm RNGGb/RYeH4gLP+AQ4fhy7kuzqpEfUTie5KthDDQgcOKOtA8aCe+lT2oDxj7kaUpuC C/iHxR+vhxME5XerHYwDNuTHNhWYvZHRNcwrDuoF9oK7UvDJt7TG+BSNc21Iyzepfy aJSCTlcrivqB7BAMcBm4ATnpMbdZM86LBPDGLJFldo9jkzBFonOSM+PcQsbi3Zm2be WBOAHRRgjupMx5vgkMsjSRowGzbV5gfGXtI+aJkyVD/2kyBp1V2MauQLGkTJAD7N7o QI1/YeNvXWMVQ== From: Oded Gabbay To: rostedt@goodmis.org Cc: linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, Ohad Sharabi Subject: [PATCH 3/3] habanalabs: trace DMA allocations Date: Thu, 11 Aug 2022 14:39:53 +0300 Message-Id: <20220811113953.1963412-4-ogabbay@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220811113953.1963412-1-ogabbay@kernel.org> References: <20220811113953.1963412-1-ogabbay@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Ohad Sharabi This patch add tracepoints in the code for DMA allocation. The main purpose is to be able to cross data with the map operations and determine whether memory violation occurred, for example free DMA allocation before unmapping it from device memory. To achieve this the DMA alloc/free code flows were refactored so that a single DMA tracepoint will catch many flows. To get better understanding of what happened in the DMA allocations the real allocating function is added to the trace as well. Signed-off-by: Ohad Sharabi Reviewed-by: Oded Gabbay Signed-off-by: Oded Gabbay --- drivers/misc/habanalabs/common/device.c | 47 +++++++++++++-------- drivers/misc/habanalabs/common/habanalabs.h | 40 ++++++++++++++---- include/trace/events/habanalabs.h | 19 +++++---- 3 files changed, 72 insertions(+), 34 deletions(-) diff --git a/drivers/misc/habanalabs/common/device.c b/drivers/misc/habanal= abs/common/device.c index ab2497b6d164..1179173f6095 100644 --- a/drivers/misc/habanalabs/common/device.c +++ b/drivers/misc/habanalabs/common/device.c @@ -13,6 +13,8 @@ #include #include =20 +#include + #define HL_RESET_DELAY_USEC 10000 /* 10ms */ =20 enum dma_alloc_type { @@ -97,7 +99,8 @@ static int hl_access_sram_dram_region(struct hl_device *h= dev, u64 addr, u64 *val } =20 static void *hl_dma_alloc_common(struct hl_device *hdev, size_t size, dma_= addr_t *dma_handle, - gfp_t flag, enum dma_alloc_type alloc_type) + gfp_t flag, enum dma_alloc_type alloc_type, + const char *caller) { void *ptr; =20 @@ -113,11 +116,16 @@ static void *hl_dma_alloc_common(struct hl_device *hd= ev, size_t size, dma_addr_t break; } =20 + if (!ZERO_OR_NULL_PTR(ptr)) + trace_habanalabs_dma_alloc(hdev->dev, (u64) (uintptr_t) ptr, *dma_handle= , size, + caller); + return ptr; } =20 static void hl_asic_dma_free_common(struct hl_device *hdev, size_t size, v= oid *cpu_addr, - dma_addr_t dma_handle, enum dma_alloc_type alloc_type) + dma_addr_t dma_handle, enum dma_alloc_type alloc_type, + const char *caller) { switch (alloc_type) { case DMA_ALLOC_COHERENT: @@ -130,39 +138,44 @@ static void hl_asic_dma_free_common(struct hl_device = *hdev, size_t size, void *c hdev->asic_funcs->asic_dma_pool_free(hdev, cpu_addr, dma_handle); break; } + + trace_habanalabs_dma_free(hdev->dev, (u64) (uintptr_t) cpu_addr, dma_hand= le, size, caller); } =20 -void *hl_asic_dma_alloc_coherent(struct hl_device *hdev, size_t size, dma_= addr_t *dma_handle, - gfp_t flag) +void *hl_asic_dma_alloc_coherent_caller(struct hl_device *hdev, size_t siz= e, dma_addr_t *dma_handle, + gfp_t flag, const char *caller) { - return hl_dma_alloc_common(hdev, size, dma_handle, flag, DMA_ALLOC_COHERE= NT); + return hl_dma_alloc_common(hdev, size, dma_handle, flag, DMA_ALLOC_COHERE= NT, caller); } =20 -void hl_asic_dma_free_coherent(struct hl_device *hdev, size_t size, void *= cpu_addr, - dma_addr_t dma_handle) +void hl_asic_dma_free_coherent_caller(struct hl_device *hdev, size_t size,= void *cpu_addr, + dma_addr_t dma_handle, const char *caller) { - hl_asic_dma_free_common(hdev, size, cpu_addr, dma_handle, DMA_ALLOC_COHER= ENT); + hl_asic_dma_free_common(hdev, size, cpu_addr, dma_handle, DMA_ALLOC_COHER= ENT, caller); } =20 -void *hl_cpu_accessible_dma_pool_alloc(struct hl_device *hdev, size_t size= , dma_addr_t *dma_handle) +void *hl_cpu_accessible_dma_pool_alloc_caller(struct hl_device *hdev, size= _t size, + dma_addr_t *dma_handle, const char *caller) { - return hl_dma_alloc_common(hdev, size, dma_handle, 0, DMA_ALLOC_CPU_ACCES= SIBLE); + return hl_dma_alloc_common(hdev, size, dma_handle, 0, DMA_ALLOC_CPU_ACCES= SIBLE, caller); } =20 -void hl_cpu_accessible_dma_pool_free(struct hl_device *hdev, size_t size, = void *vaddr) +void hl_cpu_accessible_dma_pool_free_caller(struct hl_device *hdev, size_t= size, void *vaddr, + const char *caller) { - hl_asic_dma_free_common(hdev, size, vaddr, 0, DMA_ALLOC_CPU_ACCESSIBLE); + hl_asic_dma_free_common(hdev, size, vaddr, 0, DMA_ALLOC_CPU_ACCESSIBLE, c= aller); } =20 -void *hl_asic_dma_pool_zalloc(struct hl_device *hdev, size_t size, gfp_t m= em_flags, - dma_addr_t *dma_handle) +void *hl_asic_dma_pool_zalloc_caller(struct hl_device *hdev, size_t size, = gfp_t mem_flags, + dma_addr_t *dma_handle, const char *caller) { - return hl_dma_alloc_common(hdev, size, dma_handle, mem_flags, DMA_ALLOC_P= OOL); + return hl_dma_alloc_common(hdev, size, dma_handle, mem_flags, DMA_ALLOC_P= OOL, caller); } =20 -void hl_asic_dma_pool_free(struct hl_device *hdev, void *vaddr, dma_addr_t= dma_addr) +void hl_asic_dma_pool_free_caller(struct hl_device *hdev, void *vaddr, dma= _addr_t dma_addr, + const char *caller) { - hl_asic_dma_free_common(hdev, 0, vaddr, dma_addr, DMA_ALLOC_POOL); + hl_asic_dma_free_common(hdev, 0, vaddr, dma_addr, DMA_ALLOC_POOL, caller); } =20 int hl_dma_map_sgtable(struct hl_device *hdev, struct sg_table *sgt, enum = dma_data_direction dir) diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/hab= analabs/common/habanalabs.h index 237a887b3a43..6e65ca05a1a0 100644 --- a/drivers/misc/habanalabs/common/habanalabs.h +++ b/drivers/misc/habanalabs/common/habanalabs.h @@ -143,6 +143,25 @@ enum hl_mmu_enablement { =20 #define HL_MAX_DCORES 8 =20 +/* DMA alloc/free wrappers */ +#define hl_asic_dma_alloc_coherent(hdev, size, dma_handle, flags) \ + hl_asic_dma_alloc_coherent_caller(hdev, size, dma_handle, flags, __func__) + +#define hl_cpu_accessible_dma_pool_alloc(hdev, size, dma_handle) \ + hl_cpu_accessible_dma_pool_alloc_caller(hdev, size, dma_handle, __func__) + +#define hl_asic_dma_pool_zalloc(hdev, size, mem_flags, dma_handle) \ + hl_asic_dma_pool_zalloc_caller(hdev, size, mem_flags, dma_handle, __func_= _) + +#define hl_asic_dma_free_coherent(hdev, size, cpu_addr, dma_handle) \ + hl_asic_dma_free_coherent_caller(hdev, size, cpu_addr, dma_handle, __func= __) + +#define hl_cpu_accessible_dma_pool_free(hdev, size, vaddr) \ + hl_cpu_accessible_dma_pool_free_caller(hdev, size, vaddr, __func__) + +#define hl_asic_dma_pool_free(hdev, vaddr, dma_addr) \ + hl_asic_dma_pool_free_caller(hdev, vaddr, dma_addr, __func__) + /* * Reset Flags * @@ -3444,15 +3463,18 @@ static inline bool hl_mem_area_crosses_range(u64 ad= dress, u32 size, } =20 uint64_t hl_set_dram_bar_default(struct hl_device *hdev, u64 addr); -void *hl_asic_dma_alloc_coherent(struct hl_device *hdev, size_t size, dma_= addr_t *dma_handle, - gfp_t flag); -void hl_asic_dma_free_coherent(struct hl_device *hdev, size_t size, void *= cpu_addr, - dma_addr_t dma_handle); -void *hl_cpu_accessible_dma_pool_alloc(struct hl_device *hdev, size_t size= , dma_addr_t *dma_handle); -void hl_cpu_accessible_dma_pool_free(struct hl_device *hdev, size_t size, = void *vaddr); -void *hl_asic_dma_pool_zalloc(struct hl_device *hdev, size_t size, gfp_t m= em_flags, - dma_addr_t *dma_handle); -void hl_asic_dma_pool_free(struct hl_device *hdev, void *vaddr, dma_addr_t= dma_addr); +void *hl_asic_dma_alloc_coherent_caller(struct hl_device *hdev, size_t siz= e, dma_addr_t *dma_handle, + gfp_t flag, const char *caller); +void hl_asic_dma_free_coherent_caller(struct hl_device *hdev, size_t size,= void *cpu_addr, + dma_addr_t dma_handle, const char *caller); +void *hl_cpu_accessible_dma_pool_alloc_caller(struct hl_device *hdev, size= _t size, + dma_addr_t *dma_handle, const char *caller); +void hl_cpu_accessible_dma_pool_free_caller(struct hl_device *hdev, size_t= size, void *vaddr, + const char *caller); +void *hl_asic_dma_pool_zalloc_caller(struct hl_device *hdev, size_t size, = gfp_t mem_flags, + dma_addr_t *dma_handle, const char *caller); +void hl_asic_dma_pool_free_caller(struct hl_device *hdev, void *vaddr, dma= _addr_t dma_addr, + const char *caller); int hl_dma_map_sgtable(struct hl_device *hdev, struct sg_table *sgt, enum = dma_data_direction dir); void hl_dma_unmap_sgtable(struct hl_device *hdev, struct sg_table *sgt, enum dma_data_direction dir); diff --git a/include/trace/events/habanalabs.h b/include/trace/events/haban= alabs.h index 4fb592247ae8..f74c5864a5de 100644 --- a/include/trace/events/habanalabs.h +++ b/include/trace/events/habanalabs.h @@ -51,15 +51,16 @@ DEFINE_EVENT(habanalabs_mmu_template, habanalabs_mmu_un= map, TP_ARGS(dev, virt_addr, phys_addr, page_size, flush_pte)); =20 DECLARE_EVENT_CLASS(habanalabs_dma_alloc_template, - TP_PROTO(struct device *dev, u64 cpu_addr, u64 dma_addr, size_t size), + TP_PROTO(struct device *dev, u64 cpu_addr, u64 dma_addr, size_t size, con= st char *caller), =20 - TP_ARGS(dev, cpu_addr, dma_addr, size), + TP_ARGS(dev, cpu_addr, dma_addr, size, caller), =20 TP_STRUCT__entry( __string(dname, dev_name(dev)) __field(u64, cpu_addr) __field(u64, dma_addr) __field(u32, size) + __field(const char *, caller) ), =20 TP_fast_assign( @@ -67,22 +68,24 @@ DECLARE_EVENT_CLASS(habanalabs_dma_alloc_template, __entry->cpu_addr =3D cpu_addr; __entry->dma_addr =3D dma_addr; __entry->size =3D size; + __entry->caller =3D caller; ), =20 - TP_printk("%s: cpu_addr: %#llx, dma_addr: %#llx, size: %#x", + TP_printk("%s: cpu_addr: %#llx, dma_addr: %#llx, size: %#x, caller: %s", __get_str(dname), __entry->cpu_addr, __entry->dma_addr, - __entry->size) + __entry->size, + __entry->caller) ); =20 DEFINE_EVENT(habanalabs_dma_alloc_template, habanalabs_dma_alloc, - TP_PROTO(struct device *dev, u64 cpu_addr, u64 dma_addr, size_t size), - TP_ARGS(dev, cpu_addr, dma_addr, size)); + TP_PROTO(struct device *dev, u64 cpu_addr, u64 dma_addr, size_t size, con= st char *caller), + TP_ARGS(dev, cpu_addr, dma_addr, size, caller)); =20 DEFINE_EVENT(habanalabs_dma_alloc_template, habanalabs_dma_free, - TP_PROTO(struct device *dev, u64 cpu_addr, u64 dma_addr, size_t size), - TP_ARGS(dev, cpu_addr, dma_addr, size)); + TP_PROTO(struct device *dev, u64 cpu_addr, u64 dma_addr, size_t size, con= st char *caller), + TP_ARGS(dev, cpu_addr, dma_addr, size, caller)); =20 #endif /* if !defined(_TRACE_HABANALABS_H) || defined(TRACE_HEADER_MULTI_R= EAD) */ =20 --=20 2.25.1