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 X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 B8C34C2D0F1 for ; Tue, 31 Mar 2020 18:02:10 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 5E0EA212CC for ; Tue, 31 Mar 2020 18:02:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sGG+Ig5l"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Z1ciEBe6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5E0EA212CC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=BtVunYwYUZz9bSL6yr71PxOL3waebGuUqadtwjzBSLE=; b=sGG+Ig5lJnDvrhl8q1xzOpOhXm KIFyw970+58t98hOH41ucodSqbRboZxncTo/Wl31z4X+2fgIhyBGTJXf8FR1YPofJPbToklrgKW2Q QXWnyNONwZgDR5K8GCHlckfy9yrKt8+3OVodbtAICkN4H+smVi+xmFYssE2vBn1/hD5UdbcIlnaKB VnxVswH+i2RF+eLwhRqMsySyOv/4qse9qu3iL6+sK1CBqCKfV0crSCl1eIEBLv+L4gin20RosmhTn 2/ffYhOyrRVT4UgFkt6mKFvZNO6cMMFN6AkQjh54RcdIjOXx5pVoVIw3UWRf315xQUu2YqzrWqDft K9mm4qGA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jJLD9-0005kv-Q5; Tue, 31 Mar 2020 18:02:03 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jJK5y-0004di-DF for linux-nvme@lists.infradead.org; Tue, 31 Mar 2020 16:50:36 +0000 Received: by mail-wm1-x344.google.com with SMTP id j19so3616672wmi.2 for ; Tue, 31 Mar 2020 09:50:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pvGNe2FxuDA2saAZibhMUhK8J0jW6d30tm6J96GHGlA=; b=Z1ciEBe6pVCFXPHPcnrsxRqdh8bBzjIB5i0a3R+Seg+IBZJb60puSkKM01sDdd43Kt J2Kz+aHPM0uTpIETuDnrPGqCPfeMM7B1UYos0N0fCfoWdTOEgeJWEMzTwXH1jdf2yuBJ zUHjkxggM4gpE2pUlq5KxNk49+ZfgqNBhxXI03C9rqDJ/HrnTfDikiI5FFUllun7Y/4n iJ6bQaMtCRp+vpXzMlptK8BlH3a2GdINNxFJ3CcWnaHw18H8L2jGmd7ZqxfHBU1WUuvH hg0zeoi08tW3UMTVbQsgGM96K44Ihk/n/LPYNF7SirjMoH3rR2Sjgf0P5O1v6rV1HvuN fQeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pvGNe2FxuDA2saAZibhMUhK8J0jW6d30tm6J96GHGlA=; b=HNw+FxAmCKoO5Nr29NzuOCTuizhnTTdpkwlLoJdfeKMKPZ35yDLAQWiYWdr2mF1uVK VIkZi7pshWw+W5fmJeqAFn4rKGL+5Ds1qF5GJTYrdgteZS7nPij/Iqc8dEwSR9jtxijf fXGgdtMSgUnx2cfVi2eFwhAKk19OVrb3bdxiF7PAGd4zmf1lneCRiUZdK5qeP0YiyRCL rO7VGQdtwlrAWb9gOJASiGivX8cRXaqF4B77gqDc1PBeJEyuHLgw1uEBJTPchh+j6CcR XfV7+ozwG2HsMRE3l4D64R1ZO3mJFhUedn/s2WiVaRUM67ew20WGs5T+Zk33WWUq7iHm XDxw== X-Gm-Message-State: ANhLgQ2cwGfmrCWlNgvBts+h27AcVtuxC/adEfUQ4afqShFg0eFrhDTd 14A7wRBFgpSUnkWW6pE6Pwcl0M44 X-Google-Smtp-Source: ADFU+vvDYWiYtD6J1iDMzHvG806ZA6LPZBvfPbkCnJALUJ+24ym+6WZHEUo2wAaB+34v3n2aNoLdbA== X-Received: by 2002:a1c:b60b:: with SMTP id g11mr4513387wmf.175.1585673432717; Tue, 31 Mar 2020 09:50:32 -0700 (PDT) Received: from localhost.localdomain.localdomain ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id r14sm2711582wmg.0.2020.03.31.09.50.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Mar 2020 09:50:32 -0700 (PDT) From: James Smart To: linux-nvme@lists.infradead.org Subject: [PATCH v2 08/26] nvmet-fc: Update target for common definitions for LS handling Date: Tue, 31 Mar 2020 09:49:53 -0700 Message-Id: <20200331165011.15819-9-jsmart2021@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200331165011.15819-1-jsmart2021@gmail.com> References: <20200331165011.15819-1-jsmart2021@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200331_095034_496459_D768A395 X-CRM114-Status: GOOD ( 12.45 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: James Smart MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org Given that both host and target now generate and receive LS's create a single table definition for LS names. Each tranport half will have a local version of the table. Convert the target side transport to use the new common Create Association LS validation routine. Signed-off-by: James Smart Reviewed-by: Hannes Reinecke Reviewed-by: Himanshu Madhani --- v2: Split original patch into two patches: a host-side patch (with header update) and a target-side patch. --- drivers/nvme/target/fc.c | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c index 66a60a218994..5739df7edc59 100644 --- a/drivers/nvme/target/fc.c +++ b/drivers/nvme/target/fc.c @@ -1442,32 +1442,8 @@ nvmet_fc_ls_disconnect(struct nvmet_fc_tgtport *tgtport, memset(acc, 0, sizeof(*acc)); - if (iod->rqstdatalen < sizeof(struct fcnvme_ls_disconnect_assoc_rqst)) - ret = VERR_DISCONN_LEN; - else if (rqst->desc_list_len != - fcnvme_lsdesc_len( - sizeof(struct fcnvme_ls_disconnect_assoc_rqst))) - ret = VERR_DISCONN_RQST_LEN; - else if (rqst->associd.desc_tag != cpu_to_be32(FCNVME_LSDESC_ASSOC_ID)) - ret = VERR_ASSOC_ID; - else if (rqst->associd.desc_len != - fcnvme_lsdesc_len( - sizeof(struct fcnvme_lsdesc_assoc_id))) - ret = VERR_ASSOC_ID_LEN; - else if (rqst->discon_cmd.desc_tag != - cpu_to_be32(FCNVME_LSDESC_DISCONN_CMD)) - ret = VERR_DISCONN_CMD; - else if (rqst->discon_cmd.desc_len != - fcnvme_lsdesc_len( - sizeof(struct fcnvme_lsdesc_disconn_cmd))) - ret = VERR_DISCONN_CMD_LEN; - /* - * As the standard changed on the LS, check if old format and scope - * something other than Association (e.g. 0). - */ - else if (rqst->discon_cmd.rsvd8[0]) - ret = VERR_DISCONN_SCOPE; - else { + ret = nvmefc_vldt_lsreq_discon_assoc(iod->rqstdatalen, rqst); + if (!ret) { /* match an active association */ assoc = nvmet_fc_find_target_assoc(tgtport, be64_to_cpu(rqst->associd.association_id)); -- 2.16.4 _______________________________________________ linux-nvme mailing list linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme