From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4097C43460 for ; Wed, 7 Apr 2021 16:11:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9FBC4610E8 for ; Wed, 7 Apr 2021 16:11:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236483AbhDGQLL (ORCPT ); Wed, 7 Apr 2021 12:11:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239031AbhDGQLK (ORCPT ); Wed, 7 Apr 2021 12:11:10 -0400 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75E24C061760 for ; Wed, 7 Apr 2021 09:11:01 -0700 (PDT) Received: by mail-pf1-x42a.google.com with SMTP id a12so13246184pfc.7 for ; Wed, 07 Apr 2021 09:11:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=DiVOnoRaOKWzvOjowAkfK5gmTOofYlhr3RJ2hit0GwM=; b=m6AJkn/rVeDyMIthqlgy8KQvKd3h+thfr5PHrr2NxQ7yoFq/nwmn8amXFL4OlD3i4X b4sUW79MlVz2GxS59lNlvqJUMMVdVKpV8JCJHu0pEsaia2VRVGPgKbfSRAJZ96vOQJo1 zWvqWycS5RcdPA4/xRdi6vyFgtj+5CMYEgYqIUASdOJPdcUIFR0n2UiQ31WSor1XjN2R KXVLuVwwSKFQyFImJ+YOoVibjCPABKxSuYvuVVTijpkKwsFwve8z/5XfItsgtcVeQjrK XPdIPTIxii3FJVutW7I/heAvz7/6mf0RSfNbsbrdPd28kBQyFrN6x+8tMqXrgpVKG+uR b1xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=DiVOnoRaOKWzvOjowAkfK5gmTOofYlhr3RJ2hit0GwM=; b=UA/3NZaz8tyl7PxHY1bQUqEbUpZ4zrKsLyZ2tqwbB09yvXxCGllM8rF2D+pSGFBQdP py8JR2ENZRlp5bbZZfF1vXdDyHpZdhdeUFtpeGCpTMWochLF5Dej168wMKr53uR3Bjqt 8z4ehIgmITiq1265q5ZAPAfdzQTyZ27z3UfW62FWdLlaMNYMt9E2ma9MzrYOJ3dPmT31 YZ/Q466bMTT6aL3DQBcDUXQrKH6gocLvPuWMJ/f6oU4FJ7JZWh7TzvFuiRuTCp7bPqDe H0GPN53NFPeWkBcbX9UYu+MWcMFrW6GBJpokbBAj/ygxsWiBe+RyW4EML1NrZwUIYY3s AC6A== X-Gm-Message-State: AOAM533ohT3Q3eutwHRe0K1w9u55T8+IaEUrUMZyXo9bnuXr4uaOaLQ0 UN9Bo1PuPScOEVGWGLl/sPHLHQ== X-Google-Smtp-Source: ABdhPJxqGgOrRHzTvoA6k1tboczIppwck3D1i8PrK5gDRMlnpocoVFqHNJb6tTx9nV2ErqjVaK8nyA== X-Received: by 2002:aa7:9804:0:b029:1f1:5340:77c1 with SMTP id e4-20020aa798040000b02901f1534077c1mr3584600pfl.72.1617811860852; Wed, 07 Apr 2021 09:11:00 -0700 (PDT) Received: from xps15 (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id q19sm22379844pff.91.2021.04.07.09.11.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 09:11:00 -0700 (PDT) Date: Wed, 7 Apr 2021 10:10:58 -0600 From: Mathieu Poirier To: Suman Anna Cc: Bjorn Andersson , Grzegorz Jaszczyk , Jan Kiszka , Vignesh Raghavendra , Lokesh Vutla , linux-remoteproc@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 3/3] remoteproc: pru: Fix and cleanup firmware interrupt mapping logic Message-ID: <20210407161058.GA418374@xps15> References: <20210407155641.5501-1-s-anna@ti.com> <20210407155641.5501-4-s-anna@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210407155641.5501-4-s-anna@ti.com> Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org On Wed, Apr 07, 2021 at 10:56:41AM -0500, Suman Anna wrote: > The PRU firmware interrupt mappings are configured and unconfigured in > .start() and .stop() callbacks respectively using the variables 'evt_count' > and a 'mapped_irq' pointer. These variables are modified only during these > callbacks but are not re-initialized/reset properly during unwind or > failure paths. These stale values caused a kernel crash while stopping a > PRU remoteproc running a different firmware with no events on a subsequent > run after a previous run that was running a firmware with events. > > Fix this crash by ensuring that the evt_count is 0 and the mapped_irq > pointer is set to NULL in pru_dispose_irq_mapping(). Also, reset these > variables properly during any failures in the .start() callback. While > at this, the pru_dispose_irq_mapping() callsites are all made to look > the same, moving any conditional logic to inside the function. > > Fixes: c75c9fdac66e ("remoteproc: pru: Add support for PRU specific interrupt configuration") > Reported-by: Vignesh Raghavendra > Signed-off-by: Suman Anna > --- > v2: > - Fixed two additional cleanup paths in pru_handle_intrmap() > addressing Mathieu's review comment > v1: https://patchwork.kernel.org/project/linux-remoteproc/patch/20210323223839.17464-4-s-anna@ti.com/ > > drivers/remoteproc/pru_rproc.c | 22 +++++++++++++++++----- > 1 file changed, 17 insertions(+), 5 deletions(-) > Reviewed-by: Mathieu Poirier > diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c > index 87b43976c51b..04863bf23db8 100644 > --- a/drivers/remoteproc/pru_rproc.c > +++ b/drivers/remoteproc/pru_rproc.c > @@ -266,12 +266,17 @@ static void pru_rproc_create_debug_entries(struct rproc *rproc) > > static void pru_dispose_irq_mapping(struct pru_rproc *pru) > { > - while (pru->evt_count--) { > + if (!pru->mapped_irq) > + return; > + > + while (pru->evt_count) { > + pru->evt_count--; > if (pru->mapped_irq[pru->evt_count] > 0) > irq_dispose_mapping(pru->mapped_irq[pru->evt_count]); > } > > kfree(pru->mapped_irq); > + pru->mapped_irq = NULL; > } > > /* > @@ -307,8 +312,10 @@ static int pru_handle_intrmap(struct rproc *rproc) > pru->evt_count = rsc->num_evts; > pru->mapped_irq = kcalloc(pru->evt_count, sizeof(unsigned int), > GFP_KERNEL); > - if (!pru->mapped_irq) > + if (!pru->mapped_irq) { > + pru->evt_count = 0; > return -ENOMEM; > + } > > /* > * parse and fill in system event to interrupt channel and > @@ -317,13 +324,19 @@ static int pru_handle_intrmap(struct rproc *rproc) > * corresponding sibling PRUSS INTC node. > */ > parent = of_get_parent(dev_of_node(pru->dev)); > - if (!parent) > + if (!parent) { > + kfree(pru->mapped_irq); > + pru->mapped_irq = NULL; > + pru->evt_count = 0; > return -ENODEV; > + } > > irq_parent = of_get_child_by_name(parent, "interrupt-controller"); > of_node_put(parent); > if (!irq_parent) { > kfree(pru->mapped_irq); > + pru->mapped_irq = NULL; > + pru->evt_count = 0; > return -ENODEV; > } > > @@ -398,8 +411,7 @@ static int pru_rproc_stop(struct rproc *rproc) > pru_control_write_reg(pru, PRU_CTRL_CTRL, val); > > /* dispose irq mapping - new firmware can provide new mapping */ > - if (pru->mapped_irq) > - pru_dispose_irq_mapping(pru); > + pru_dispose_irq_mapping(pru); > > return 0; > } > -- > 2.30.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15926C433B4 for ; Wed, 7 Apr 2021 16:12:40 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9F6E8611BE for ; Wed, 7 Apr 2021 16:12:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F6E8611BE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JOFpI6KAyP3i82Xf20goJQaFlFR9s4c2O+E3EBcqsx4=; b=Jrwg0fjir0kmxGvnJELQeIvtA xd0YjGSBC9TYigHyZuvBs0WegAjDmyarrzI1421Qnf1iiVNm4LgTPPNEnU/HVejmlbfj9wfS2NLVR RBwkjtDjQzA4o0xClHJBn4wS+NOdBGvISLQWDZ1G/YznJ+CjZKcrvuG4vOi92nDdSLMtOnvPaqAOw aN6tfjybMaY4Ga9lHwNxmsCOkIzQxGqZBz8Wt6kT2ndEK3/xuQjivUDjLv9maroSnMNqsWzHitCJn mL91KfCvuA3lHEOVPd3LWCIxxJlPga2lDClNzh0RdDGDwFnF7td7KX6NZXpbXnwySCMqfnG7rCA2F c8dQbwvow==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lUAlu-005Q6k-QN; Wed, 07 Apr 2021 16:11:15 +0000 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lUAli-005Q4h-QW for linux-arm-kernel@lists.infradead.org; Wed, 07 Apr 2021 16:11:05 +0000 Received: by mail-pg1-x536.google.com with SMTP id t22so6276620pgu.0 for ; Wed, 07 Apr 2021 09:11:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=DiVOnoRaOKWzvOjowAkfK5gmTOofYlhr3RJ2hit0GwM=; b=m6AJkn/rVeDyMIthqlgy8KQvKd3h+thfr5PHrr2NxQ7yoFq/nwmn8amXFL4OlD3i4X b4sUW79MlVz2GxS59lNlvqJUMMVdVKpV8JCJHu0pEsaia2VRVGPgKbfSRAJZ96vOQJo1 zWvqWycS5RcdPA4/xRdi6vyFgtj+5CMYEgYqIUASdOJPdcUIFR0n2UiQ31WSor1XjN2R KXVLuVwwSKFQyFImJ+YOoVibjCPABKxSuYvuVVTijpkKwsFwve8z/5XfItsgtcVeQjrK XPdIPTIxii3FJVutW7I/heAvz7/6mf0RSfNbsbrdPd28kBQyFrN6x+8tMqXrgpVKG+uR b1xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=DiVOnoRaOKWzvOjowAkfK5gmTOofYlhr3RJ2hit0GwM=; b=Ub/NvIJ0ssOUq27LP/TKVuFYC7XoBri6PxaN8Q5lJe5AlMGHWpqsUyCgl2Vcdc52Cp QhBDamB14xaYEsOA5+ORbX5xT5b6CRYiUCByxvI14+PFx5A2Nq6xaN2arYkrm7yISUGZ 5JSzYl3NdGqtrwCwyNKjQJ6ZYXL9wu1TpeeMegX68sY8JmOD8Ubmff0QvrC8Y5nkOuRp HuJoagpVCu4K4j8SgklLweJ1kIrvzUighInwhm5SE2V5BjxsZa1ipeeQ4i4v50iFePdJ qiOKoAOkWu8zjyIxaMU+bV2lqYZ51El34emN0Nb3l2Uckw7OCw4y3KhPjvOVOVrSU37o CtbA== X-Gm-Message-State: AOAM531wVagcvBjY/GfaAgIFtdWPcugto5SsjmVkY2R9mUWeoCvfuPmF xkaV0T1OBSRJ5SXgsS0mudY9iQ== X-Google-Smtp-Source: ABdhPJxqGgOrRHzTvoA6k1tboczIppwck3D1i8PrK5gDRMlnpocoVFqHNJb6tTx9nV2ErqjVaK8nyA== X-Received: by 2002:aa7:9804:0:b029:1f1:5340:77c1 with SMTP id e4-20020aa798040000b02901f1534077c1mr3584600pfl.72.1617811860852; Wed, 07 Apr 2021 09:11:00 -0700 (PDT) Received: from xps15 (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id q19sm22379844pff.91.2021.04.07.09.11.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 09:11:00 -0700 (PDT) Date: Wed, 7 Apr 2021 10:10:58 -0600 From: Mathieu Poirier To: Suman Anna Cc: Bjorn Andersson , Grzegorz Jaszczyk , Jan Kiszka , Vignesh Raghavendra , Lokesh Vutla , linux-remoteproc@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 3/3] remoteproc: pru: Fix and cleanup firmware interrupt mapping logic Message-ID: <20210407161058.GA418374@xps15> References: <20210407155641.5501-1-s-anna@ti.com> <20210407155641.5501-4-s-anna@ti.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210407155641.5501-4-s-anna@ti.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210407_171103_075635_78B00623 X-CRM114-Status: GOOD ( 25.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Apr 07, 2021 at 10:56:41AM -0500, Suman Anna wrote: > The PRU firmware interrupt mappings are configured and unconfigured in > .start() and .stop() callbacks respectively using the variables 'evt_count' > and a 'mapped_irq' pointer. These variables are modified only during these > callbacks but are not re-initialized/reset properly during unwind or > failure paths. These stale values caused a kernel crash while stopping a > PRU remoteproc running a different firmware with no events on a subsequent > run after a previous run that was running a firmware with events. > > Fix this crash by ensuring that the evt_count is 0 and the mapped_irq > pointer is set to NULL in pru_dispose_irq_mapping(). Also, reset these > variables properly during any failures in the .start() callback. While > at this, the pru_dispose_irq_mapping() callsites are all made to look > the same, moving any conditional logic to inside the function. > > Fixes: c75c9fdac66e ("remoteproc: pru: Add support for PRU specific interrupt configuration") > Reported-by: Vignesh Raghavendra > Signed-off-by: Suman Anna > --- > v2: > - Fixed two additional cleanup paths in pru_handle_intrmap() > addressing Mathieu's review comment > v1: https://patchwork.kernel.org/project/linux-remoteproc/patch/20210323223839.17464-4-s-anna@ti.com/ > > drivers/remoteproc/pru_rproc.c | 22 +++++++++++++++++----- > 1 file changed, 17 insertions(+), 5 deletions(-) > Reviewed-by: Mathieu Poirier > diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c > index 87b43976c51b..04863bf23db8 100644 > --- a/drivers/remoteproc/pru_rproc.c > +++ b/drivers/remoteproc/pru_rproc.c > @@ -266,12 +266,17 @@ static void pru_rproc_create_debug_entries(struct rproc *rproc) > > static void pru_dispose_irq_mapping(struct pru_rproc *pru) > { > - while (pru->evt_count--) { > + if (!pru->mapped_irq) > + return; > + > + while (pru->evt_count) { > + pru->evt_count--; > if (pru->mapped_irq[pru->evt_count] > 0) > irq_dispose_mapping(pru->mapped_irq[pru->evt_count]); > } > > kfree(pru->mapped_irq); > + pru->mapped_irq = NULL; > } > > /* > @@ -307,8 +312,10 @@ static int pru_handle_intrmap(struct rproc *rproc) > pru->evt_count = rsc->num_evts; > pru->mapped_irq = kcalloc(pru->evt_count, sizeof(unsigned int), > GFP_KERNEL); > - if (!pru->mapped_irq) > + if (!pru->mapped_irq) { > + pru->evt_count = 0; > return -ENOMEM; > + } > > /* > * parse and fill in system event to interrupt channel and > @@ -317,13 +324,19 @@ static int pru_handle_intrmap(struct rproc *rproc) > * corresponding sibling PRUSS INTC node. > */ > parent = of_get_parent(dev_of_node(pru->dev)); > - if (!parent) > + if (!parent) { > + kfree(pru->mapped_irq); > + pru->mapped_irq = NULL; > + pru->evt_count = 0; > return -ENODEV; > + } > > irq_parent = of_get_child_by_name(parent, "interrupt-controller"); > of_node_put(parent); > if (!irq_parent) { > kfree(pru->mapped_irq); > + pru->mapped_irq = NULL; > + pru->evt_count = 0; > return -ENODEV; > } > > @@ -398,8 +411,7 @@ static int pru_rproc_stop(struct rproc *rproc) > pru_control_write_reg(pru, PRU_CTRL_CTRL, val); > > /* dispose irq mapping - new firmware can provide new mapping */ > - if (pru->mapped_irq) > - pru_dispose_irq_mapping(pru); > + pru_dispose_irq_mapping(pru); > > return 0; > } > -- > 2.30.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel