diff for duplicates of <3527faf1-3f3a-88d0-caa8-d94d75437d73@deltatee.com>
diff --git a/a/1.txt b/N1/1.txt
index a55cf29..38faf3f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -25,8 +25,4 @@ On 01/03/18 03:32 AM, Sagi Grimberg wrote:
Yes, that sounds like a good idea. We can make that change for v3.
-Logan
-_______________________________________________
-Linux-nvdimm mailing list
-Linux-nvdimm@lists.01.org
-https://lists.01.org/mailman/listinfo/linux-nvdimm
\ No newline at end of file
+Logan
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 0c65e84..d01ee8b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -26,15 +26,17 @@
" linux-block\@vger.kernel.org\0"
]
[
- "Cc\0Jens Axboe <axboe\@kernel.dk>",
- " Benjamin Herrenschmidt <benh\@kernel.crashing.org>",
- " Alex Williamson <alex.williamson\@redhat.com>",
+ "Cc\0Stephen Bates <sbates\@raithlin.com>",
+ " Christoph Hellwig <hch\@lst.de>",
+ " Jens Axboe <axboe\@kernel.dk>",
" Keith Busch <keith.busch\@intel.com>",
- " J\303\251r\303\264me Glisse <jglisse\@redhat.com>",
- " Jason Gunthorpe <jgg\@mellanox.com>",
" Bjorn Helgaas <bhelgaas\@google.com>",
+ " Jason Gunthorpe <jgg\@mellanox.com>",
" Max Gurtovoy <maxg\@mellanox.com>",
- " Christoph Hellwig <hch\@lst.de>\0"
+ " Dan Williams <dan.j.williams\@intel.com>",
+ " J\303\251r\303\264me Glisse <jglisse\@redhat.com>",
+ " Benjamin Herrenschmidt <benh\@kernel.crashing.org>",
+ " Alex Williamson <alex.williamson\@redhat.com>\0"
]
[
"\0000:1\0"
@@ -70,11 +72,7 @@
"\n",
"Yes, that sounds like a good idea. We can make that change for v3.\n",
"\n",
- "Logan\n",
- "_______________________________________________\n",
- "Linux-nvdimm mailing list\n",
- "Linux-nvdimm\@lists.01.org\n",
- "https://lists.01.org/mailman/listinfo/linux-nvdimm"
+ "Logan"
]
-301847b86a3fa0f95063d2a30b26cda5dd61d7016ce3869da97461f8f9bbe175
+e3b592424be33ad28d64d7d9d36543318ac8de78a235baba073d954351441d18
diff --git a/a/content_digest b/N2/content_digest
index 0c65e84..c63422d 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,7 +8,10 @@
"ref\00072e90cc2-c05a-3ed8-42c7-e4d7a0d535d8\@grimberg.me\0"
]
[
- "From\0Logan Gunthorpe <logang\@deltatee.com>\0"
+ "ref\00072e90cc2-c05a-3ed8-42c7-e4d7a0d535d8-NQWnxTmZq1alnMjI0IkVqw\@public.gmane.org\0"
+]
+[
+ "From\0Logan Gunthorpe <logang-OTvnGxWRz7hWk0Htik3J/w\@public.gmane.org>\0"
]
[
"Subject\0Re: [PATCH v2 06/10] IB/core: Add optional PCI P2P flag to rdma_rw_ctx_[init|destroy]()\0"
@@ -17,24 +20,24 @@
"Date\0Thu, 1 Mar 2018 10:16:24 -0700\0"
]
[
- "To\0Sagi Grimberg <sagi\@grimberg.me>",
- " linux-kernel\@vger.kernel.org",
- " linux-pci\@vger.kernel.org",
- " linux-nvme\@lists.infradead.org",
- " linux-rdma\@vger.kernel.org",
- " linux-nvdimm\@lists.01.org",
- " linux-block\@vger.kernel.org\0"
+ "To\0Sagi Grimberg <sagi-NQWnxTmZq1alnMjI0IkVqw\@public.gmane.org>",
+ " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-pci-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-nvme-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
+ " linux-rdma-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw\@public.gmane.org",
+ " linux-block-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org\0"
]
[
- "Cc\0Jens Axboe <axboe\@kernel.dk>",
- " Benjamin Herrenschmidt <benh\@kernel.crashing.org>",
- " Alex Williamson <alex.williamson\@redhat.com>",
- " Keith Busch <keith.busch\@intel.com>",
- " J\303\251r\303\264me Glisse <jglisse\@redhat.com>",
- " Jason Gunthorpe <jgg\@mellanox.com>",
- " Bjorn Helgaas <bhelgaas\@google.com>",
- " Max Gurtovoy <maxg\@mellanox.com>",
- " Christoph Hellwig <hch\@lst.de>\0"
+ "Cc\0Jens Axboe <axboe-tSWWG44O7X1aa/9Udqfwiw\@public.gmane.org>",
+ " Benjamin Herrenschmidt <benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r\@public.gmane.org>",
+ " Alex Williamson <alex.williamson-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org>",
+ " Keith Busch <keith.busch-ral2JQCrhuEAvxtiuMwx3w\@public.gmane.org>",
+ " J\303\251r\303\264me Glisse <jglisse-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org>",
+ " Jason Gunthorpe <jgg-VPRAkNaXOzVWk0Htik3J/w\@public.gmane.org>",
+ " Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA\@public.gmane.org>",
+ " Max Gurtovoy <maxg-VPRAkNaXOzVWk0Htik3J/w\@public.gmane.org>",
+ " Christoph Hellwig <hch-jcswGhMUV9g\@public.gmane.org>\0"
]
[
"\0000:1\0"
@@ -77,4 +80,4 @@
"https://lists.01.org/mailman/listinfo/linux-nvdimm"
]
-301847b86a3fa0f95063d2a30b26cda5dd61d7016ce3869da97461f8f9bbe175
+aabeca6c22c609269ae7c99c7931250a1621be4f24c6b108f2753875440650a9
diff --git a/a/1.txt b/N3/1.txt
index a55cf29..f90d422 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -4,20 +4,20 @@ Thanks for the review!
On 01/03/18 03:32 AM, Sagi Grimberg wrote:
->> int rdma_rw_ctx_init(struct rdma_rw_ctx *ctx, struct ib_qp *qp, u8
+>> ? int rdma_rw_ctx_init(struct rdma_rw_ctx *ctx, struct ib_qp *qp, u8
>> port_num,
->> struct scatterlist *sg, u32 sg_cnt, u32 sg_offset,
->> - u64 remote_addr, u32 rkey, enum dma_data_direction dir)
->> + u64 remote_addr, u32 rkey, enum dma_data_direction dir,
->> + unsigned int flags)
->> {
->> struct ib_device *dev = qp->pd->device;
->> int ret;
->> - ret = ib_dma_map_sg(dev, sg, sg_cnt, dir);
->> + if (flags & RDMA_RW_CTX_FLAG_PCI_P2PDMA)
->> + ret = pci_p2pdma_map_sg(dev->dma_device, sg, sg_cnt, dir);
->> + else
->> + ret = ib_dma_map_sg(dev, sg, sg_cnt, dir);
+>> ????????? struct scatterlist *sg, u32 sg_cnt, u32 sg_offset,
+>> -??????? u64 remote_addr, u32 rkey, enum dma_data_direction dir)
+>> +??????? u64 remote_addr, u32 rkey, enum dma_data_direction dir,
+>> +??????? unsigned int flags)
+>> ? {
+>> ????? struct ib_device *dev = qp->pd->device;
+>> ????? int ret;
+>> -??? ret = ib_dma_map_sg(dev, sg, sg_cnt, dir);
+>> +??? if (flags & RDMA_RW_CTX_FLAG_PCI_P2PDMA)
+>> +??????? ret = pci_p2pdma_map_sg(dev->dma_device, sg, sg_cnt, dir);
+>> +??? else
+>> +??????? ret = ib_dma_map_sg(dev, sg, sg_cnt, dir);
>> +
>
> Why not use is_pci_p2pdma_page(sg) instead of a flag? It would be so
@@ -25,8 +25,4 @@ On 01/03/18 03:32 AM, Sagi Grimberg wrote:
Yes, that sounds like a good idea. We can make that change for v3.
-Logan
-_______________________________________________
-Linux-nvdimm mailing list
-Linux-nvdimm@lists.01.org
-https://lists.01.org/mailman/listinfo/linux-nvdimm
\ No newline at end of file
+Logan
\ No newline at end of file
diff --git a/a/content_digest b/N3/content_digest
index 0c65e84..e0b166e 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -8,34 +8,14 @@
"ref\00072e90cc2-c05a-3ed8-42c7-e4d7a0d535d8\@grimberg.me\0"
]
[
- "From\0Logan Gunthorpe <logang\@deltatee.com>\0"
+ "From\0logang\@deltatee.com (Logan Gunthorpe)\0"
]
[
- "Subject\0Re: [PATCH v2 06/10] IB/core: Add optional PCI P2P flag to rdma_rw_ctx_[init|destroy]()\0"
+ "Subject\0[PATCH v2 06/10] IB/core: Add optional PCI P2P flag to rdma_rw_ctx_[init|destroy]()\0"
]
[
"Date\0Thu, 1 Mar 2018 10:16:24 -0700\0"
]
-[
- "To\0Sagi Grimberg <sagi\@grimberg.me>",
- " linux-kernel\@vger.kernel.org",
- " linux-pci\@vger.kernel.org",
- " linux-nvme\@lists.infradead.org",
- " linux-rdma\@vger.kernel.org",
- " linux-nvdimm\@lists.01.org",
- " linux-block\@vger.kernel.org\0"
-]
-[
- "Cc\0Jens Axboe <axboe\@kernel.dk>",
- " Benjamin Herrenschmidt <benh\@kernel.crashing.org>",
- " Alex Williamson <alex.williamson\@redhat.com>",
- " Keith Busch <keith.busch\@intel.com>",
- " J\303\251r\303\264me Glisse <jglisse\@redhat.com>",
- " Jason Gunthorpe <jgg\@mellanox.com>",
- " Bjorn Helgaas <bhelgaas\@google.com>",
- " Max Gurtovoy <maxg\@mellanox.com>",
- " Christoph Hellwig <hch\@lst.de>\0"
-]
[
"\0000:1\0"
]
@@ -49,20 +29,20 @@
"\n",
"\n",
"On 01/03/18 03:32 AM, Sagi Grimberg wrote:\n",
- ">> \302\240 int rdma_rw_ctx_init(struct rdma_rw_ctx *ctx, struct ib_qp *qp, u8 \n",
+ ">> ? int rdma_rw_ctx_init(struct rdma_rw_ctx *ctx, struct ib_qp *qp, u8 \n",
">> port_num,\n",
- ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct scatterlist *sg, u32 sg_cnt, u32 sg_offset,\n",
- ">> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240 u64 remote_addr, u32 rkey, enum dma_data_direction dir)\n",
- ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240 u64 remote_addr, u32 rkey, enum dma_data_direction dir,\n",
- ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240 unsigned int flags)\n",
- ">> \302\240 {\n",
- ">> \302\240\302\240\302\240\302\240\302\240 struct ib_device *dev = qp->pd->device;\n",
- ">> \302\240\302\240\302\240\302\240\302\240 int ret;\n",
- ">> -\302\240\302\240\302\240 ret = ib_dma_map_sg(dev, sg, sg_cnt, dir);\n",
- ">> +\302\240\302\240\302\240 if (flags & RDMA_RW_CTX_FLAG_PCI_P2PDMA)\n",
- ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240 ret = pci_p2pdma_map_sg(dev->dma_device, sg, sg_cnt, dir);\n",
- ">> +\302\240\302\240\302\240 else\n",
- ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240 ret = ib_dma_map_sg(dev, sg, sg_cnt, dir);\n",
+ ">> ????????? struct scatterlist *sg, u32 sg_cnt, u32 sg_offset,\n",
+ ">> -??????? u64 remote_addr, u32 rkey, enum dma_data_direction dir)\n",
+ ">> +??????? u64 remote_addr, u32 rkey, enum dma_data_direction dir,\n",
+ ">> +??????? unsigned int flags)\n",
+ ">> ? {\n",
+ ">> ????? struct ib_device *dev = qp->pd->device;\n",
+ ">> ????? int ret;\n",
+ ">> -??? ret = ib_dma_map_sg(dev, sg, sg_cnt, dir);\n",
+ ">> +??? if (flags & RDMA_RW_CTX_FLAG_PCI_P2PDMA)\n",
+ ">> +??????? ret = pci_p2pdma_map_sg(dev->dma_device, sg, sg_cnt, dir);\n",
+ ">> +??? else\n",
+ ">> +??????? ret = ib_dma_map_sg(dev, sg, sg_cnt, dir);\n",
">> +\n",
"> \n",
"> Why not use is_pci_p2pdma_page(sg) instead of a flag? It would be so\n",
@@ -70,11 +50,7 @@
"\n",
"Yes, that sounds like a good idea. We can make that change for v3.\n",
"\n",
- "Logan\n",
- "_______________________________________________\n",
- "Linux-nvdimm mailing list\n",
- "Linux-nvdimm\@lists.01.org\n",
- "https://lists.01.org/mailman/listinfo/linux-nvdimm"
+ "Logan"
]
-301847b86a3fa0f95063d2a30b26cda5dd61d7016ce3869da97461f8f9bbe175
+64af064550d1a552c4c198cdb017cc49fce55a82849e727ca35374a616faed10
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.