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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 4952AC04FFE for ; Wed, 8 May 2024 10:24:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=fR7MyFoFpfDQfopt89G9Fhxt347AvVQ6F1481dMZpQs=; b=GLD6jWtwzqrxUmfhH73xDNIyST PycDZcED4P1/+XfQW4W3ZCTW6AdOZuskAG+hzEihva7RorrYUqv+1NpAbxUO56syk5rAB/sCAi3Pn bEo3MfR7eVG1/BSNFGJkmSo+Klu9Yat1J6HZBSEkMqOLJKXOlKLCFjV7SwGLTgPSAJt60ZueE6oR0 7ZaDeewdUI5zwtchops11skauMvqP9DF2BHVU2vaKOyo7PXyXNms8NMH36BoQiZPFS7gcgp+9e3ZL YJRA7cLy5pKk1VDkJlYxZD+NX1UfU+pB/CvMdza+zvIp819HAqNnCLSwht7TYBtheGvSWXSTDHm8O eYotpSmg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s4eT2-0000000EyQK-0Vhk; Wed, 08 May 2024 10:24:08 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s4eSb-0000000Ey5c-2Y7b for linux-nvme@lists.infradead.org; Wed, 08 May 2024 10:23:46 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 6FE3261B50; Wed, 8 May 2024 10:23:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DAB8AC113CC; Wed, 8 May 2024 10:23:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715163820; bh=H3TqKgd+WGQqa9yO9L45VoQFNhw7gHFLcnmw48vMZ+w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gLl0GWk9P5BMcKNbPigBEYZcI54zmLttje7DVch90kVkpkVDSAdKJ9395uLr+/L/v y0wrwiY90t7wYh8sKboh3vrvWlqZt6Q+zC+6PHLTEqb+pp1CeO40dciEuJ9NHU+d1v 3/IgLxiYyi+pNURWAf0UNW6l3YyDCC94B4qbBuwwbDCa5sOIlQxjqEo8Ef/XwLUOiW rB5a9A0qsy4JJorzg5nT0iJbJuISs5CeMs4AftpKjrJCUwjhgDwqJUHWRvA82SI543 R73bXaPOUS6P29XdYYPrhHLQlp0wjTd2/e1i22hTsDFHXrBHATbqhqTYtXqF2fOW6Z XXiSYAKNIzKIg== From: Hannes Reinecke To: Christoph Hellwig Cc: Sagi Grimberg , Keith Busch , linux-nvme@lists.infradead.org, Hannes Reinecke Subject: [PATCH 10/19] nvme-sysfs: add 'tls_configured_key' sysfs attribute Date: Wed, 8 May 2024 12:22:56 +0200 Message-Id: <20240508102305.108949-11-hare@kernel.org> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240508102305.108949-1-hare@kernel.org> References: <20240508102305.108949-1-hare@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240508_032342_041217_1BE50B1C X-CRM114-Status: GOOD ( 12.93 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org There is a difference between the negotiated TLS key (which is always present for a TLS encrypted connection) and the configured TLS key (which is specified with the --tls_key command line option). To differentate between these two add a new sysfs attribute 'tls_configured_key' to hold the specified on the command line. Signed-off-by: Hannes Reinecke --- drivers/nvme/host/sysfs.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/nvme/host/sysfs.c b/drivers/nvme/host/sysfs.c index be36206cb594..e5cd738660b1 100644 --- a/drivers/nvme/host/sysfs.c +++ b/drivers/nvme/host/sysfs.c @@ -676,6 +676,19 @@ static ssize_t tls_key_show(struct device *dev, return sysfs_emit(buf, "%08x\n", ctrl->tls_pskid); } static DEVICE_ATTR_RO(tls_key); + +static ssize_t tls_configured_key_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct nvme_ctrl *ctrl = dev_get_drvdata(dev); + struct key *key = ctrl->opts->tls_key; + + if (!key) + return 0; + + return sysfs_emit(buf, "%08x\n", key_serial(key)); +} +static DEVICE_ATTR_RO(tls_configured_key); #endif static struct attribute *nvme_dev_attrs[] = { @@ -707,6 +720,7 @@ static struct attribute *nvme_dev_attrs[] = { #endif #ifdef CONFIG_NVME_TCP_TLS &dev_attr_tls_key.attr, + &dev_attr_tls_configured_key.attr, #endif &dev_attr_adm_passthru_err_log_enabled.attr, NULL @@ -742,6 +756,9 @@ static umode_t nvme_dev_attrs_are_visible(struct kobject *kobj, if (a == &dev_attr_tls_key.attr && (!ctrl->opts || strcmp(ctrl->opts->transport, "tcp"))) return 0; + if (a == &dev_attr_tls_configured_key.attr && + (!ctrl->opts || strcmp(ctrl->opts->transport, "tcp"))) + return 0; #endif return a->mode; -- 2.35.3