From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f53.google.com (mail-dl1-f53.google.com [74.125.82.53]) (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 CA99431AF36 for ; Tue, 3 Feb 2026 20:07:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770149249; cv=none; b=ZN43QTUNN7TW2AuL2Mo6XLuqSnCEvFUFFeAyp2uLoSMf2VIRhyFttJCLSddm9zJfcBElYa0O11qGUh3d9botJz4Va+pKjzAow5PZGoY+xAKRllD25+a2A3W4f4T90ilZAcQY46SSgnfxJtlp37J9JhFVBj87W7hDWN5Omy3mXQQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770149249; c=relaxed/simple; bh=EN0jDElSek27Ydt5mqWUoZBicJ3A26eum0cCWJtwCeU=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=mVTcks83P936NH7gn6Bw81jlAgewiXf3jYzTjkWez0sCwX7+l99lkhsRhqT8bZmpuJ4KwmeHfUtw/B86ieXhqKUR1/h9X1PJYT9UGUMflPhZfv60TZtzT9XLwnfwvH5fdN/zfosbwxwtoR5MSJEAMtEUfVUbDxdq7lU6vtewowY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=S1Hex75S; arc=none smtp.client-ip=74.125.82.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail 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="S1Hex75S" Received: by mail-dl1-f53.google.com with SMTP id a92af1059eb24-124566b6693so4389259c88.0 for ; Tue, 03 Feb 2026 12:07:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1770149247; x=1770754047; darn=vger.kernel.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=TcX3GqfueByV0ZsgDx+YVVsfLUh3jj4u3lErIYfPq2k=; b=S1Hex75STKb5TSb3x8LDUqOTcN5GHCqAi3gQpD/9YWE8bFWDRzPSPqIOKTkKskAzdk i/Oain+Csw3zNgaLBhxYhMFZqsWoS4fMcfQk3rii+vKuxbF4OmZBwFeU5L0HffsuijSX FRM/wb18tL3xba+A7lKudzaiUxbUpdfIliTWKLfeQk8LMqhUGgfjoHCj0LKesssUVEhv q1I8tEAQrtsjPXmeJR6x96bC9CSF7CZN4SKHtWhooKQmApoKTtikiFAqG6B25osAJUzq iTAukMrmxbQlb4gILoy+kZeIcHKWWBZJ8h6dGvy5MImuWUxVfLQLR9QBAGMzj/zoGcM0 BHzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770149247; x=1770754047; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TcX3GqfueByV0ZsgDx+YVVsfLUh3jj4u3lErIYfPq2k=; b=L1aYUI9MnhOsUH43B/Cm3h6Kzy/y4W6FvY/nwECcdhyA9wz44zYdg7N+p4LD7Yf3uX KhiPRm8my1NH4wOEkS/xrxZQlhH0+iKGsctcw9XVrLoWg2iJw8nalw+A3Qrg3XhGqsax f1KDiTh2pyCIlHsLbaMIkwVtH7P60IL9KL64vTJ8oKUt99pBAXWibyRWC4DREsnLKtke 7dU5CKl+K3yUHLPj17tLcE+EThiW49J/6WQf7dgERvUDUIMcDpdGsakqGVnU4sIEpqyz k5KkUN1je4+CNJgTLtdjnIPTTjRIYoLK8MsIJuNdr84jpot8zqvG4rY1jppQSKQADI+U x4LA== X-Forwarded-Encrypted: i=1; AJvYcCX3oVo8dp3+cZA0pWK35FyNUaSVwU9Kfjo30u3Zrwl/TeNFyJdaPO1y0tVi7GlFhAzXm2yCPCpcjlGfpfQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzOzRC3ahx5ET7gQVecAKaZEUYuUTv6WiYLm5helTw0lRgV2aqM TQt0vSGci0UleCmZ5LNOmvSnm4rscYnv/uDaKBubj1tiz0ZMMr33oBuS6cXk45UYH/o= X-Gm-Gg: AZuq6aIGrNiMxJfWeLTNFI+3jSl9deoZN1ryEWz2x47tGtvwiQmsCCXhHaCZFvuKxUJ fTmMzo+4rE2f18/hk5HkgEyaSiU7F9aTsZYOOSGlLISTDH09SfW0v6haIdB1Lk2COtBPiHsDDxJ 0qgbtFQ1a5y7rAT96GLlb8lNrkMswR+VGbpX+XfeO2j1he/Vd4mVIKa2exzYQfrl77uSYRI0v0S 8UILnLcja7tp5TB9kv/Z4KoLLQtKD/DdZYdRVM4/FJAu+ByEUrGSIg9PNtzr5YrdYHkGa1E5GZP 6oYPZp62VUVWRYy9yoGcSm1BI/P8bNLe2SZ4QFzpqroO/Rh5eI/66mFpnLiQB0e1sj0UfWFRO1Y 37+sDm++W4E4e9JDMQJbRwMKc8vP/HyrS2kBMRLsU5YF0/xrJEsDzhjgGGU+mO0v9xy3vaQBDK3 lqfUWPbEvInaSLKqtoxO04mMhR8FpojXU= X-Received: by 2002:a05:7022:10d:b0:11b:9386:a3be with SMTP id a92af1059eb24-126f47ddbfamr314491c88.41.1770149246568; Tue, 03 Feb 2026 12:07:26 -0800 (PST) Received: from medusa.lab.kspace.sh ([208.88.152.253]) by smtp.googlemail.com with UTF8SMTPSA id a92af1059eb24-126f5030b01sm271249c88.11.2026.02.03.12.07.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Feb 2026 12:07:26 -0800 (PST) Date: Tue, 3 Feb 2026 12:07:25 -0800 From: Mohamed Khalfella To: Hannes Reinecke Cc: Justin Tee , Naresh Gottumukkala , Paul Ely , Chaitanya Kulkarni , Christoph Hellwig , Jens Axboe , Keith Busch , Sagi Grimberg , Aaron Dailey , Randy Jennings , Dhaval Giani , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 09/14] nvme: Implement cross-controller reset completion Message-ID: <20260203200725.GF3729-mkhalfella@purestorage.com> References: <20260130223531.2478849-1-mkhalfella@purestorage.com> <20260130223531.2478849-10-mkhalfella@purestorage.com> <431d225b-266f-431c-b3a5-03e033a2f63d@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <431d225b-266f-431c-b3a5-03e033a2f63d@suse.de> On Tue 2026-02-03 06:22:38 +0100, Hannes Reinecke wrote: > On 1/30/26 23:34, Mohamed Khalfella wrote: > > An nvme source controller that issues CCR command expects to receive an > > NVME_AER_NOTICE_CCR_COMPLETED when pending CCR succeeds or fails. Add > > sctrl->ccr_work to read NVME_LOG_CCR logpage and wakeup any thread > > waiting on CCR completion. > > > > Signed-off-by: Mohamed Khalfella > > --- > > drivers/nvme/host/core.c | 49 +++++++++++++++++++++++++++++++++++++++- > > drivers/nvme/host/nvme.h | 1 + > > 2 files changed, 49 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c > > index 13e0775d56b4..0f90feb46369 100644 > > --- a/drivers/nvme/host/core.c > > +++ b/drivers/nvme/host/core.c > > @@ -1901,7 +1901,8 @@ EXPORT_SYMBOL_GPL(nvme_set_queue_count); > > > > #define NVME_AEN_SUPPORTED \ > > (NVME_AEN_CFG_NS_ATTR | NVME_AEN_CFG_FW_ACT | \ > > - NVME_AEN_CFG_ANA_CHANGE | NVME_AEN_CFG_DISC_CHANGE) > > + NVME_AEN_CFG_ANA_CHANGE | NVME_AEN_CFG_CCR_COMPLETE | \ > > + NVME_AEN_CFG_DISC_CHANGE) > > > > static void nvme_enable_aen(struct nvme_ctrl *ctrl) > > { > > @@ -4866,6 +4867,47 @@ static void nvme_get_fw_slot_info(struct nvme_ctrl *ctrl) > > kfree(log); > > } > > > > +static void nvme_ccr_work(struct work_struct *work) > > +{ > > + struct nvme_ctrl *ctrl = container_of(work, struct nvme_ctrl, ccr_work); > > + struct nvme_ccr_entry *ccr; > > + struct nvme_ccr_log_entry *entry; > > + struct nvme_ccr_log *log; > > + unsigned long flags; > > + int ret, i; > > + > > + log = kmalloc(sizeof(*log), GFP_KERNEL); > > + if (!log) > > + return; > > + > > + ret = nvme_get_log(ctrl, 0, NVME_LOG_CCR, 0x01, > > + 0x00, log, sizeof(*log), 0); > > + if (ret) > > + goto out; > > + > > + spin_lock_irqsave(&ctrl->lock, flags); > > + for (i = 0; i < le16_to_cpu(log->ne); i++) { > > + entry = &log->entries[i]; > > + if (entry->ccrs == NVME_CCR_STATUS_IN_PROGRESS) > > + continue; > > + > > + list_for_each_entry(ccr, &ctrl->ccr_list, list) { > > + struct nvme_ctrl *ictrl = ccr->ictrl; > > + > > + if (ictrl->cntlid != le16_to_cpu(entry->icid) || > > + ictrl->ciu != entry->ciu) > > + continue; > > + > > + /* Complete matching entry */ > > + ccr->ccrs = entry->ccrs; > > + complete(&ccr->complete); > > + } > > + } > > + spin_unlock_irqrestore(&ctrl->lock, flags); > > +out: > > + kfree(log); > > +} > > + > > static void nvme_fw_act_work(struct work_struct *work) > > { > > struct nvme_ctrl *ctrl = container_of(work, > > @@ -4942,6 +4984,9 @@ static bool nvme_handle_aen_notice(struct nvme_ctrl *ctrl, u32 result) > > case NVME_AER_NOTICE_DISC_CHANGED: > > ctrl->aen_result = result; > > break; > > + case NVME_AER_NOTICE_CCR_COMPLETED: > > + queue_work(nvme_wq, &ctrl->ccr_work); > > + break; > > default: > > dev_warn(ctrl->device, "async event result %08x\n", result); > > } > > @@ -5131,6 +5176,7 @@ void nvme_stop_ctrl(struct nvme_ctrl *ctrl) > > nvme_stop_failfast_work(ctrl); > > flush_work(&ctrl->async_event_work); > > cancel_work_sync(&ctrl->fw_act_work); > > + cancel_work_sync(&ctrl->ccr_work); > > if (ctrl->ops->stop_ctrl) > > ctrl->ops->stop_ctrl(ctrl); > > } > > @@ -5254,6 +5300,7 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, > > ctrl->quirks = quirks; > > ctrl->numa_node = NUMA_NO_NODE; > > INIT_WORK(&ctrl->scan_work, nvme_scan_work); > > + INIT_WORK(&ctrl->ccr_work, nvme_ccr_work); > > INIT_WORK(&ctrl->async_event_work, nvme_async_event_work); > > INIT_WORK(&ctrl->fw_act_work, nvme_fw_act_work); > > INIT_WORK(&ctrl->delete_work, nvme_delete_ctrl_work); > > diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h > > index fa18f580d76a..a7f382e35821 100644 > > --- a/drivers/nvme/host/nvme.h > > +++ b/drivers/nvme/host/nvme.h > > @@ -366,6 +366,7 @@ struct nvme_ctrl { > > struct nvme_effects_log *effects; > > struct xarray cels; > > struct work_struct scan_work; > > + struct work_struct ccr_work; > > struct work_struct async_event_work; > > struct delayed_work ka_work; > > struct delayed_work failfast_work; > > This confuses me. Why do we call 'complete()' but do not have a > corresponding 'wait_for_completion()' call? I think because the two commits were developed separately. > > Please merge with the next patch to allow reviewers to have the full > picture. I thought it is easier to review this way because this change includes ctrl->ccr_work. If you feel strongly about it I will merge it into the previous patch "[PATCH v2 08/14] nvme: Implement cross-controller reset recovery"? > > Cheers, > > Hannes > -- > Dr. Hannes Reinecke Kernel Storage Architect > hare@suse.de +49 911 74053 688 > SUSE Software Solutions GmbH, Frankenstr. 146, 90461 Nürnberg > HRB 36809 (AG Nürnberg), GF: I. Totev, A. McDonald, W. Knoblich