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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id BC51CE7717F for ; Thu, 12 Dec 2024 11:37:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JPzGd4Gvq9rtmMZqlyD1fq8AOaZ3aKklFzkDaYCHL98=; b=FH+IuzVCBeOUmYmHynvS13lpu2 CiQn+OpoVihEhRcJhiDZdAYlgB7fVFjYwTO0q2K2F5MgKKOPygn6Olk/R497/jZ9qJIUkcRtFsdhc sjkE8AG/6I5PcNG4S2MG0svK2BX5BmX0hTjcb5NHTN5QR2/cnv6e6MCspNLh3RoG5SkrR1w1WGrb+ K680HFi2vaTyNiCF7fl8rF3bPoejukDYKHw+TH8+aRzw4R1n9ioucrAOOfUTyn6zfiIwSrSdIm1rh UKmJ2kDgfnZ3fSyIMxxMJ1ENjpSAPsvyDD7+XfwXepmVMD/ztWL74wPqpKQNb5/UfuJIJMKOSrnjZ /LAIMvBw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tLhVP-00000000Dk8-2eqn; Thu, 12 Dec 2024 11:37:19 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tLhTP-00000000Ct3-1op7 for linux-nvme@lists.infradead.org; Thu, 12 Dec 2024 11:35:16 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 7D406A42772; Thu, 12 Dec 2024 11:33:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0FCF4C4CEDE; Thu, 12 Dec 2024 11:35:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1734003314; bh=x9emvNbxppL57XSEYLJvuQyzwgCrDumjN41+fc6H01I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HDc8s0LeNghnB0Vimq+ZZszZol8uyYhk51cN2goxUzVCyhmSzGcc3L4Vg0xPk2ai2 cQvIt54wNJ3YVnfs+1PAaU/t1UgCtKD6Nq2uVk8VMMnYrcy5rGWhyhV7orV0VWEN7T 2DPvqMfE1YXNEuH8+0DG4b4fa0KQI6TKsaB9K1eoBXt49Dz4AUvxJwG8raIj1BpjS2 ZZhme4syLnKlhcinZ9z/MQqAwYBwnsOt1itHWukpsP4eFK1eIVDiQUfiB3xip6R8TH hrcjcjDqH+7kDwhqSyMrzzDvuIP1EdoHXQvcY1tYLGXhCz5YbRKQwzNLNG2M8ev978 JJ2+b9sazatzQ== From: Damien Le Moal To: linux-nvme@lists.infradead.org, Christoph Hellwig , Keith Busch , Sagi Grimberg , linux-pci@vger.kernel.org, Manivannan Sadhasivam , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Kishon Vijay Abraham I , Bjorn Helgaas , Lorenzo Pieralisi Cc: Rick Wertenbroek , Niklas Cassel Subject: [PATCH v4 04/18] nvmet: Introduce nvmet_get_cmd_effects_admin() Date: Thu, 12 Dec 2024 20:34:26 +0900 Message-ID: <20241212113440.352958-5-dlemoal@kernel.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212113440.352958-1-dlemoal@kernel.org> References: <20241212113440.352958-1-dlemoal@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241212_033515_543233_1389F973 X-CRM114-Status: GOOD ( 10.55 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org In order to have a logically better organized implementation of the effects log page, split out reporting the supported admin commands from nvmet_get_cmd_effects_nvm() into the new function nvmet_get_cmd_effects_admin(). Signed-off-by: Damien Le Moal Reviewed-by: Christoph Hellwig Tested-by: Rick Wertenbroek --- drivers/nvme/target/admin-cmd.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c index b73f5fde4d9e..78478a4a2e4d 100644 --- a/drivers/nvme/target/admin-cmd.c +++ b/drivers/nvme/target/admin-cmd.c @@ -230,7 +230,7 @@ static void nvmet_execute_get_log_page_smart(struct nvmet_req *req) nvmet_req_complete(req, status); } -static void nvmet_get_cmd_effects_nvm(struct nvme_effects_log *log) +static void nvmet_get_cmd_effects_admin(struct nvme_effects_log *log) { log->acs[nvme_admin_get_log_page] = log->acs[nvme_admin_identify] = @@ -240,7 +240,10 @@ static void nvmet_get_cmd_effects_nvm(struct nvme_effects_log *log) log->acs[nvme_admin_async_event] = log->acs[nvme_admin_keep_alive] = cpu_to_le32(NVME_CMD_EFFECTS_CSUPP); +} +static void nvmet_get_cmd_effects_nvm(struct nvme_effects_log *log) +{ log->iocs[nvme_cmd_read] = log->iocs[nvme_cmd_flush] = log->iocs[nvme_cmd_dsm] = @@ -276,6 +279,7 @@ static void nvmet_execute_get_log_cmd_effects_ns(struct nvmet_req *req) switch (req->cmd->get_log_page.csi) { case NVME_CSI_NVM: + nvmet_get_cmd_effects_admin(log); nvmet_get_cmd_effects_nvm(log); break; case NVME_CSI_ZNS: @@ -283,6 +287,7 @@ static void nvmet_execute_get_log_cmd_effects_ns(struct nvmet_req *req) status = NVME_SC_INVALID_IO_CMD_SET; goto free; } + nvmet_get_cmd_effects_admin(log); nvmet_get_cmd_effects_nvm(log); nvmet_get_cmd_effects_zns(log); break; -- 2.47.1