From patchwork Thu Nov 26 02:40:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 11932607 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,USER_AGENT_GIT autolearn=ham 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 2D285C56202 for ; Thu, 26 Nov 2020 02:41:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C8DCB207BC for ; Thu, 26 Nov 2020 02:41:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="OWcCyhoZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732766AbgKZClX (ORCPT ); Wed, 25 Nov 2020 21:41:23 -0500 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:32149 "EHLO esa4.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732733AbgKZClW (ORCPT ); Wed, 25 Nov 2020 21:41:22 -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=1606358482; x=1637894482; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AZ0ASPEdFnz/BJCpcrFT1z2buOCvE1xQZBqdQG2WuUM=; b=OWcCyhoZ418q4EbJpjRMLtAcB/neZD58/tsT1s76UL8Xw87mkSiFLx7F S3EhauNRgNoTcUJRGNwphirbrCKPY9h7Dqi+MvxQ5pa1hwYrj14OxnRrE p4S+A6WgqH7dPZMVVgKCpxIXWgQbkESsVqmFa/93igpLOMk6z2LCBIRGe auFx2++UtzK+yJmozFqBYOpE/fGBwO5KAxyEYicmu1BOF49UXHyg52T0B uyhVrAVDdhS4zbh8aW6BVRKTUQMobNS9QAsE50TIvumv1kAX7vtmPrNor d3iWYv5jy4oYHLV/exmQxyDO0lzpr68mV0vyLPJSCoIar01A1iNymVxzj Q==; IronPort-SDR: Nm41yd8qsMWjBBd06TGwf1LHfNJbmpLwtfs3owEgys5CEloc90tgRoKoxPVUsuDO3Z/Ls4GM4+ TspTSy4qKUfv7JPA0Vs8oDX5EBwK8jco0sN8CDutGKQVsSO52IkMIHQ0qTvFRvqPztWaq1Qiye oeEv7GkNO6smAh6+x+K8v7t7Ml0JBX5WvF4GltPusFnV95PZFknLdacglhoqDKQ2sZbJiaeu3A 4bFgqLTZlmKPIGKpIHbmupu2e1C0Fl4Do6otPkqbQU5jc+oGAOuTgIf3IAFTNqgns4/e2UkzgD UoQ= X-IronPort-AV: E=Sophos;i="5.78,370,1599494400"; d="scan'208";a="153445796" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 26 Nov 2020 10:41:22 +0800 IronPort-SDR: 0EGGiQuuWz/x3X+U8noF/df0NtuUtSGegwpA/ww1O7rsFYP5Bp2narDarz5BEl/AbrbVpIs908 C1Sx1BJSB/YOcC0PRq1ojcMBu5+em7/ns= Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Nov 2020 18:27:04 -0800 IronPort-SDR: 6M/AGqqa8B8wT+HwqCGGNoUVwG/Vvh+SMKOzt3MgE0GbfsWhRRM+Vg2DtFwiAPAKEgXcQ27FEO Z4EcVAAbeCNw== 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; 25 Nov 2020 18:41:22 -0800 From: Chaitanya Kulkarni To: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org Cc: sagi@grimberg.me, hch@lst.de, Chaitanya Kulkarni Subject: [PATCH 3/9] nvmet: trim down id-desclist to use req->ns Date: Wed, 25 Nov 2020 18:40:37 -0800 Message-Id: <20201126024043.3392-4-chaitanya.kulkarni@wdc.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20201126024043.3392-1-chaitanya.kulkarni@wdc.com> References: <20201126024043.3392-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); }