From patchwork Thu Nov 15 17:16:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sagi Grimberg X-Patchwork-Id: 998466 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=lightbitslabs.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="Bns7NkzD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wp1p1RR1z9s5c for ; Fri, 16 Nov 2018 04:16:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388828AbeKPDZY (ORCPT ); Thu, 15 Nov 2018 22:25:24 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:46210 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388798AbeKPDZX (ORCPT ); Thu, 15 Nov 2018 22:25:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=WPgDAppmWhRkF/LVotZdtI3NM7b33Jp6Gk4leWnIhO4=; b=Bns7NkzD1tLA/636kerVauVyo apGArrMNcjhEBExWukR0DfRFBXy4vMV72JQ5RnyWmVfRkvJy4HFiKQZMZ9FSe51ytr6ljNkf+0Y8S AIH2S2hLyKqfA7zgyTEtwKRwVkZoIbIIkXdbMxyRaHQlBoMuN2707cId1Q0mSD2P2YYaCMOOQwume IhZJN8nynwHfuPi2Ghoz6bPM4BnHFBKbd7OvUXzT8J1Ymph9ykytalhqrRk7SJn5yMvaOJrCTa/cf zyVShIQw/rgnCsV8fzNsTUCy7jAWjduAmt304SIV2MCbK9EztRrQSDr/NCxl7Y4GrADCNG+67Zk7E NjhBUZpjw==; Received: from [52.119.64.114] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNLFu-0002LK-0o; Thu, 15 Nov 2018 17:16:38 +0000 From: Sagi Grimberg To: linux-nvme@lists.infradead.org Cc: linux-block@vger.kernel.org, netdev@vger.kernel.org, Christoph Hellwig , Keith Busch Subject: [PATCH nvme-cli 13/11] fabrics: add tcp port tsas decoding Date: Thu, 15 Nov 2018 09:16:25 -0800 Message-Id: <20181115171626.9306-14-sagi@lightbitslabs.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115171626.9306-1-sagi@lightbitslabs.com> References: <20181115171626.9306-1-sagi@lightbitslabs.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org tcp tsas include sectype indication for unsecured/tls ports. Signed-off-by: Sagi Grimberg --- fabrics.c | 14 ++++++++++++++ linux/nvme.h | 10 ++++++++++ 2 files changed, 24 insertions(+) diff --git a/fabrics.c b/fabrics.c index 6fd9dfaa5d79..774ea94dc0db 100644 --- a/fabrics.c +++ b/fabrics.c @@ -141,6 +141,16 @@ static inline const char *treq_str(__u8 treq) return arg_str(treqs, ARRAY_SIZE(treqs), treq); } +static const char * const sectypes[] = { + [NVMF_TCP_SECTYPE_NONE] = "none", + [NVMF_TCP_SECTYPE_TLS] = "tls", +}; + +static inline const char *sectype_str(__u8 sectype) +{ + return arg_str(sectypes, ARRAY_SIZE(sectypes), sectype); +} + static const char * const prtypes[] = { [NVMF_RDMA_PRTYPE_NOT_SPECIFIED] = "not specified", [NVMF_RDMA_PRTYPE_IB] = "infiniband", @@ -450,6 +460,10 @@ static void print_discovery_log(struct nvmf_disc_rsp_page_hdr *log, int numrec) printf("rdma_pkey: 0x%04x\n", e->tsas.rdma.pkey); break; + case NVMF_TRTYPE_TCP: + printf("sectype: %s\n", + sectype_str(e->tsas.tcp.sectype)); + break; } } } diff --git a/linux/nvme.h b/linux/nvme.h index 7a600c791877..68000eb8c1dc 100644 --- a/linux/nvme.h +++ b/linux/nvme.h @@ -91,6 +91,13 @@ enum { NVMF_RDMA_CMS_RDMA_CM = 1, /* Sockets based endpoint addressing */ }; +/* TCP port security type for Discovery Log Page entry TSAS + */ +enum { + NVMF_TCP_SECTYPE_NONE = 0, /* No Security */ + NVMF_TCP_SECTYPE_TLS = 1, /* Transport Layer Security */ +}; + #define NVME_AQ_DEPTH 32 #define NVME_NR_AEN_COMMANDS 1 #define NVME_AQ_BLK_MQ_DEPTH (NVME_AQ_DEPTH - NVME_NR_AEN_COMMANDS) @@ -1184,6 +1191,9 @@ struct nvmf_disc_rsp_page_entry { __u16 pkey; __u8 resv10[246]; } rdma; + struct tcp { + __u8 sectype; + } tcp; } tsas; };