lkml.org 
[lkml]   [2018]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [PATCH v9 13/13] nvmet: Optionally use PCI P2P memory
From
Date

> diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h
> index e7b7406c4e22..4333e2c5b4f5 100644
> --- a/drivers/nvme/target/nvmet.h
> +++ b/drivers/nvme/target/nvmet.h
> @@ -26,6 +26,7 @@
> #include <linux/configfs.h>
> #include <linux/rcupdate.h>
> #include <linux/blkdev.h>
> +#include <linux/radix-tree.h>
>
> #define NVMET_ASYNC_EVENTS 4
> #define NVMET_ERROR_LOG_SLOTS 128
> @@ -77,6 +78,9 @@ struct nvmet_ns {
> struct completion disable_done;
> mempool_t *bvec_pool;
> struct kmem_cache *bvec_cache;
> +
> + int use_p2pmem;
> + struct pci_dev *p2p_dev;
> };
>
> static inline struct nvmet_ns *to_nvmet_ns(struct config_item *item)
> @@ -84,6 +88,11 @@ static inline struct nvmet_ns *to_nvmet_ns(struct config_item *item)
> return container_of(to_config_group(item), struct nvmet_ns, group);
> }
>
> +static inline struct device *nvmet_ns_dev(struct nvmet_ns *ns)
> +{
> + return disk_to_dev(ns->bdev->bd_disk);
> +}

This needs to handle non bdev namespaces.

> +
> struct nvmet_cq {
> u16 qid;
> u16 size;
> @@ -184,6 +193,9 @@ struct nvmet_ctrl {
>
> char subsysnqn[NVMF_NQN_FIELD_LEN];
> char hostnqn[NVMF_NQN_FIELD_LEN];
> +
> + struct device *p2p_client;
> + struct radix_tree_root p2p_ns_map;
> };
>
> struct nvmet_subsys {
> @@ -294,6 +306,9 @@ struct nvmet_req {
>
> void (*execute)(struct nvmet_req *req);
> const struct nvmet_fabrics_ops *ops;
> +
> + struct pci_dev *p2p_dev;
> + struct device *p2p_client;
> };
>
> extern struct workqueue_struct *buffered_io_wq;
> diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
> index 9e091e78a2f0..3f7971d3706d 100644
> --- a/drivers/nvme/target/rdma.c
> +++ b/drivers/nvme/target/rdma.c
> @@ -749,6 +749,8 @@ static void nvmet_rdma_handle_command(struct nvmet_rdma_queue *queue,
> cmd->send_sge.addr, cmd->send_sge.length,
> DMA_TO_DEVICE);
>
> + cmd->req.p2p_client = &queue->dev->device->dev;
> +
> if (!nvmet_req_init(&cmd->req, &queue->nvme_cq,
> &queue->nvme_sq, &nvmet_rdma_ops))
> return;

And this?
--
diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c
index ef286b72d958..3d12f5f4568d 100644
--- a/drivers/nvme/target/fc.c
+++ b/drivers/nvme/target/fc.c
@@ -2280,6 +2280,7 @@ nvmet_fc_handle_fcp_rqst(struct nvmet_fc_tgtport
*tgtport,
fod->req.cmd = &fod->cmdiubuf.sqe;
fod->req.rsp = &fod->rspiubuf.cqe;
fod->req.port = tgtport->pe->port;
+ fod->req.p2p_client = tgtport->dev;

/* clear any response payload */
memset(&fod->rspiubuf, 0, sizeof(fod->rspiubuf));
--
Other than that this looks good!

\
 
 \ /
  Last update: 2018-10-05 00:22    [W:0.109 / U:17.268 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site