From patchwork Mon Nov 30 03:29:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 11939669 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 AF42EC71155 for ; Mon, 30 Nov 2020 03:31:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 678B520705 for ; Mon, 30 Nov 2020 03:31:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=permerror (0-bit key) header.d=wdc.com header.i=@wdc.com header.b="lqBYJl2H" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728240AbgK3DbL (ORCPT ); Sun, 29 Nov 2020 22:31:11 -0500 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:10519 "EHLO esa2.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726304AbgK3DbL (ORCPT ); Sun, 29 Nov 2020 22:31:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1606707840; x=1638243840; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AZ0ASPEdFnz/BJCpcrFT1z2buOCvE1xQZBqdQG2WuUM=; b=lqBYJl2HbbnbTW5PVT+9GOcGSp9rjBLuoffslBVpHOG50QPcTM11IXE0 +NheZGHhafVsrT55LozlFDhtlKBrmzhljP8BVaTXxVgmEWQKV5z51rDRR wI+2luEZ32nJa/FcYxALNnf3Qv9yv4z2GX5/L0LVg9CrmHEMmdM0OX+Xx pxuZoetRr1qIh10QqhXdFkXcA+2ybtWFdezhN7sb3ZVcG2jR0USmSfn2n xJ9QZ3YnF7vrk8yd4UQ7/zn3Gq85fgi9BaYaiJu4xIKFqRoiiR/2dxD0W 0rC6rxkH6UEi9Yquj6Nb0GPK8RGIjpo65Bbh2+JYFPeyd1yCAKlXCZpEk A==; IronPort-SDR: iOD7xjCYy1F7DExZRcQIJOXu0OjPBZCFSjD36pFaoGhmiCLrPUeZbCceMpcJZ6ZOaRAdjBAFY2 hoH2A7hErY5fSB1jIHpsjBIT8OcYalpn5zVpMXXBMgk5df1hCqskKqfYf17RRxg6Lf0h+VMKeu tPCjhu1lE75dJvnaAw8VY9Fias6n+88ecXcxgZXO378VTdeYRIR4pMLTvDnbGAzAIVrEgR1/iA 2dHRWvuPreJiKwwCOFRMRBlVpNKe7obQxCgMMRN0FSVkpJziusVQ2KG4Kj6/Gk1gXUrwVVYSPT KoU= X-IronPort-AV: E=Sophos;i="5.78,379,1599494400"; d="scan'208";a="257450823" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 30 Nov 2020 11:41:43 +0800 IronPort-SDR: hI2I/02BGViqQoImEI3XWhzVXAedpyT8cEH/aSD/+IvdmecZlJNX4lvSUrohZgTXnd0xh2FxX4 AL3Gku13ThfGfmOeJZP2pzdhddGa3xAws= Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Nov 2020 19:13:53 -0800 IronPort-SDR: yKyMZjhNk/mnExspfaixYDt4y+icg4sZftOOtN/oNyNL08lCZ87fPtnoUGYT879cStE/buz84X PWlWyymkpzAA== WDCIronportException: Internal Received: from vm.labspan.wdc.com (HELO vm.sc.wdc.com) ([10.6.137.102]) by uls-op-cesaip02.wdc.com with ESMTP; 29 Nov 2020 19:29:39 -0800 From: Chaitanya Kulkarni To: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org Cc: hch@lst.de, sagi@grimberg.me, damien.lemoal@wdc.com, Chaitanya Kulkarni Subject: [PATCH V2 3/9] nvmet: trim down id-desclist to use req->ns Date: Sun, 29 Nov 2020 19:29:03 -0800 Message-Id: <20201130032909.40638-4-chaitanya.kulkarni@wdc.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20201130032909.40638-1-chaitanya.kulkarni@wdc.com> References: <20201130032909.40638-1-chaitanya.kulkarni@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org In this prep patch we remove the extra local variable struct nvmet_ns in nvmet_execute_identify_desclist() since req already has the member that can be reused, this also eliminates the explicit call to nvmet_put_namespace() which is already present in the request completion path. This reduces the arguments to the function in the following patch to implement the ZNS for bdev-ns so we can get away with passing the req argument instead of req and ns. Signed-off-by: Chaitanya Kulkarni --- drivers/nvme/target/admin-cmd.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c index 509fd8dcca0c..c64b40c631e0 100644 --- a/drivers/nvme/target/admin-cmd.c +++ b/drivers/nvme/target/admin-cmd.c @@ -603,37 +603,35 @@ u16 nvmet_copy_ns_identifier(struct nvmet_req *req, u8 type, u8 len, static void nvmet_execute_identify_desclist(struct nvmet_req *req) { - struct nvmet_ns *ns; u16 status = 0; off_t off = 0; - ns = nvmet_find_namespace(req->sq->ctrl, req->cmd->identify.nsid); - if (!ns) { + req->ns = nvmet_find_namespace(req->sq->ctrl, req->cmd->identify.nsid); + if (!req->ns) { req->error_loc = offsetof(struct nvme_identify, nsid); status = NVME_SC_INVALID_NS | NVME_SC_DNR; goto out; } - if (memchr_inv(&ns->uuid, 0, sizeof(ns->uuid))) { + if (memchr_inv(&req->ns->uuid, 0, sizeof(req->ns->uuid))) { status = nvmet_copy_ns_identifier(req, NVME_NIDT_UUID, NVME_NIDT_UUID_LEN, - &ns->uuid, &off); + &req->ns->uuid, &off); if (status) - goto out_put_ns; + goto out; } - if (memchr_inv(ns->nguid, 0, sizeof(ns->nguid))) { + if (memchr_inv(req->ns->nguid, 0, sizeof(req->ns->nguid))) { status = nvmet_copy_ns_identifier(req, NVME_NIDT_NGUID, NVME_NIDT_NGUID_LEN, - &ns->nguid, &off); + &req->ns->nguid, &off); if (status) - goto out_put_ns; + goto out; } if (sg_zero_buffer(req->sg, req->sg_cnt, NVME_IDENTIFY_DATA_SIZE - off, off) != NVME_IDENTIFY_DATA_SIZE - off) status = NVME_SC_INTERNAL | NVME_SC_DNR; -out_put_ns: - nvmet_put_namespace(ns); + out: nvmet_req_complete(req, status); }