Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28b89118 authored by Sagi Grimberg's avatar Sagi Grimberg
Browse files

nvmet: Fix controller serial number inconsistency 



The host is allowed to issue identify as many times
as it wants, we need to stay consistent when reporting
the serial number for a given controller.

Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 40e64e07

drivers/nvme/target/admin-cmd.c

+1 −5
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
 */

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/module.h>

#include <linux/random.h>

#include <generated/utsrelease.h>

#include "nvmet.h"
@@ -83,7 +82,6 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req) 
{

	struct nvmet_ctrl *ctrl = req->sq->ctrl;

	struct nvme_id_ctrl *id;

	u64 serial;

	u16 status = 0;



	id = kzalloc(sizeof(*id), GFP_KERNEL);
@@ -96,10 +94,8 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req) 
	id->vid = 0;

	id->ssvid = 0;



	/* generate a random serial number as our controllers are ephemeral: */

	get_random_bytes(&serial, sizeof(serial));

	memset(id->sn, ' ', sizeof(id->sn));

	snprintf(id->sn, sizeof(id->sn), "%llx", serial);

	snprintf(id->sn, sizeof(id->sn), "%llx", ctrl->serial);



	memset(id->mn, ' ', sizeof(id->mn));

	strncpy((char *)id->mn, "Linux", sizeof(id->mn));

drivers/nvme/target/core.c

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 */

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/module.h>

#include <linux/random.h>

#include "nvmet.h"



static struct nvmet_fabrics_ops *nvmet_transports[NVMF_TRTYPE_MAX];
@@ -728,6 +729,9 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn, 
	memcpy(ctrl->subsysnqn, subsysnqn, NVMF_NQN_SIZE);

	memcpy(ctrl->hostnqn, hostnqn, NVMF_NQN_SIZE);



	/* generate a random serial number as our controllers are ephemeral: */

	get_random_bytes(&ctrl->serial, sizeof(ctrl->serial));



	kref_init(&ctrl->ref);

	ctrl->subsys = subsys;

drivers/nvme/target/nvmet.h

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ struct nvmet_ctrl { 


	struct mutex		lock;

	u64			cap;

	u64			serial;

	u32			cc;

	u32			csts;