From patchwork Mon Mar 23 15:00:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Kulhavy X-Patchwork-Id: 6073741 Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B00359F318 for ; Mon, 23 Mar 2015 15:00:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CB8CB2027D for ; Mon, 23 Mar 2015 15:00:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E70E62026D for ; Mon, 23 Mar 2015 15:00:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752423AbbCWPAq (ORCPT ); Mon, 23 Mar 2015 11:00:46 -0400 Received: from mail-wg0-f45.google.com ([74.125.82.45]:32790 "EHLO mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752251AbbCWPAo (ORCPT ); Mon, 23 Mar 2015 11:00:44 -0400 Received: by wgbcc7 with SMTP id cc7so148106712wgb.0 for ; Mon, 23 Mar 2015 08:00:42 -0700 (PDT) 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; bh=lwJJAaJ6Q4vZKfxJEmb6aZZBsQFq1jCtHo+TCLPV3Io=; b=GP/vYrgNUgVWQH3eZLzex5T92a/0ozxuqxel5XKqFCS67bDF65KEmIn9Wr5njkS0E9 B50yIg7OxUOzBi2j/m15we8bhJapKjl9smy/DTIucgqaZBSOfZug28/ri5u/gsnqewss pBvinAo0CokC4DrLErwy9sje66xhkofQyHdvVwdF8TZ2pUMSzzR79dHkjG9h7IeTggbW IseNrP0URwQTdrkPy1WZF/HIN4UE0v6fAAApKnIXRzdfVeL6pg3ABD6B+zAIJRCnnugj l84NMOCPfxtVZZHbT2advya97g0AWNp486TKfMGFkUkbEy1IcoEJwWvS+TuETPygmapZ dPdw== X-Gm-Message-State: ALoCoQkxJH+RK9iQ9tz1uD5Vb8kRcSoGD8eVdJbvIQbRcn3UnPxLtYEuBYlLlq8+LjgTLIyZxEX0 X-Received: by 10.194.60.173 with SMTP id i13mr182466784wjr.124.1427122842598; Mon, 23 Mar 2015 08:00:42 -0700 (PDT) Received: from petr-laptop.barix.local (84-72-111-243.dclient.hispeed.ch. [84.72.111.243]) by mx.google.com with ESMTPSA id l6sm1735908wjx.33.2015.03.23.08.00.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Mar 2015 08:00:41 -0700 (PDT) From: Petr Kulhavy To: vinod.koul@intel.com Cc: dan.j.williams@intel.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, peter.ujfalusi@ti.com, linux-omap@vger.kernel.org, trivial@kernel.org, Petr Kulhavy Subject: [PATCH] EDMA: TI: fixed memory leak when terminating running transfers Date: Mon, 23 Mar 2015 16:00:12 +0100 Message-Id: <1427122812-22657-1-git-send-email-petr@barix.com> X-Mailer: git-send-email 1.9.1 Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If edma_terminate_all() was called while a transfer was running (i.e. after edma_execute() but before edma_callback()) the echan->edesc was not freed. This was due to the fact that a running transfer is on none of the vchan lists: desc_submitted, desc_issued, desc_completed (edma_execute() removes it from the desc_issued list), so the vchan_dma_desc_free_list() called at the end of edma_terminate_all() didn't find it and didn't free it. This bug was found on an AM1808 based hardware (very similar to da850evm, however using the second MMC/SD controller), where intense operations on the SD card wasted the device 128MB RAM within a couple of days. Signed-off-by: Petr Kulhavy --- drivers/dma/edma.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 276157f..1465610 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -260,6 +260,14 @@ static int edma_terminate_all(struct dma_chan *chan) */ if (echan->edesc) { int cyclic = echan->edesc->cyclic; + + /* + * free the running request descriptor + * since it is on none of the vchan lists + * desc_submitted, desc_issued, desc_completed + */ + kfree(echan->edesc); + echan->edesc = NULL; edma_stop(echan->ch_num); /* Move the cyclic channel back to default queue */