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=-14.1 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 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 6E5BBC4707F for ; Fri, 28 May 2021 03:52:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 2FEE6611CD for ; Fri, 28 May 2021 03:52:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2FEE6611CD 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=bombadil.20210309; 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=XI8ZinJpiTsbZO3IT+2KFpAWYry/SgVKMHgtwsnNUS4=; b=hrQ2KiDVcQvI8C Qn47VLyaTckwKg11EeZn5bWfEYbLKF1NjRy3MUDsk+NLK88ZdrUR6jgi1id08Gz/HgtTbvg8y4jYF ysPm8jLxv9pbTH6GHbawIW1z9xFnoTQS2nfwvBDoJTfFQ41RMyXrTE/uIqWf5n4WUKA+8LIjipX1h vMRQxAO+Dj4Xzqb6d9tnb6R8xj4uQqgHvUTz3UAmB3YPv9ets8Bthx8Sr9XWx/aq4e0EEX/L/BNTH uoIed30ABCN41PjYdNdCt8kV7U4GJirMROk0CSz9/3AJx1id9VQn6S9unGIICu+UNHhqQMH5f1Nyu bweaQXWH5bJc2flv5WPA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lmTWZ-00BhT2-7i; Fri, 28 May 2021 03:51:03 +0000 Received: from mail-ot1-x329.google.com ([2607:f8b0:4864:20::329]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lmTWU-00BhRR-Ry for linux-arm-kernel@lists.infradead.org; Fri, 28 May 2021 03:51:00 +0000 Received: by mail-ot1-x329.google.com with SMTP id v19-20020a0568301413b0290304f00e3d88so2299225otp.4 for ; Thu, 27 May 2021 20:50:58 -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=asRlje0goAhFcEJxLUA9BBxp84jlRep9Pz0YvxsytNw=; b=nfADAGzbgpY5NA6+jelsBMfutNd8ztua/oK7zSpFSidti7UyaUmCZFpCdpdqXgWCOP 16YUZThLFJXDGxmY0e6aLtilolZ10AVYNb8xXgrHlsDJ9LCsEAGFGVP7dgh6z/PTAIaR G+tiLxz4Ba4ChEAbTbgQEQvarmbckCnZD9RF+0blclzFEhy+Q/4rEMpR25feVE+DvXyF MFCoZvcBmhfy3gx7dLfeUj2RrMhLP4+iUXMLlzySRSG3ZHsDIUsafqvstmoiIlloHRx1 C9hX7NMiyqt55ra0fW6SxKL2tXUeiozrLeRUDKNAlrBNhSF107doS8x6CH5TsMVWyQy4 Zl1A== 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=asRlje0goAhFcEJxLUA9BBxp84jlRep9Pz0YvxsytNw=; b=ZxEV3BoVUlJIyfdchDm3KeWrQRiVh5/aatRys8Q1w2rAsdsw16Cp0eDsjcmCn0fpHP lxEusmJ+PE9pgANER3UU+U3D3tR7mxG48ZbPKIVTKIsTE/JOzlzUIYJfuVw9Kkq6BTel RGzu/2DMOns0rvlT6vaCNh9DWTmCv4yXPq0QrfyIYZvQXSFlqDfZp11TTVL93tNJrHFl h+C0kJhrVvWxSRtC2SOdaTn7+sgtjKxSCcnofOezw/j/AvjGItvvonNj7dX0kK69dz0q M8z6TyIUfutGq0LMf9+jc1ghHLu2e1HET9saev1YXy32V6oWi5gV1ab2Yt0a/l5A18EQ dfzg== X-Gm-Message-State: AOAM532z4FZRAQZ8wp+c3Am87Xy0zoZNlGJjqz9aAVcaO6e7JbqbpBnR R2YzVGDeGSdqp7w8coOe9C04xg== X-Google-Smtp-Source: ABdhPJxwBt+4tqhG35N+FAveVQMOtsF/8nAal7iWx1N0eQlYBcRpavgW1FadCaaLPuNq6iagLqNhNQ== X-Received: by 2002:a05:6830:2143:: with SMTP id r3mr5545599otd.165.1622173857906; Thu, 27 May 2021 20:50:57 -0700 (PDT) Received: from builder.lan (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id b19sm881138oib.46.2021.05.27.20.50.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 20:50:57 -0700 (PDT) Date: Thu, 27 May 2021 22:50:55 -0500 From: Bjorn Andersson To: Siddharth Gupta Cc: ohad@wizery.com, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, psodagud@codeaurora.org, stable@vger.kernel.org Subject: Re: [PATCH 3/3] remoteproc: core: Cleanup device in case of failure Message-ID: References: <1621284349-22752-1-git-send-email-sidgup@codeaurora.org> <1621284349-22752-4-git-send-email-sidgup@codeaurora.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1621284349-22752-4-git-send-email-sidgup@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210527_205058_940021_4D408CB5 X-CRM114-Status: GOOD ( 22.07 ) 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 Mon 17 May 15:45 CDT 2021, Siddharth Gupta wrote: > When a failure occurs in rproc_add() it returns an error, but does > not cleanup after itself. This change adds the failure path in such > cases. > > Signed-off-by: Siddharth Gupta > --- > drivers/remoteproc/remoteproc_core.c | 15 ++++++++++++--- > 1 file changed, 12 insertions(+), 3 deletions(-) > > diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c > index 45d09bf..6f5fa81 100644 > --- a/drivers/remoteproc/remoteproc_core.c > +++ b/drivers/remoteproc/remoteproc_core.c > @@ -2326,8 +2326,10 @@ int rproc_add(struct rproc *rproc) > return ret; > > ret = device_add(dev); > - if (ret < 0) > - return ret; > + if (ret < 0) { > + put_device(dev); > + goto rproc_remove_cdev; > + } > > dev_info(dev, "%s is available\n", rproc->name); > > @@ -2338,7 +2340,7 @@ int rproc_add(struct rproc *rproc) > if (rproc->auto_boot) { > ret = rproc_trigger_auto_boot(rproc); > if (ret < 0) > - return ret; > + goto rproc_remove_dev; > } > > /* expose to rproc_get_by_phandle users */ > @@ -2347,6 +2349,13 @@ int rproc_add(struct rproc *rproc) > mutex_unlock(&rproc_list_mutex); > > return 0; > + > +rproc_remove_dev: > + rproc_delete_debug_dir(rproc); > + device_del(dev); > +rproc_remove_cdev: > + rproc_char_device_remove(rproc); I'm confused, shouldn't this function just do cdev_del()? __unregister_chrdev() seems to do more than unroll what cdev_add() did... Apart from this, I think the patch looks good. Really nice to see you tidy this up! Regards, Bjorn > + return ret; > } > EXPORT_SYMBOL(rproc_add); > > -- > Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel