Commit 7114ddeb authored by Jay Sternberg's avatar Jay Sternberg Committed by Jens Axboe
Browse files

nvmet: change aen mask functions to use bit numbers 



Functions nvmet_aen_disabled and nvmet_clear_aen were using
values not bit numbers ie 1 << 9 not 9 for bit function clear_bit
and test_and_set_bit.

Signed-off-by: default avatarJay Sternberg <jay.e.sternberg@intel.com>
Reviewed-by: default avatarPhil Cayton <phil.cayton@intel.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6c8312ad

drivers/nvme/target/admin-cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static void nvmet_execute_get_log_changed_ns(struct nvmet_req *req) 
	if (!status)

		status = nvmet_zero_sgl(req, len, req->data_len - len);

	ctrl->nr_changed_ns = 0;

	nvmet_clear_aen(req, NVME_AEN_CFG_NS_ATTR);

	nvmet_clear_aen_bit(req, NVME_AEN_BIT_NS_ATTR);

	mutex_unlock(&ctrl->lock);

out:

	nvmet_req_complete(req, status);
@@ -239,7 +239,7 @@ static void nvmet_execute_get_log_page_ana(struct nvmet_req *req) 


	hdr.chgcnt = cpu_to_le64(nvmet_ana_chgcnt);

	hdr.ngrps = cpu_to_le16(ngrps);

	nvmet_clear_aen(req, NVME_AEN_CFG_ANA_CHANGE);

	nvmet_clear_aen_bit(req, NVME_AEN_BIT_ANA_CHANGE);

	up_read(&nvmet_ana_sem);



	kfree(desc);

drivers/nvme/target/core.c

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ void nvmet_ns_changed(struct nvmet_subsys *subsys, u32 nsid) 


	list_for_each_entry(ctrl, &subsys->ctrls, subsys_entry) {

		nvmet_add_to_changed_ns_log(ctrl, cpu_to_le32(nsid));

		if (nvmet_aen_disabled(ctrl, NVME_AEN_CFG_NS_ATTR))

		if (nvmet_aen_bit_disabled(ctrl, NVME_AEN_BIT_NS_ATTR))

			continue;

		nvmet_add_async_event(ctrl, NVME_AER_TYPE_NOTICE,

				NVME_AER_NOTICE_NS_CHANGED,
@@ -197,7 +197,7 @@ void nvmet_send_ana_event(struct nvmet_subsys *subsys, 
	list_for_each_entry(ctrl, &subsys->ctrls, subsys_entry) {

		if (port && ctrl->port != port)

			continue;

		if (nvmet_aen_disabled(ctrl, NVME_AEN_CFG_ANA_CHANGE))

		if (nvmet_aen_bit_disabled(ctrl, NVME_AEN_BIT_ANA_CHANGE))

			continue;

		nvmet_add_async_event(ctrl, NVME_AER_TYPE_NOTICE,

				NVME_AER_NOTICE_ANA, NVME_LOG_ANA);

drivers/nvme/target/nvmet.h

+5 −5
Original line number Diff line number Diff line
@@ -342,19 +342,19 @@ struct nvmet_async_event { 
	u8			log_page;

};



static inline void nvmet_clear_aen(struct nvmet_req *req, u32 aen_bit)

static inline void nvmet_clear_aen_bit(struct nvmet_req *req, u32 bn)

{

	int rae = le32_to_cpu(req->cmd->common.cdw10[0]) & 1 << 15;



	if (!rae)

		clear_bit(aen_bit, &req->sq->ctrl->aen_masked);

		clear_bit(bn, &req->sq->ctrl->aen_masked);

}



static inline bool nvmet_aen_disabled(struct nvmet_ctrl *ctrl, u32 aen)

static inline bool nvmet_aen_bit_disabled(struct nvmet_ctrl *ctrl, u32 bn)

{

	if (!(READ_ONCE(ctrl->aen_enabled) & aen))

	if (!(READ_ONCE(ctrl->aen_enabled) & (1 << bn)))

		return true;

	return test_and_set_bit(aen, &ctrl->aen_masked);

	return test_and_set_bit(bn, &ctrl->aen_masked);

}



u16 nvmet_parse_connect_cmd(struct nvmet_req *req);

include/linux/nvme.h

+9 −3
Original line number Diff line number Diff line
@@ -489,9 +489,15 @@ enum { 
};



enum {

	NVME_AEN_CFG_NS_ATTR		= 1 << 8,

	NVME_AEN_CFG_FW_ACT		= 1 << 9,

	NVME_AEN_CFG_ANA_CHANGE		= 1 << 11,

	NVME_AEN_BIT_NS_ATTR		= 8,

	NVME_AEN_BIT_FW_ACT		= 9,

	NVME_AEN_BIT_ANA_CHANGE		= 11,

};



enum {

	NVME_AEN_CFG_NS_ATTR		= 1 << NVME_AEN_BIT_NS_ATTR,

	NVME_AEN_CFG_FW_ACT		= 1 << NVME_AEN_BIT_FW_ACT,

	NVME_AEN_CFG_ANA_CHANGE		= 1 << NVME_AEN_BIT_ANA_CHANGE,

};



struct nvme_lba_range_type {

CRA Git | Maintained and supported by SUSTech CRA and CCSE