From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE93636826E for ; Sun, 12 Jul 2026 02:25:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783823138; cv=none; b=eP9Em2Ptyf0bur2s7zHjMuorSaPqDtpOrwTVLdECPQIdhcsmdDaAdGz16J+AC3bjf8JHvgAreNsC3ZaMgADnie3jR6yj3CekAB2LDLsv69e2ZTWyUnKBbEOdxnM0LTDIk8PAcLSQ7DeBj0p1T/RRLUdkVihTun2SircpYab0x08= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783823138; c=relaxed/simple; bh=TO+ylZNkfWqNxxUrT07xoPKSkmWQo4gW9pLhAf7bPAc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qEV4fJp8CTZruff+Dpf2RoGVuJDB52MRWe18YyDnSPCUCDZvwBOFkY55Xr68LEAwFfdmUkzPMO+DhXKMoWWpINLT4s7NMZ8/MVS9fLMAsM9cCB21FUf9lyZ7E4kWviwNwKPp6QEwuX8WLORHJkdtkcRGRnF1z3uMqkOPxm4dw10= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com; spf=pass smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=Q3nP3oC8; arc=none smtp.client-ip=209.85.216.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="Q3nP3oC8" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-381c51fde6bso2049690a91.2 for ; Sat, 11 Jul 2026 19:25:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1783823136; x=1784427936; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=N4ikmBr5mw7p6ycSVAdXvIpwXhHnLZzoeuY1Qg3gT2Y=; b=Q3nP3oC8UiC+Tg+etHcdxJBk0EV8snY/EsjKgxEs0EX2V0FTlZB+GFicYjDrB9+vzU aTHWeKnkJ34c7eEKVijPWnEwIbgjzf7wO7F5yQt59WZG86dqyKhUfPpmkihR/F+rBzTQ q4WvNIE0ALhyv2IC2xT/PzEGicUBvW1RgNrRztouHz/ojK78dAuR/PJ3TRCiYY2itcBf Zt3SC/4bRFrk6UouHvK0822BP7klov1M74yCbr7OyacgG4kLo9NoWPpMfzF+vRWHK4+b BURrUf0BWrYoALtJoxt9G2Lis7uykHyUPaAWzXuzppETzocuQpGijVlBTYOTrrgks0/p HEJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783823136; x=1784427936; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=N4ikmBr5mw7p6ycSVAdXvIpwXhHnLZzoeuY1Qg3gT2Y=; b=BPJM5p7VzK2Riv6DqM4Qmgj+0octpjL7kIS12ravTWKmhSIGQIEALcKeCYwNDWzLPo pAYx0IhzNY3f3gx3thKEWvVG3DRr6NipINrl2RCsF2YO5m8+R4FVg5ZKucpHT8JOIDuE 142Z1qkdBVO6YNMXNnxCh69Sdc2X3xjpkX2XuNdQifxhT8GQMWYmlXHvxIQSh9mGt+Q4 +uEAryNnVFbhtwII24RmlseS+0eXo7o92ebgz4vq3rtRulbw9rgjls7OumRhEwGS2MJg 0Y9MhKEU1jknj/P4kjuldar5ZtIkj1szFwnIXetDruDnu/dsZB6i1ndpw0+mAz2q4s51 fcfw== X-Forwarded-Encrypted: i=1; AHgh+RrK4QL3YUxK0j4VVKTCcdHxlsTpO3C4NcEm5KT7+vU2GPAU0vdtOHeo09/53UpyiJqI81X80zBMEW3u6lQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxohQpuPuXeo1Fhpj3EdBv1USeRzmWVRh2DTh2Y5gzYAdke/L/W U5oz+VhggkZwVU86bk/EGgMOH+VnNsyODSR1Z3A0m0PE60C78E39ZWxpzerce7b1lCQ= X-Gm-Gg: AfdE7cm0E9DLxDeTmKa9iEEP810KIRGU0VdkHRD6ui1ww8SYHObsBkLNYr+AwUlopYg cLjGG4pS9ZMSIntkpr3+TYvpWPmKIcH/dwk1fn93V2sPjgkQYWW9y/EvmCdFZSz09UrWiagkogk YhQmFgAMJU5FHSfFVCcx/Lv+785P01iPIZTwe4SuXVgW3wQw6mxZpot294ItKoOMumpO1kiqvfP DPGZP+O58fjFNONXmTm3FYhUF6QBmEZ+IO31PeWL/sXx0X143aV09t7whFB+PX7glyNHOA5D33Z J+w5Vokt1/q7LwY2iCCd7i3oDUZiroLJ5IJRpUs+FKswQKgaBvuw/f2q7LkrhBxPDiCiv0X7/2y WmOu3l/GDa8a92gtsiOJE5F/sw4jTxrrGe6KNXOeR764N9eJMkZfGD9b1qo/V8XmxRKq9oPhGHT 79eTBHcCm+MDFUiGc= X-Received: by 2002:a17:90b:4a4e:b0:36d:b9c5:e8f6 with SMTP id 98e67ed59e1d1-38dc75ee9cfmr3966096a91.19.1783823135994; Sat, 11 Jul 2026 19:25:35 -0700 (PDT) Received: from ceto.lan ([2607:fb90:9c20:2264::1c31]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-3117462f5c7sm60704693eec.0.2026.07.11.19.25.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2026 19:25:35 -0700 (PDT) From: Mohamed Khalfella To: Justin Tee , Naresh Gottumukkala , Paul Ely , Chaitanya Kulkarni , Christoph Hellwig , Jens Axboe , Keith Busch , Sagi Grimberg , James Smart , Hannes Reinecke , Randy Jennings , Dhaval Giani Cc: Aaron Dailey , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Mohamed Khalfella Subject: [PATCH v5 11/16] nvme-rdma: Use CCR to recover controller that hits an error Date: Sat, 11 Jul 2026 19:23:32 -0700 Message-ID: <20260712022437.3743117-12-mkhalfella@purestorage.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260712022437.3743117-1-mkhalfella@purestorage.com> References: <20260712022437.3743117-1-mkhalfella@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit An alive nvme controller that hits an error now will move to FENCING state instead of RESETTING state. ctrl->fencing_work attempts CCR to terminate inflight IOs. Regardless of the success or failure of CCR operation the controller is transitioned to RESETTING state to continue error recovery process. Signed-off-by: Mohamed Khalfella --- drivers/nvme/host/rdma.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 52933d11ea03..7c8108523980 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -112,6 +112,7 @@ struct nvme_rdma_ctrl { /* other member variables */ struct blk_mq_tag_set tag_set; + struct work_struct fencing_work; struct work_struct err_work; struct nvme_rdma_qe async_event_sqe; @@ -1151,11 +1152,28 @@ static void nvme_rdma_reconnect_ctrl_work(struct work_struct *work) nvme_rdma_reconnect_or_remove(ctrl, ret); } +static void nvme_rdma_fencing_work(struct work_struct *work) +{ + struct nvme_rdma_ctrl *rdma_ctrl = container_of(work, + struct nvme_rdma_ctrl, fencing_work); + struct nvme_ctrl *ctrl = &rdma_ctrl->ctrl; + unsigned long rem; + + rem = nvme_fence_ctrl(ctrl); + if (rem) + dev_info(ctrl->device, "CCR failed, starting error recovery\n"); + + nvme_change_ctrl_state(ctrl, NVME_CTRL_FENCED); + if (nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) + queue_work(nvme_reset_wq, &rdma_ctrl->err_work); +} + static void nvme_rdma_error_recovery_work(struct work_struct *work) { struct nvme_rdma_ctrl *ctrl = container_of(work, struct nvme_rdma_ctrl, err_work); + flush_work(&ctrl->fencing_work); nvme_stop_keep_alive(&ctrl->ctrl); flush_work(&ctrl->ctrl.async_event_work); nvme_rdma_teardown_io_queues(ctrl, false); @@ -1178,6 +1196,12 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work) static void nvme_rdma_error_recovery(struct nvme_rdma_ctrl *ctrl) { + if (nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_FENCING)) { + dev_warn(ctrl->ctrl.device, "starting controller fencing\n"); + queue_work(nvme_wq, &ctrl->fencing_work); + return; + } + if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_RESETTING)) return; @@ -1988,13 +2012,15 @@ static enum blk_eh_timer_return nvme_rdma_timeout(struct request *rq) struct nvme_rdma_ctrl *ctrl = queue->ctrl; struct nvme_command *cmd = req->req.cmd; int qid = nvme_rdma_queue_idx(queue); + enum nvme_ctrl_state state; dev_warn(ctrl->ctrl.device, "I/O tag %d (%04x) opcode %#x (%s) QID %d timeout\n", rq->tag, nvme_cid(rq), cmd->common.opcode, nvme_fabrics_opcode_str(qid, cmd), qid); - if (nvme_ctrl_state(&ctrl->ctrl) != NVME_CTRL_LIVE) { + state = nvme_ctrl_state(&ctrl->ctrl); + if (state != NVME_CTRL_LIVE && state != NVME_CTRL_FENCING) { /* * If we are resetting, connecting or deleting we should * complete immediately because we may block controller @@ -2200,6 +2226,7 @@ static void nvme_rdma_reset_ctrl_work(struct work_struct *work) container_of(work, struct nvme_rdma_ctrl, ctrl.reset_work); int ret; + flush_work(&ctrl->fencing_work); nvme_stop_ctrl(&ctrl->ctrl); nvme_rdma_shutdown_ctrl(ctrl, false); @@ -2320,6 +2347,7 @@ static struct nvme_rdma_ctrl *nvme_rdma_alloc_ctrl(struct device *dev, INIT_DELAYED_WORK(&ctrl->reconnect_work, nvme_rdma_reconnect_ctrl_work); + INIT_WORK(&ctrl->fencing_work, nvme_rdma_fencing_work); INIT_WORK(&ctrl->err_work, nvme_rdma_error_recovery_work); INIT_WORK(&ctrl->ctrl.reset_work, nvme_rdma_reset_ctrl_work); -- 2.54.0