From: Hannes Reinecke <hare@suse.de>
To: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>, Keith Busch <kbusch@kernel.org>,
linux-nvme@lists.infradead.org, Hannes Reinecke <hare@suse.de>
Subject: [PATCH 05/14] nvme-keyring: implement nvme_tls_psk_default()
Date: Thu, 3 Aug 2023 12:50:53 +0200 [thread overview]
Message-ID: <20230803105102.30949-6-hare@suse.de> (raw)
In-Reply-To: <20230803105102.30949-1-hare@suse.de>
Implement a function to select the preferred PSK for TLS.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/nvme/common/keyring.c | 48 +++++++++++++++++++++++++++++++++++
include/linux/nvme-keyring.h | 8 ++++++
2 files changed, 56 insertions(+)
diff --git a/drivers/nvme/common/keyring.c b/drivers/nvme/common/keyring.c
index 494dd365052e..f8d9a208397b 100644
--- a/drivers/nvme/common/keyring.c
+++ b/drivers/nvme/common/keyring.c
@@ -5,6 +5,7 @@
#include <linux/module.h>
#include <linux/seq_file.h>
+#include <linux/key.h>
#include <linux/key-type.h>
#include <keys/user-type.h>
#include <linux/nvme.h>
@@ -103,6 +104,53 @@ static struct key *nvme_tls_psk_lookup(struct key *keyring,
return key_ref_to_ptr(keyref);
}
+/*
+ * NVMe PSK priority list
+ *
+ * 'Retained' PSKs (ie 'generated == false')
+ * should be preferred to 'generated' PSKs,
+ * and SHA-384 should be preferred to SHA-256.
+ */
+struct nvme_tls_psk_priority_list {
+ bool generated;
+ enum nvme_tcp_tls_cipher cipher;
+} nvme_tls_psk_prio[] = {
+ { .generated = false,
+ .cipher = NVME_TCP_TLS_CIPHER_SHA384, },
+ { .generated = false,
+ .cipher = NVME_TCP_TLS_CIPHER_SHA256, },
+ { .generated = true,
+ .cipher = NVME_TCP_TLS_CIPHER_SHA384, },
+ { .generated = true,
+ .cipher = NVME_TCP_TLS_CIPHER_SHA256, },
+};
+
+/*
+ * nvme_tls_psk_default - Return the preferred PSK to use for TLS ClientHello
+ */
+key_serial_t nvme_tls_psk_default(struct key *keyring,
+ const char *hostnqn, const char *subnqn)
+{
+ struct key *tls_key;
+ key_serial_t tls_key_id;
+ int prio;
+
+ for (prio = 0; prio < ARRAY_SIZE(nvme_tls_psk_prio); prio++) {
+ bool generated = nvme_tls_psk_prio[prio].generated;
+ enum nvme_tcp_tls_cipher cipher = nvme_tls_psk_prio[prio].cipher;
+
+ tls_key = nvme_tls_psk_lookup(keyring, hostnqn, subnqn,
+ cipher, generated);
+ if (!IS_ERR(tls_key)) {
+ tls_key_id = tls_key->serial;
+ key_put(tls_key);
+ return tls_key_id;
+ }
+ }
+ return 0;
+}
+EXPORT_SYMBOL_GPL(nvme_tls_psk_default);
+
int nvme_keyring_init(void)
{
int err;
diff --git a/include/linux/nvme-keyring.h b/include/linux/nvme-keyring.h
index 32bd264a71e6..4efea9dd967c 100644
--- a/include/linux/nvme-keyring.h
+++ b/include/linux/nvme-keyring.h
@@ -8,12 +8,20 @@
#ifdef CONFIG_NVME_KEYRING
+key_serial_t nvme_tls_psk_default(struct key *keyring,
+ const char *hostnqn, const char *subnqn);
+
key_serial_t nvme_keyring_id(void);
int nvme_keyring_init(void);
void nvme_keyring_exit(void);
#else
+static inline key_serial_t nvme_tls_psk_default(struct key *keyring,
+ const char *hostnqn, const char *subnqn)
+{
+ return 0;
+}
static inline key_serial_t nvme_keyring_id(void)
{
return 0;
--
2.35.3
next prev parent reply other threads:[~2023-08-03 10:53 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-03 10:50 [PATCHv5 00/14] nvme: In-kernel TLS support for TCP Hannes Reinecke
2023-08-03 10:50 ` [PATCH 01/14] nvme-keyring: register '.nvme' keyring Hannes Reinecke
2023-08-07 7:09 ` Sagi Grimberg
2023-08-03 10:50 ` [PATCH 02/14] nvme-keyring: define a 'psk' keytype Hannes Reinecke
2023-08-07 7:11 ` Sagi Grimberg
2023-08-03 10:50 ` [PATCH 03/14] nvme: add TCP TSAS definitions Hannes Reinecke
2023-08-03 10:50 ` [PATCH 04/14] nvme-tcp: add definitions for TLS cipher suites Hannes Reinecke
2023-08-03 10:50 ` Hannes Reinecke [this message]
2023-08-07 7:13 ` [PATCH 05/14] nvme-keyring: implement nvme_tls_psk_default() Sagi Grimberg
2023-08-03 10:50 ` [PATCH 06/14] security/keys: export key_lookup() Hannes Reinecke
2023-08-07 7:13 ` Sagi Grimberg
2023-08-03 10:50 ` [PATCH 07/14] nvme/tcp: allocate socket file Hannes Reinecke
2023-08-07 7:15 ` Sagi Grimberg
2023-08-07 7:23 ` Hannes Reinecke
2023-08-03 10:50 ` [PATCH 08/14] nvme-tcp: enable TLS handshake upcall Hannes Reinecke
2023-08-07 8:20 ` Sagi Grimberg
2023-08-07 8:32 ` Hannes Reinecke
2023-08-03 10:50 ` [PATCH 09/14] nvme-tcp: control message handling for recvmsg() Hannes Reinecke
2023-08-07 8:22 ` Sagi Grimberg
2023-08-08 6:39 ` Hannes Reinecke
2023-08-08 8:41 ` Sagi Grimberg
2023-08-08 8:51 ` Hannes Reinecke
2023-08-08 9:05 ` Sagi Grimberg
2023-08-08 10:57 ` Pawel Baldysiak
[not found] ` <20230808105403.3949653-1-pawel.baldysiak@dell.com>
2023-08-08 11:45 ` Sagi Grimberg
2023-08-08 11:56 ` Hannes Reinecke
2023-08-03 10:50 ` [PATCH 10/14] nvme-fabrics: parse options 'keyring' and 'tls_key' Hannes Reinecke
2023-08-07 8:23 ` Sagi Grimberg
2023-08-07 8:34 ` Hannes Reinecke
2023-08-03 10:50 ` [PATCH 11/14] nvmet: make TCP sectype settable via configfs Hannes Reinecke
2023-08-07 8:25 ` Sagi Grimberg
2023-08-03 10:51 ` [PATCH 12/14] nvmet-tcp: allocate socket file Hannes Reinecke
2023-08-07 8:27 ` Sagi Grimberg
2023-08-07 8:49 ` Hannes Reinecke
2023-08-07 8:53 ` Sagi Grimberg
2023-08-07 9:17 ` Hannes Reinecke
2023-08-07 10:42 ` Sagi Grimberg
2023-08-08 6:08 ` Hannes Reinecke
2023-08-08 8:44 ` Sagi Grimberg
2023-08-03 10:51 ` [PATCH 13/14] nvmet-tcp: enable TLS handshake upcall Hannes Reinecke
2023-08-07 8:51 ` Sagi Grimberg
2023-08-07 9:15 ` Hannes Reinecke
2023-08-07 11:49 ` Sagi Grimberg
2023-08-08 6:16 ` Hannes Reinecke
2023-08-03 10:51 ` [PATCH 14/14] nvmet-tcp: control messages for recvmsg() Hannes Reinecke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230803105102.30949-6-hare@suse.de \
--to=hare@suse.de \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox