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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 35E3ACA90AF for ; Tue, 12 May 2020 16:06:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1002920722 for ; Tue, 12 May 2020 16:06:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726521AbgELQGX (ORCPT ); Tue, 12 May 2020 12:06:23 -0400 Received: from verein.lst.de ([213.95.11.211]:41975 "EHLO verein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725554AbgELQGW (ORCPT ); Tue, 12 May 2020 12:06:22 -0400 Received: by verein.lst.de (Postfix, from userid 2407) id ACFB468BEB; Tue, 12 May 2020 18:06:18 +0200 (CEST) Date: Tue, 12 May 2020 18:06:18 +0200 From: Christoph Hellwig To: Wu Bo Cc: kbusch@kernel.org, axboe@fb.com, hch@lst.de, sagi@grimberg.me, linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, liuzhiqiang26@huawei.com, linfeilong@huawei.com Subject: Re: [PATCH] nvme/core:disable streams when get stream params failed Message-ID: <20200512160618.GA5403@lst.de> References: <1588754221-661597-1-git-send-email-wubo40@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1588754221-661597-1-git-send-email-wubo40@huawei.com> User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, May 06, 2020 at 04:37:01PM +0800, Wu Bo wrote: > After enable nvme streams, then if get stream params failed, > We should disable streams before return error in > nvme_configure_directives() function. > > Signed-off-by: Wu Bo > --- > drivers/nvme/host/core.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c > index f2adea9..afe1f5a 100644 > --- a/drivers/nvme/host/core.c > +++ b/drivers/nvme/host/core.c > @@ -552,8 +552,10 @@ static int nvme_configure_directives(struct nvme_ctrl *ctrl) > return ret; > > ret = nvme_get_stream_params(ctrl, &s, NVME_NSID_ALL); > - if (ret) > + if (ret) { > + nvme_disable_streams(ctrl); > return ret; > + } Please use a out_disable goto label to not duplicate the error handling with the other case that needs it.