From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932973AbeAYCp4 (ORCPT ); Wed, 24 Jan 2018 21:45:56 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:50788 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751762AbeAYCpz (ORCPT ); Wed, 24 Jan 2018 21:45:55 -0500 Subject: Re: [PATCH RESENT] nvme-pci: introduce RECONNECTING state to mark initializing procedure To: keith.busch@intel.com, axboe@fb.com, hch@lst.de, sagi@grimberg.me, maxg@mellanox.com, james.smart@broadcom.com Cc: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org References: <1516629796-2919-1-git-send-email-jianchao.w.wang@oracle.com> From: "jianchao.wang" Message-ID: <73d8d789-b7af-85b1-0c5e-7cbc002c1c43@oracle.com> Date: Thu, 25 Jan 2018 10:33:41 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <1516629796-2919-1-git-send-email-jianchao.w.wang@oracle.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8784 signatures=668655 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1801250033 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Keith If you have time, can have a look at this. That's really appreciated and thanks in advance. :) Jianchao On 01/22/2018 10:03 PM, Jianchao Wang wrote: > After Sagi's commit (nvme-rdma: fix concurrent reset and reconnect), > both nvme-fc/rdma have following pattern: > RESETTING - quiesce blk-mq queues, teardown and delete queues/ > connections, clear out outstanding IO requests... > RECONNECTING - establish new queues/connections and some other > initializing things. > Introduce RECONNECTING to nvme-pci transport to do the same mark. > Then we get a coherent state definition among nvme pci/rdma/fc > transports. > > Suggested-by: James Smart > Reviewed-by: James Smart > Signed-off-by: Jianchao Wang > --- > drivers/nvme/host/core.c | 2 +- > drivers/nvme/host/pci.c | 19 +++++++++++++++++-- > 2 files changed, 18 insertions(+), 3 deletions(-) > > diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c > index 230cc09..23b3e53 100644 > --- a/drivers/nvme/host/core.c > +++ b/drivers/nvme/host/core.c > @@ -242,7 +242,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl, > switch (new_state) { > case NVME_CTRL_ADMIN_ONLY: > switch (old_state) { > - case NVME_CTRL_RESETTING: > + case NVME_CTRL_RECONNECTING: > changed = true; > /* FALLTHRU */ > default: > diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c > index 45f843d..05344be 100644 > --- a/drivers/nvme/host/pci.c > +++ b/drivers/nvme/host/pci.c > @@ -1138,9 +1138,14 @@ static bool nvme_should_reset(struct nvme_dev *dev, u32 csts) > */ > bool nssro = dev->subsystem && (csts & NVME_CSTS_NSSRO); > > - /* If there is a reset ongoing, we shouldn't reset again. */ > - if (dev->ctrl.state == NVME_CTRL_RESETTING) > + /* If there is a reset/reinit ongoing, we shouldn't reset again. */ > + switch (dev->ctrl.state) { > + case NVME_CTRL_RESETTING: > + case NVME_CTRL_RECONNECTING: > return false; > + default: > + break; > + } > > /* We shouldn't reset unless the controller is on fatal error state > * _or_ if we lost the communication with it. > @@ -2304,6 +2309,16 @@ static void nvme_reset_work(struct work_struct *work) > if (dev->ctrl.ctrl_config & NVME_CC_ENABLE) > nvme_dev_disable(dev, false); > > + /* > + * Introduce RECONNECTING state from nvme-fc/rdma transports to mark the > + * initializing procedure here. > + */ > + if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_RECONNECTING)) { > + dev_warn(dev->ctrl.device, > + "failed to mark controller RECONNECTING\n"); > + goto out; > + } > + > result = nvme_pci_enable(dev); > if (result) > goto out; >