From patchwork Mon Aug 22 22:56:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 74479 Delivered-To: patches@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1802598qga; Mon, 22 Aug 2016 15:57:10 -0700 (PDT) X-Received: by 10.66.193.65 with SMTP id hm1mr47545971pac.12.1471906623888; Mon, 22 Aug 2016 15:57:03 -0700 (PDT) Return-Path: Received: from mail-pa0-x236.google.com (mail-pa0-x236.google.com. [2607:f8b0:400e:c03::236]) by mx.google.com with ESMTPS id k8si373002pab.100.2016.08.22.15.57.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Aug 2016 15:57:03 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c03::236 as permitted sender) client-ip=2607:f8b0:400e:c03::236; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c03::236 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-pa0-x236.google.com with SMTP id hb8so23062092pac.2 for ; Mon, 22 Aug 2016 15:57:03 -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=jGbwspKLNyHNbWmNmY7LTV+j8rS6M1hQD1298eaOjMY=; b=NKjlf5Ux4XJ1EauJDdMqk1rqEdlrSVLXKCJSImZ1L+aNF/WRkU5jRTykkO1lqSMjnq 8aZk/o470UsQq97rR1T03a/wog9rcD9xxaLT4rugN3cqAaWJjW3X8sPxJaCmJknCFIoU thQ1zxTs0hJeRC89X/plTDwZIHbmQ9crqo+YI= 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=jGbwspKLNyHNbWmNmY7LTV+j8rS6M1hQD1298eaOjMY=; b=dN/1tUrWbj3N+5D2ZTMBo60jmzz5pnuaL4NK3bAAz+z2luU4JYTJ42+sI3CpUWk9CD /oZEVz7xOk9nUWHB/JmGH1RzN/++4pv/FGWLF7V9mcgvtLQfVdCI33ktHP60CGC0cB/y SJwSJpzdR/7hQly06mI/yJ8En1di4S7ZmkYiSUfgyX6dXZq1WmYzbJdLJuPoBg0zI8Tt T8bxicEjGil3Ya1aBTAp6AKQXhxf4+cs+az1+NX3Ui3kAJqA1irBhZr6I+SYjf/tmRJ6 BqB3w3A4tj9gcmJBbnJBKNpZcqf1pm/uceLqeCQJt5I34mFMEWFbMmFzmMx9fciUfTtj 8VEA== X-Gm-Message-State: AEkoouuzYAA2C6a2sjb9FS9dd/kxf6ywOfX/M3rtjgDprQnvytgVPOPO8vud9qM4miEh4EoQlKs= X-Received: by 10.66.219.200 with SMTP id pq8mr47259540pac.75.1471906623606; Mon, 22 Aug 2016 15:57:03 -0700 (PDT) Return-Path: Received: from localhost.localdomain (c-73-67-244-238.hsd1.or.comcast.net. [73.67.244.238]) by smtp.gmail.com with ESMTPSA id bx9sm215851pab.17.2016.08.22.15.57.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Aug 2016 15:57:03 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Zhangfei Gao , Krzysztof Kozlowski , Maxime Ripard , Vinod Koul , Dan Williams , Mark Brown , Andy Green Subject: [RESEND][PATCH 6/7 v4] k3dma: Fix memory handling in preparation for cyclic mode Date: Mon, 22 Aug 2016 15:56:47 -0700 Message-Id: <1471906608-12418-7-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1471906608-12418-1-git-send-email-john.stultz@linaro.org> References: <1471906608-12418-1-git-send-email-john.stultz@linaro.org> With cyclic mode, the shared virt-dma logic doesn't actually manage the descriptor state, nor the calling of the descriptor free callback. This results in leaking a desc structure every time we start an audio transfer. Thus we must manage it ourselves. The k3dma driver already keeps track of the active and finished descriptors via ds_run and ds_done pointers, so cleanup how we handle those two values, so when we tear down everything in terminate_all, call free_desc on the ds_run and ds_done pointers if they are not null. NOTE: HiKey doesn't use the non-cyclic dma modes, so I'm not been able to test those modes. But with this patch we no longer leak the desc structures. Cc: Zhangfei Gao Cc: Krzysztof Kozlowski Cc: Maxime Ripard Cc: Vinod Koul Cc: Dan Williams Cc: Mark Brown Cc: Andy Green Acked-by: Zhangfei Gao Signed-off-by: John Stultz --- drivers/dma/k3dma.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) -- 1.9.1 diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index 9d96c95..8108fa1 100644 --- a/drivers/dma/k3dma.c +++ b/drivers/dma/k3dma.c @@ -212,7 +212,9 @@ static irqreturn_t k3_dma_int_handler(int irq, void *dev_id) spin_lock_irqsave(&c->vc.lock, flags); vchan_cookie_complete(&p->ds_run->vd); + WARN_ON_ONCE(p->ds_done); p->ds_done = p->ds_run; + p->ds_run = NULL; spin_unlock_irqrestore(&c->vc.lock, flags); } irq_chan |= BIT(i); @@ -253,14 +255,14 @@ static int k3_dma_start_txd(struct k3_dma_chan *c) * so vc->desc_issued only contains desc pending */ list_del(&ds->vd.node); + + WARN_ON_ONCE(c->phy->ds_run); + WARN_ON_ONCE(c->phy->ds_done); c->phy->ds_run = ds; - c->phy->ds_done = NULL; /* start dma */ k3_dma_set_desc(c->phy, &ds->desc_hw[0]); return 0; } - c->phy->ds_done = NULL; - c->phy->ds_run = NULL; return -EAGAIN; } @@ -594,6 +596,16 @@ static int k3_dma_config(struct dma_chan *chan, return 0; } +static void k3_dma_free_desc(struct virt_dma_desc *vd) +{ + struct k3_dma_desc_sw *ds = + container_of(vd, struct k3_dma_desc_sw, vd); + struct k3_dma_dev *d = to_k3_dma(vd->tx.chan->device); + + dma_pool_free(d->pool, ds->desc_hw, ds->desc_hw_lli); + kfree(ds); +} + static int k3_dma_terminate_all(struct dma_chan *chan) { struct k3_dma_chan *c = to_k3_chan(chan); @@ -617,7 +629,15 @@ static int k3_dma_terminate_all(struct dma_chan *chan) k3_dma_terminate_chan(p, d); c->phy = NULL; p->vchan = NULL; - p->ds_run = p->ds_done = NULL; + if (p->ds_run) { + k3_dma_free_desc(&p->ds_run->vd); + p->ds_run = NULL; + } + if (p->ds_done) { + k3_dma_free_desc(&p->ds_done->vd); + p->ds_done = NULL; + } + } spin_unlock_irqrestore(&c->vc.lock, flags); vchan_dma_desc_free_list(&c->vc, &head); @@ -670,16 +690,6 @@ static int k3_dma_transfer_resume(struct dma_chan *chan) return 0; } -static void k3_dma_free_desc(struct virt_dma_desc *vd) -{ - struct k3_dma_desc_sw *ds = - container_of(vd, struct k3_dma_desc_sw, vd); - struct k3_dma_dev *d = to_k3_dma(vd->tx.chan->device); - - dma_pool_free(d->pool, ds->desc_hw, ds->desc_hw_lli); - kfree(ds); -} - static const struct of_device_id k3_pdma_dt_ids[] = { { .compatible = "hisilicon,k3-dma-1.0", }, {}