From patchwork Tue Apr 12 17:54:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 65653 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp2060439qge; Tue, 12 Apr 2016 10:57:51 -0700 (PDT) X-Received: by 10.98.10.74 with SMTP id s71mr6482719pfi.86.1460483871536; Tue, 12 Apr 2016 10:57:51 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s20si11085544pfa.216.2016.04.12.10.57.51; Tue, 12 Apr 2016 10:57:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757306AbcDLR5t (ORCPT + 29 others); Tue, 12 Apr 2016 13:57:49 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:34967 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966168AbcDLRzI (ORCPT ); Tue, 12 Apr 2016 13:55:08 -0400 Received: by mail-pf0-f182.google.com with SMTP id n1so17804437pfn.2 for ; Tue, 12 Apr 2016 10:55:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+zd/eLcG7+D6MsiMXRyyb6nI992gC3l28/bawkEe9h8=; b=O4qXrNjY6qtmJr5Jd6OerlVMZVeZD/uwG9cD883Vped+92Pu1a4mhSbwldW9rSqqST oRb0EU+F/8T0gV3TRyDKwPR5luZvFyFFQTpiHbJnI79pRW/6w+EMukr220saJlY4FnoA IV0hHTJFqsWJUasY/IBbeO1UuihfM1v2yNeME= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+zd/eLcG7+D6MsiMXRyyb6nI992gC3l28/bawkEe9h8=; b=CjNvSC3svHAcNeHCJ3eEGIVSXQC8WySvjjOF3en/SdqgIHS+eQc4isUgy8UMmFe7zN HyJ+a132S3S8VUzEZTVM7FuVnjeu9uJAnmpl697X4LDXtH90CCgRiVCImzj1fG1TqxK6 qet1BzfrXMS6mrud7kLJVUkbvTcM7RZo6j1F/pGZ5LidGIXtlkrrrj4jXE0wNupbBNi3 N9FNHMo18dr7R8ed7NFFcr05WSUgiSBtk50coSlbv13Y06r1LhENVfvvZr+OEztLt7CK 0XKVGjkx/Lr0a3QcpzV21jEovYHIebiDR6zsx78Q6r8QT+/yrowrx1HFb3nCXyupT/HE mjkQ== X-Gm-Message-State: AOPr4FUx5Y3WIUGLqb9VmIW4xNe5uMARd6CPx2MWMI9dzGKWCZGUoYzXTfzp8LQyLVdsq5hv X-Received: by 10.98.13.130 with SMTP id 2mr6438364pfn.97.1460483707476; Tue, 12 Apr 2016 10:55:07 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id p189sm24633204pfb.51.2016.04.12.10.55.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Apr 2016 10:55:06 -0700 (PDT) From: Mathieu Poirier To: linux-arm-kernel@lists.infradead.org, Suzuki.Poulose@arm.com Cc: linux-kernel@vger.kernel.org Subject: [PATCH V2 07/15] coresight: tmc: allocating memory when needed Date: Tue, 12 Apr 2016 11:54:44 -0600 Message-Id: <1460483692-25061-8-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1460483692-25061-1-git-send-email-mathieu.poirier@linaro.org> References: <1460483692-25061-1-git-send-email-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In it's current form the TMC probe() function allocates trace buffer memory at boot time, event if coresight isn't used. This is highly inefficient since trace buffers can occupy a lot of memory that could be used otherwised. This patch allocates trace buffers on the fly, when the coresight subsystem is solicited. Allocated buffers are released when traces are read using the device descriptors under /dev. Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-tmc-etf.c | 85 +++++++++++++++++++++++-- drivers/hwtracing/coresight/coresight-tmc-etr.c | 83 +++++++++++++++++++++++- drivers/hwtracing/coresight/coresight-tmc.c | 14 ---- 3 files changed, 163 insertions(+), 19 deletions(-) -- 2.5.0 diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c index 4b8f39bd478b..7cb287ef7b9e 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etf.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c @@ -16,14 +16,12 @@ */ #include +#include #include "coresight-priv.h" #include "coresight-tmc.h" void tmc_etb_enable_hw(struct tmc_drvdata *drvdata) { - /* Zero out the memory to help with debug */ - memset(drvdata->buf, 0, drvdata->size); - CS_UNLOCK(drvdata->base); /* Wait for TMCSReady bit to be set */ @@ -110,19 +108,68 @@ static void tmc_etf_disable_hw(struct tmc_drvdata *drvdata) static int tmc_enable_etf_sink(struct coresight_device *csdev, u32 mode) { + bool allocated = false; + char *buf = NULL; unsigned long flags; struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); + /* This shouldn't be happening */ + WARN_ON(mode != CS_MODE_SYSFS); + + /* + * If a buffer is already allocated *keep holding* the lock and + * jump to the fast path. Otherwise release the lock and allocate + * memory to work with. + */ spin_lock_irqsave(&drvdata->spinlock, flags); + if (drvdata->buf) + goto fast_path; + + spin_unlock_irqrestore(&drvdata->spinlock, flags); + + /* Allocating the memory here while outside of the spinlock */ + buf = kzalloc(drvdata->size, GFP_KERNEL); + if (!buf) + return -ENOMEM; + + /* Let's try again */ + spin_lock_irqsave(&drvdata->spinlock, flags); +fast_path: if (drvdata->reading) { spin_unlock_irqrestore(&drvdata->spinlock, flags); + /* + * Free allocated memory outside of the spinlock. There is + * no need to assert the validity of 'buf' since calling + * kfree(NULL) is safe. + */ + kfree(buf); return -EBUSY; } + /* + * If drvdata::buf isn't NULL, memory was allocated for a previous + * trace run but wasn't read. If so simply zero-out the memory. + * Otherwise use the memory allocated above. + * + * The memory is freed when users read the buffer using the + * /dev/xyz.{etf|etb} interface. See tmc_read_unprepare_etf() for + * details. + */ + if (drvdata->buf) { + memset(drvdata->buf, 0, drvdata->size); + } else { + allocated = true; + drvdata->buf = buf; + } + tmc_etb_enable_hw(drvdata); drvdata->enable = true; spin_unlock_irqrestore(&drvdata->spinlock, flags); + /* Free memory outside the spinlock if need be */ + if (!allocated && buf) + kfree(buf); + dev_info(drvdata->dev, "TMC-ETB/ETF enabled\n"); return 0; } @@ -223,6 +270,12 @@ int tmc_read_prepare_etb(struct tmc_drvdata *drvdata) goto out; } + /* If drvdata::buf is NULL the trace data has been read already */ + if (drvdata->buf == NULL) { + ret = -EINVAL; + goto out; + } + /* Disable the TMC if need be */ if (drvdata->enable) tmc_etb_disable_hw(drvdata); @@ -236,6 +289,7 @@ out: int tmc_read_unprepare_etb(struct tmc_drvdata *drvdata) { + char *buf = NULL; enum tmc_mode mode; unsigned long flags; @@ -254,11 +308,34 @@ int tmc_read_unprepare_etb(struct tmc_drvdata *drvdata) } /* Re-enable the TMC if need be */ - if (drvdata->enable) + if (drvdata->enable) { + /* + * The trace run will continue with the same allocated trace + * buffer. As such zero-out the buffer so that we don't end + * up with stale data. + * + * Since the tracer is still enabled drvdata::buf + * can't be NULL. + */ + memset(drvdata->buf, 0, drvdata->size); tmc_etb_enable_hw(drvdata); + } else { + /* + * The ETB/ETF is not tracing and the buffer was just read. + * As such prepare to free the trace buffer. + */ + buf = drvdata->buf; + drvdata->buf = NULL; + } drvdata->reading = false; spin_unlock_irqrestore(&drvdata->spinlock, flags); + /* + * Free allocated memory outside of the spinlock. There is no need + * to assert the validity of 'buf' since calling kfree(NULL) is safe. + */ + kfree(buf); + return 0; } diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c index 495540e9064d..6022ff26deba 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etr.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c @@ -16,6 +16,7 @@ */ #include +#include #include "coresight-priv.h" #include "coresight-tmc.h" @@ -83,19 +84,69 @@ static void tmc_etr_disable_hw(struct tmc_drvdata *drvdata) static int tmc_enable_etr_sink(struct coresight_device *csdev, u32 mode) { + bool allocated = false; unsigned long flags; + void __iomem *vaddr = NULL; + dma_addr_t paddr; struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); + /* This shouldn't be happening */ + WARN_ON(mode != CS_MODE_SYSFS); + + /* + * If a buffer is already allocated *keep holding* the lock and + * jump to the fast path. Otherwise release the lock and allocate + * memory to work with. + */ + spin_lock_irqsave(&drvdata->spinlock, flags); + if (drvdata->vaddr) + goto fast_path; + + spin_unlock_irqrestore(&drvdata->spinlock, flags); + + /* + * Contiguous memory can't be allocated while a spinlock is held. + * As such allocate memory here and free it if a buffer has already + * been allocated (from a previous session). + */ + vaddr = dma_alloc_coherent(drvdata->dev, drvdata->size, + &paddr, GFP_KERNEL); + if (!vaddr) + return -ENOMEM; + + /* Let's try again */ spin_lock_irqsave(&drvdata->spinlock, flags); +fast_path: if (drvdata->reading) { spin_unlock_irqrestore(&drvdata->spinlock, flags); + if (vaddr) + dma_free_coherent(drvdata->dev, drvdata->size, + vaddr, paddr); return -EBUSY; } + /* + * If drvdata::buf == NULL, use the memory allocated above. + * Otherwise a buffer still exists from a previous session, so + * simply use that. + */ + if (drvdata->buf == NULL) { + allocated = true; + drvdata->vaddr = vaddr; + drvdata->paddr = paddr; + drvdata->buf = drvdata->vaddr; + } + + memset(drvdata->vaddr, 0, drvdata->size); + tmc_etr_enable_hw(drvdata); drvdata->enable = true; spin_unlock_irqrestore(&drvdata->spinlock, flags); + /* Free memory outside the spinlock if need be */ + if (!allocated && vaddr) + dma_free_coherent(drvdata->dev, drvdata->size, vaddr, paddr); + dev_info(drvdata->dev, "TMC-ETR enabled\n"); return 0; } @@ -137,6 +188,12 @@ int tmc_read_prepare_etr(struct tmc_drvdata *drvdata) spin_lock_irqsave(&drvdata->spinlock, flags); + /* If drvdata::buf is NULL the trace data has been read already */ + if (drvdata->buf == NULL) { + spin_unlock_irqrestore(&drvdata->spinlock, flags); + return -EINVAL; + } + /* Disable the TMC if need be */ if (drvdata->enable) tmc_etr_disable_hw(drvdata); @@ -150,6 +207,8 @@ int tmc_read_prepare_etr(struct tmc_drvdata *drvdata) int tmc_read_unprepare_etr(struct tmc_drvdata *drvdata) { unsigned long flags; + dma_addr_t paddr; + void __iomem *vaddr = NULL; /* config types are set a boot time and never change */ if (drvdata->config_type != TMC_CONFIG_TYPE_ETR) @@ -158,11 +217,33 @@ int tmc_read_unprepare_etr(struct tmc_drvdata *drvdata) spin_lock_irqsave(&drvdata->spinlock, flags); /* RE-enable the TMC if need be */ - if (drvdata->enable) + if (drvdata->enable) { + /* + * The trace run will continue with the same allocated trace + * buffer. As such zero-out the buffer so that we don't end + * up with stale data. + * + * Since the tracer is still enabled drvdata::buf + * can't be NULL. + */ + memset(drvdata->buf, 0, drvdata->size); tmc_etr_enable_hw(drvdata); + } else { + /* + * The ETR is not tracing and the buffer was just read. + * As such prepare to free the trace buffer. + */ + vaddr = drvdata->vaddr; + paddr = drvdata->paddr; + drvdata->buf = NULL; + } drvdata->reading = false; spin_unlock_irqrestore(&drvdata->spinlock, flags); + /* Free allocated memory out side of the spinlock */ + if (vaddr) + dma_free_coherent(drvdata->dev, drvdata->size, vaddr, paddr); + return 0; } diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c index f7e385f18e5f..ae336641518f 100644 --- a/drivers/hwtracing/coresight/coresight-tmc.c +++ b/drivers/hwtracing/coresight/coresight-tmc.c @@ -319,20 +319,6 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) pm_runtime_put(&adev->dev); - if (drvdata->config_type == TMC_CONFIG_TYPE_ETR) { - drvdata->vaddr = dma_alloc_coherent(dev, drvdata->size, - &drvdata->paddr, GFP_KERNEL); - if (!drvdata->vaddr) - return -ENOMEM; - - memset(drvdata->vaddr, 0, drvdata->size); - drvdata->buf = drvdata->vaddr; - } else { - drvdata->buf = devm_kzalloc(dev, drvdata->size, GFP_KERNEL); - if (!drvdata->buf) - return -ENOMEM; - } - desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL); if (!desc) { ret = -ENOMEM;