nvme: directly cache command effects log
Keith Busch
maintainerPATCH 1/1 nvme: directly cache command effects log
Remove the struct used for tracking known command effects logs in a list. This is now saved in an xarray that doesn't use these elements. Instead, store the log directly instead of the wrapper struct.
Signed-off-by Keith Busch <[email protected]>
--- drivers/nvme/host/core.c | 9 ++++----- drivers/nvme/host/nvme.h | 6 ------ 2 files changed, 4 insertions(+), 11 deletions(-)
drivers/nvme/host/core.c +4 -5
@@ -2954,7 +2954,7 @@ int nvme_get_log(struct nvme_ctrl *ctrl, u32 nsid, u8 log_page, u8 lsp, u8 csi,static int nvme_get_effects_log (struct nvme_ctrl *ctrl,u8 csi,struct nvme_effects_log **log) { -struct nvme_cel *cel =xa_load (&ctrl->cels, csi); +struct nvme_effects_log *cel =xa_load (&ctrl->cels, csi);int ret;if (cel)
@@ -2965,16 +2965,15 @@ static int nvme_get_effects_log(struct nvme_ctrl *ctrl, u8 csi,return -ENOMEM ; ret =nvme_get_log (ctrl,0x00 ,NVME_LOG_CMD_EFFECTS ,0 , csi, - &cel->log,sizeof (cel->log),0 ); + cel,sizeof (*cel),0 );if (ret) {kfree (cel);return ret; } - cel->csi = csi; -xa_store (&ctrl->cels, cel->csi, cel,GFP_KERNEL ); +xa_store (&ctrl->cels, csi, cel,GFP_KERNEL ); out: - *log = &cel->log; + *log = cel;return 0 ; }
drivers/nvme/host/nvme.h +0 -6
@@ -227,12 +227,6 @@ struct nvme_fault_inject {#endif }; -struct nvme_cel { -struct list_head entry; -struct nvme_effects_log log; -u8 csi; -}; -struct nvme_ctrl {bool comp_seen;enum nvme_ctrl_state state;
Signature · 7 lines
2.24.1 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Thanks, applied to nvme-5.10.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme