From patchwork Fri Oct 4 22:26:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 175249 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1307156ill; Fri, 4 Oct 2019 15:27:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqyDjgRsWH0qoHTu2zpCdmQHchAd1InOB+DtKfSbU6IFefEYg/iE0Jog/JbG93MZwPs5qt1e X-Received: by 2002:a17:906:1e16:: with SMTP id g22mr14508481ejj.14.1570228033628; Fri, 04 Oct 2019 15:27:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570228033; cv=none; d=google.com; s=arc-20160816; b=Kx4MgeN2pH6SY20tGxDQUndBTG65IlrTxWrKkwIHX4V0NeWX0QlBwDsfXatBJFPbD2 nLOA0VhrzFoAs2GuYYAHtBSfzoMytyDVtf2n7y8A5g6h7uVwqqouXb/8FTLlqnguXTjl DocueBZlv+BLVb4B+ZAM9DJv411cZDokZWasBTIzHbZ6G//k8rYzbSoBd9kKtN1I/N7f HiD1CcfmAEFSHRZtRrmKaUShALIIPstBfhzEDEo5QhEH6JwGhGIZhTNmpOfcyXGLHcDO vG+jgwbM74z1XBtebCl+/8FZd20AQSIuzWGsoWdQN1gleQVAdHHDffEmRvEjiBsgJcAd BPug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=DB10pg/WIJaO+aJTgK4OR+kGpHxX86yfhLw/UszwpCo=; b=kF30HFtuQwXn8uY4ij1IzeN+c49i2Ez0mwYw2Y8aavC7hWFJ9HfR49TGsl9xc+gYko dqEWKnY0m+8MCjPWNe5yCKEVAK9WuA5ZkGuBoYVoJZZ+ABPWDrK6xD1Es3UP1NZHsYcC 4qHLk9KWB7+gJuAPM8R3gAohNiqY632cXXWgFOrTw40vW9XuK1yTsyZ6eHakK9Xo81Oi UmdelypX1i9TCDLyoIvIt2lHyo6g0lPB1bu+/z2SXMC2ZcAECDukHM9rtZ0ivGgcaPnv GdtYdIjUTDCsMfDVABm4Ap/yV2datv4xnigwbxUwi7Q4S79eaaDG8y5Y+U1uQh9PGbII hW1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F5uG1Agm; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o49si4389999edc.261.2019.10.04.15.27.13; Fri, 04 Oct 2019 15:27:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-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 header.s=google header.b=F5uG1Agm; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729441AbfJDW1L (ORCPT + 15 others); Fri, 4 Oct 2019 18:27:11 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:40805 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726002AbfJDW1K (ORCPT ); Fri, 4 Oct 2019 18:27:10 -0400 Received: by mail-pl1-f195.google.com with SMTP id d22so3768804pll.7 for ; Fri, 04 Oct 2019 15:27:10 -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=DB10pg/WIJaO+aJTgK4OR+kGpHxX86yfhLw/UszwpCo=; b=F5uG1Agmj1h9uJUlUsYaVzT9Nk4sqGpyY9EGmbmREWfkyCLX2Jypf/Vry8EYBqlg6y +5mmeuhecQk1H+/FUJ58m8WKZSUIoDROJ8cXuO1cXJvn/DtQTX99y99UNqV/CUfGWq8C SLXTxvc6qPmiBMbAvEABZWldwZ1/NsRYGGkdCpPAC6bXZkrlGLpbaVIa2KJrd/ryeSUT XXIocsOg0tgXtlaZzEHywwXICMIe9YedFnHjO/H7IocH1cuUcRViUrK4sRCS4QF4iFGg WyQKekfWYrwKHwUU39tkpVTyLDxjY9zrGkI6vCGtwxbHZyG1TjIYCAIyJ/jk6sDNyRf9 mTiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DB10pg/WIJaO+aJTgK4OR+kGpHxX86yfhLw/UszwpCo=; b=ECDOUHd6NACWwL1yxNsYR0TnGJZEuW6D0mSC+S29O6SaeyuTiLDLaT7uDSluTnrLGu GqnAfOMbM3Y3xROyq2VL1DSCJmL0TJPa8AvNOjljlhqkKInjz3HNJ6L/6/4oWNJWTuUD pxiYZLa11XaihDnXIeO9WzVOykxqnPw2vHAEA2qoFqzkD+IJ/xagLub/rPYONg/BK178 tUyLLzfQyxGBWJa8BqCjkTPQso1PJMCkuVK0Mowy+nsXpGIgrXcaU38V3ipYIF/Gmymu mQBkQ0OrTnfxMmWWvt8lMYR/+6J7WhPtqMpt3BPrXGkCT7KukdvwCxacLmsPilYpB0Xa xyIg== X-Gm-Message-State: APjAAAW8yWMe4zD9fwSDx9Y+xypS+HpZOH5LrL6C/95dzqoJt14Zq+Xi 0kGI4/goiLOhj86XYvi1rQU0NQ== X-Received: by 2002:a17:902:aa08:: with SMTP id be8mr3333013plb.317.1570228029737; Fri, 04 Oct 2019 15:27:09 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id x37sm6328136pgl.18.2019.10.04.15.27.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Oct 2019 15:27:08 -0700 (PDT) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2 1/6] rpmsg: glink: Fix reuse intents memory leak issue Date: Fri, 4 Oct 2019 15:26:57 -0700 Message-Id: <20191004222702.8632-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20191004222702.8632-1-bjorn.andersson@linaro.org> References: <20191004222702.8632-1-bjorn.andersson@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Arun Kumar Neelakantam Memory allocated for re-usable intents are not freed during channel cleanup which causes memory leak in system. Check and free all re-usable memory to avoid memory leak. Fixes: 933b45da5d1d ("rpmsg: glink: Add support for TX intents") Cc: stable@vger.kernel.org Tested-by: Srinivas Kandagatla Signed-off-by: Arun Kumar Neelakantam Reported-by: Srinivas Kandagatla Signed-off-by: Bjorn Andersson --- Changes since v1: - None drivers/rpmsg/qcom_glink_native.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.18.0 diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c index 621f1afd4d6b..9355ce26fd98 100644 --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c @@ -241,10 +241,19 @@ static void qcom_glink_channel_release(struct kref *ref) { struct glink_channel *channel = container_of(ref, struct glink_channel, refcount); + struct glink_core_rx_intent *tmp; unsigned long flags; + int iid; spin_lock_irqsave(&channel->intent_lock, flags); + idr_for_each_entry(&channel->liids, tmp, iid) { + kfree(tmp->data); + kfree(tmp); + } idr_destroy(&channel->liids); + + idr_for_each_entry(&channel->riids, tmp, iid) + kfree(tmp); idr_destroy(&channel->riids); spin_unlock_irqrestore(&channel->intent_lock, flags); From patchwork Fri Oct 4 22:27:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 175251 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1307278ill; Fri, 4 Oct 2019 15:27:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqwVx8Z2Reud+snjWDYS37MlbdfxaU/u7MGrrZ9BEa5xqJvcVdV+H5zqk6NM1bXi5vzc/dr2 X-Received: by 2002:a50:bb22:: with SMTP id y31mr18407796ede.58.1570228043486; Fri, 04 Oct 2019 15:27:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570228043; cv=none; d=google.com; s=arc-20160816; b=V4ae4DiNhJwd8Q+l/SkGlRsiDMmOmiD0f3zU246Vfis6q04UXAJV/mmdflJuFKgIiJ 9obqdqmH9HeObEfYGGukm3XicumaLKHZqsZkKXJh0spPg19odWdLXh3D5wop/ehq9SxY QeFv2CdoNrJWMwB+FMLQgSCiYJfMt+mJSkVJQwQzzjdXmJKAhEOUIKbrtdlGiTGsnoar TGYVmcLMU1B799QN9hqKdHNtlGQmoVuPR4lUjrlacAeNaKcxsGFK2iRdzVi/37H58XOw 587YtIpObPwYKdLEclRjgj4rECDaiRRf5nKWnlHdppOWGD4mFDxaKoZJ+W5a50zeC/HH q0gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=GFLy/0NyLkAXTIQiU1ce2NkpxRNc39jMeEi2th9+Q/o=; b=Mb8Z70rNWf28CFC77DtfkfPXbCIRQQweWPHip8B1RuXub2FOhdfqDLDkeMZNr1IiUx hOWAisdJRLctm064o08rDPTt05/2B5Q+WjDucPdNDb/em/53uJ/t8E7qR5aNu0UhYuKI 7OnWwlf2H0+a/tWOtGr9jN4ayn2GSdfcpMC2GBe9D5ejolBVUjm1r16ae7ptXjYKUo3H XQKPANGozyo2hdgJtitoLccbvtpKFoJ1l7FCKhdoM74MeQ3ovmbrbu1fsg2aT9GDgCO2 QTZWa9y/Ix4kx45iNI/U8OcZ4+dyr3YwhahFvbkbl97cAzwDqtfn9fC/matsFBFvZ2kb /KSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eMDlZ5C4; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e5si4703244ede.150.2019.10.04.15.27.23; Fri, 04 Oct 2019 15:27:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-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 header.s=google header.b=eMDlZ5C4; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388609AbfJDW1T (ORCPT + 15 others); Fri, 4 Oct 2019 18:27:19 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:40813 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388600AbfJDW1S (ORCPT ); Fri, 4 Oct 2019 18:27:18 -0400 Received: by mail-pl1-f196.google.com with SMTP id d22so3768883pll.7 for ; Fri, 04 Oct 2019 15:27:16 -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=GFLy/0NyLkAXTIQiU1ce2NkpxRNc39jMeEi2th9+Q/o=; b=eMDlZ5C4geR0qxdtOA7FQXHpGKcU764pJI+ckB/wRPRbnEdzquTg+GeL1UgEUsmnk0 jeSsXMD1cn1W6BUxFWgqVS9IbdqQe/yRGbtgFA5kPzZh/c09SFslyvmFKvlSFAtnJUJK yQ/O1ntAwl4AxLX/8GBUDX3qSznBkuf9hy9852LB2Bt34HdrHe1RPEMpTbLBJztA2Rwq Bhkg8N5Ma4UtUDVaOJhBdTy/ZL+CSAMS0Vc4pJggWaKhY/7ZFA229MdQnDpH/vwvWnxs 5BIrmixZiqVBMO3Hcu29/Akw1P2MiGQvNo08ChJ61GndxQw8ivpAbbaUl7S5kVAuMM2a gU0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GFLy/0NyLkAXTIQiU1ce2NkpxRNc39jMeEi2th9+Q/o=; b=G6XzIaInjiEugdJURapZA3PNTCVOypxqnOhGV8xdV7S1Mrhkk3M2t3k0bmsqizRWgV qzOP3XKCP7kn1KmrbDXbxAUcFT0gm1a/CaADAKDRzdYlC+twZQafnxxq0kjZPAqPBN4e 0GjS675pWCPSuLoQp5VCfzEKhUQvPrjoNy7hrdxbVyw4fX5IXMTkxzbC7YCa4PsvDgRE ktMbX6emfxq5erSoKonX+ddsbX7SYAhEVjqU6O6qYu2TxS6m3kOLZvEqdM8k50c2Fpkt OYkyj/fwfLaciRxovWjZ9VNLytkvJtkz5D6MUyr5x4rJKWkUBgb35YDWL8PGtTNB7BgK txdQ== X-Gm-Message-State: APjAAAVXk8WSSo4+JxU5BM8TKu7Z3UsbW5QfUbufa2zI3jgYLjezJ5/P dSWcmbQ7TcmYkkIwSK56DTj20w== X-Received: by 2002:a17:902:d916:: with SMTP id c22mr17525848plz.101.1570228036266; Fri, 04 Oct 2019 15:27:16 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id x37sm6328136pgl.18.2019.10.04.15.27.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Oct 2019 15:27:15 -0700 (PDT) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2 6/6] rpmsg: glink: Free pending deferred work on remove Date: Fri, 4 Oct 2019 15:27:02 -0700 Message-Id: <20191004222702.8632-7-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20191004222702.8632-1-bjorn.andersson@linaro.org> References: <20191004222702.8632-1-bjorn.andersson@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org By just cancelling the deferred rx worker during GLINK instance teardown any pending deferred commands are leaked, so free them. Fixes: b4f8e52b89f6 ("rpmsg: Introduce Qualcomm RPM glink driver") Cc: stable@vger.kernel.org Tested-by: Srinivas Kandagatla Signed-off-by: Bjorn Andersson --- Changes since v1: - None drivers/rpmsg/qcom_glink_native.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) -- 2.18.0 Acked-By: Chris Lew diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c index 4117818db6a1..862f89c128a0 100644 --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c @@ -1562,6 +1562,18 @@ static void qcom_glink_work(struct work_struct *work) } } +static void qcom_glink_cancel_rx_work(struct qcom_glink *glink) +{ + struct glink_defer_cmd *dcmd; + struct glink_defer_cmd *tmp; + + /* cancel any pending deferred rx_work */ + cancel_work_sync(&glink->rx_work); + + list_for_each_entry_safe(dcmd, tmp, &glink->rx_queue, node) + kfree(dcmd); +} + struct qcom_glink *qcom_glink_native_probe(struct device *dev, unsigned long features, struct qcom_glink_pipe *rx, @@ -1640,7 +1652,7 @@ void qcom_glink_native_remove(struct qcom_glink *glink) unsigned long flags; disable_irq(glink->irq); - cancel_work_sync(&glink->rx_work); + qcom_glink_cancel_rx_work(glink); ret = device_for_each_child(glink->dev, NULL, qcom_glink_remove_device); if (ret)