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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 47F7DC47258 for ; Wed, 6 May 2020 08:23:35 +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 0A4E4206E6 for ; Wed, 6 May 2020 08:23:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="KY1XWnMf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0A4E4206E6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=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.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ejzbltoQfOEJcnso290wztLF8OPreqyvl0u4aayBJF8=; b=KY1XWnMfQUpdJL 1ur47MJKqaMFU0I8D4u69DNLRkM6xRvk5+4iRNRYffqljKFC5ezxdJVCX9h0MGICEBcWTufEF3Lnr wRyJ21ICv15l9yfvz+RCWF89YBS7byfcQxhkatmD26SXOE1oryndNOwwthGyEDbAL1aXXWAI50rtn MFP2VXUvEJuM705X4+rnVBNw7AoC42p9f7e+wUTvqVE297t9/zldbw7AgnjaWbuqBOgt4BMS/9ga9 ihf0IUH4RE28uiGK+iSMk8bZAAcPlkiY64JO2XO4kw1Mp6Q4W1dR2HMPNHhvxJABxzWro0jYWvcM/ vK6TtSzKpAbsaAfTRJzA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWFKz-0005U9-7U; Wed, 06 May 2020 08:23:29 +0000 Received: from szxga04-in.huawei.com ([45.249.212.190] helo=huawei.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWFKv-0005T1-St for linux-nvme@lists.infradead.org; Wed, 06 May 2020 08:23:27 +0000 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 071CC32915EF8542B1BD; Wed, 6 May 2020 16:23:15 +0800 (CST) Received: from huawei.com (10.175.105.27) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.487.0; Wed, 6 May 2020 16:23:05 +0800 From: Wu Bo To: , , , Subject: [PATCH] nvme/core:disable streams when get stream params failed Date: Wed, 6 May 2020 16:37:01 +0800 Message-ID: <1588754221-661597-1-git-send-email-wubo40@huawei.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.175.105.27] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200506_012326_098925_C50571CF X-CRM114-Status: UNSURE ( 8.75 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linfeilong@huawei.com, wubo40@huawei.com, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, liuzhiqiang26@huawei.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org 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; + } ctrl->nssa = le16_to_cpu(s.nssa); if (ctrl->nssa < BLK_MAX_WRITE_HINTS - 1) { -- 1.8.3.1 _______________________________________________ linux-nvme mailing list linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme