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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 6D15BC7618F for ; Mon, 15 Jul 2019 14:10:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 45447206B8 for ; Mon, 15 Jul 2019 14:10:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563199832; bh=b+kDaSPGElmt9c6tYodtpHuidvasn+5V9Dd80tjOgrA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EVuvV04eV8zLeDzKa44TYOtHHUOGJLVPbRwztZUM3HgfZKTthXI30SEOuwZrV2dCX z096D6e3ScRiFZYD7XCztYCC9d+IOX38JpcrBoT9DfyLJE8L8jIy4xtwOB8sLlQjwj 8uYJu93WZncp583fFT0/3C54p3oNz7HSKHUsRKJY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388185AbfGOOKb (ORCPT ); Mon, 15 Jul 2019 10:10:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:40230 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387815AbfGOOKa (ORCPT ); Mon, 15 Jul 2019 10:10:30 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0A53C206B8; Mon, 15 Jul 2019 14:10:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563199829; bh=b+kDaSPGElmt9c6tYodtpHuidvasn+5V9Dd80tjOgrA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=piF60kpIzhGb6EoWa+DhmBcHlzawBs42UY3BB5DgcN8G5e/n4j74Bf3FKmAOrgTRl RfTW89Gjs5FLxLS37u3/pPqGN5L5oVF9NCqkqsRgOEVvjCquG3Iuk4pWRr0chGMOuu T0Y7uk1XeKVGqrzNIh7QczBSQ8FG3xG/9tRVEAZs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Minwoo Im , Chaitanya Kulkarni , Christoph Hellwig , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.1 119/219] nvme-pci: properly report state change failure in nvme_reset_work Date: Mon, 15 Jul 2019 10:02:00 -0400 Message-Id: <20190715140341.6443-119-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715140341.6443-1-sashal@kernel.org> References: <20190715140341.6443-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Minwoo Im [ Upstream commit cee6c269b016ba89c62e34d6bccb103ee2c7de4f ] If the state change to NVME_CTRL_CONNECTING fails, the dmesg is going to be like: [ 293.689160] nvme nvme0: failed to mark controller CONNECTING [ 293.689160] nvme nvme0: Removing after probe failure status: 0 Even it prints the first line to indicate the situation, the second line is not proper because the status is 0 which means normally success of the previous operation. This patch makes it indicate the proper error value when it fails. [ 25.932367] nvme nvme0: failed to mark controller CONNECTING [ 25.932369] nvme nvme0: Removing after probe failure status: -16 This situation is able to be easily reproduced by: root@target:~# rmmod nvme && modprobe nvme && rmmod nvme Signed-off-by: Minwoo Im Reviewed-by: Chaitanya Kulkarni Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 693f2a856200..21a51a0ff4d7 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2545,6 +2545,7 @@ static void nvme_reset_work(struct work_struct *work) if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_CONNECTING)) { dev_warn(dev->ctrl.device, "failed to mark controller CONNECTING\n"); + result = -EBUSY; goto out; } -- 2.20.1