* [PATCH] RDMA: Fix software RDMA drivers for dma mapping error
@ 2020-10-30 9:38 Parav Pandit
2020-10-30 9:48 ` Guoqing Jiang
` (5 more replies)
0 siblings, 6 replies; 14+ messages in thread
From: Parav Pandit @ 2020-10-30 9:38 UTC (permalink / raw)
To: dennis.dalessandro, mike.marciniszyn, dledford, jgg, yanjunz,
bmt, linux-rdma
Cc: hch, Parav Pandit, syzbot+34dc2fea3478e659af01
A cited commit in fixes tag avoided setting dma_mask of the ib_device.
Commit [1] made dma_mask as mandetory field to be setup even for
dma_virt_ops based dma devices. Due to which below call trace occurred.
Fix it by setting empty DMA MASK for software based RDMA devices.
WARNING: CPU: 1 PID: 8488 at kernel/dma/mapping.c:149
dma_map_page_attrs+0x493/0x700 kernel/dma/mapping.c:149 Modules linked in:
CPU: 1 PID: 8488 Comm: syz-executor144 Not tainted 5.9.0-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine,
BIOS Google 01/01/2011
RIP: 0010:dma_map_page_attrs+0x493/0x700 kernel/dma/mapping.c:149
Trace:
dma_map_single_attrs include/linux/dma-mapping.h:279 [inline]
ib_dma_map_single include/rdma/ib_verbs.h:3967 [inline]
ib_mad_post_receive_mads+0x23f/0xd60
drivers/infiniband/core/mad.c:2715
ib_mad_port_start drivers/infiniband/core/mad.c:2862 [inline]
ib_mad_port_open drivers/infiniband/core/mad.c:3016 [inline]
ib_mad_init_device+0x72b/0x1400 drivers/infiniband/core/mad.c:3092
add_client_context+0x405/0x5e0 drivers/infiniband/core/device.c:680
enable_device_and_get+0x1d5/0x3c0
drivers/infiniband/core/device.c:1301
ib_register_device drivers/infiniband/core/device.c:1376 [inline]
ib_register_device+0x7a7/0xa40 drivers/infiniband/core/device.c:1335
rxe_register_device+0x46d/0x570
drivers/infiniband/sw/rxe/rxe_verbs.c:1182
rxe_add+0x12fe/0x16d0 drivers/infiniband/sw/rxe/rxe.c:247
rxe_net_add+0x8c/0xe0 drivers/infiniband/sw/rxe/rxe_net.c:507
rxe_newlink drivers/infiniband/sw/rxe/rxe.c:269 [inline]
rxe_newlink+0xb7/0xe0 drivers/infiniband/sw/rxe/rxe.c:250
nldev_newlink+0x30e/0x540 drivers/infiniband/core/nldev.c:1555
rdma_nl_rcv_msg+0x367/0x690 drivers/infiniband/core/netlink.c:195
rdma_nl_rcv_skb drivers/infiniband/core/netlink.c:239 [inline]
rdma_nl_rcv+0x2f2/0x440 drivers/infiniband/core/netlink.c:259
netlink_unicast_kernel net/netlink/af_netlink.c:1304 [inline]
netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1330
netlink_sendmsg+0x856/0xd90 net/netlink/af_netlink.c:1919
sock_sendmsg_nosec net/socket.c:651 [inline]
sock_sendmsg+0xcf/0x120 net/socket.c:671
____sys_sendmsg+0x6e8/0x810 net/socket.c:2353
___sys_sendmsg+0xf3/0x170 net/socket.c:2407
__sys_sendmsg+0xe5/0x1b0 net/socket.c:2440
do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46
entry_SYSCALL_64_after_hwframe+0x44/0xa9
RIP: 0033:0x443699
[1] commit f959dcd6ddfd ("dma-direct: Fix potential NULL pointer dereference")
Reported-by: syzbot+34dc2fea3478e659af01@syzkaller.appspotmail.com
Fixes: e0477b34d9d1 ("RDMA: Explicitly pass in the dma_device to ib_register_device")
Signed-off-by: Parav Pandit <parav@nvidia.com>
---
drivers/infiniband/sw/rdmavt/vt.c | 7 +++++--
drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +++++-
drivers/infiniband/sw/siw/siw_main.c | 7 +++++--
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
index 43fbc4e54edf..5bd817490b1f 100644
--- a/drivers/infiniband/sw/rdmavt/vt.c
+++ b/drivers/infiniband/sw/rdmavt/vt.c
@@ -525,6 +525,7 @@ static noinline int check_support(struct rvt_dev_info *rdi, int verb)
int rvt_register_device(struct rvt_dev_info *rdi)
{
int ret = 0, i;
+ u64 dma_mask;
if (!rdi)
return -EINVAL;
@@ -581,8 +582,10 @@ int rvt_register_device(struct rvt_dev_info *rdi)
/* DMA Operations */
rdi->ibdev.dev.dma_parms = rdi->ibdev.dev.parent->dma_parms;
- dma_set_coherent_mask(&rdi->ibdev.dev,
- rdi->ibdev.dev.parent->coherent_dma_mask);
+ dma_mask = IS_ENABLED(CONFIG_64BIT) ? DMA_BIT_MASK(64) : DMA_BIT_MASK(32);
+ ret = dma_coerce_mask_and_coherent(&rdi->ibdev.dev, dma_mask);
+ if (ret)
+ goto bail_wss;
/* Protection Domain */
spin_lock_init(&rdi->n_pds_lock);
diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
index 7652d53af2c1..50ad3dded786 100644
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@ -1128,6 +1128,7 @@ int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name)
int err;
struct ib_device *dev = &rxe->ib_dev;
struct crypto_shash *tfm;
+ u64 dma_mask;
strlcpy(dev->node_desc, "rxe", sizeof(dev->node_desc));
@@ -1140,7 +1141,10 @@ int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name)
rxe->ndev->dev_addr);
dev->dev.dma_parms = &rxe->dma_parms;
dma_set_max_seg_size(&dev->dev, UINT_MAX);
- dma_set_coherent_mask(&dev->dev, dma_get_required_mask(&dev->dev));
+ dma_mask = IS_ENABLED(CONFIG_64BIT) ? DMA_BIT_MASK(64) : DMA_BIT_MASK(32);
+ err = dma_coerce_mask_and_coherent(&dev->dev, dma_mask);
+ if (err)
+ return err;
dev->uverbs_cmd_mask |= BIT_ULL(IB_USER_VERBS_CMD_REQ_NOTIFY_CQ);
diff --git a/drivers/infiniband/sw/siw/siw_main.c b/drivers/infiniband/sw/siw/siw_main.c
index e49faefdee92..6fe120187238 100644
--- a/drivers/infiniband/sw/siw/siw_main.c
+++ b/drivers/infiniband/sw/siw/siw_main.c
@@ -306,6 +306,7 @@ static struct siw_device *siw_device_create(struct net_device *netdev)
struct siw_device *sdev = NULL;
struct ib_device *base_dev;
struct device *parent = netdev->dev.parent;
+ u64 dma_mask;
int rv;
if (!parent) {
@@ -360,8 +361,10 @@ static struct siw_device *siw_device_create(struct net_device *netdev)
base_dev->dev.parent = parent;
base_dev->dev.dma_parms = &sdev->dma_parms;
dma_set_max_seg_size(&base_dev->dev, UINT_MAX);
- dma_set_coherent_mask(&base_dev->dev,
- dma_get_required_mask(&base_dev->dev));
+ dma_mask = IS_ENABLED(CONFIG_64BIT) ? DMA_BIT_MASK(64) : DMA_BIT_MASK(32);
+ if (dma_coerce_mask_and_coherent(&base_dev->dev, dma_mask))
+ goto error;
+
base_dev->num_comp_vectors = num_possible_cpus();
xa_init_flags(&sdev->qp_xa, XA_FLAGS_ALLOC1);
--
2.26.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH] RDMA: Fix software RDMA drivers for dma mapping error
2020-10-30 9:38 [PATCH] RDMA: Fix software RDMA drivers for dma mapping error Parav Pandit
@ 2020-10-30 9:48 ` Guoqing Jiang
2020-10-30 12:04 ` Dennis Dalessandro
` (4 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Guoqing Jiang @ 2020-10-30 9:48 UTC (permalink / raw)
To: Parav Pandit, dennis.dalessandro, mike.marciniszyn, dledford,
jgg, yanjunz, bmt, linux-rdma
Cc: hch, syzbot+34dc2fea3478e659af01
On 10/30/20 10:38, Parav Pandit wrote:
> A cited commit in fixes tag avoided setting dma_mask of the ib_device.
> Commit [1] made dma_mask as mandetory field to be setup even for
> dma_virt_ops based dma devices. Due to which below call trace occurred.
>
> Fix it by setting empty DMA MASK for software based RDMA devices.
>
> WARNING: CPU: 1 PID: 8488 at kernel/dma/mapping.c:149
> dma_map_page_attrs+0x493/0x700 kernel/dma/mapping.c:149 Modules linked in:
> CPU: 1 PID: 8488 Comm: syz-executor144 Not tainted 5.9.0-syzkaller #0
> Hardware name: Google Google Compute Engine/Google Compute Engine,
> BIOS Google 01/01/2011
> RIP: 0010:dma_map_page_attrs+0x493/0x700 kernel/dma/mapping.c:149
> Trace:
> dma_map_single_attrs include/linux/dma-mapping.h:279 [inline]
> ib_dma_map_single include/rdma/ib_verbs.h:3967 [inline]
> ib_mad_post_receive_mads+0x23f/0xd60
> drivers/infiniband/core/mad.c:2715
> ib_mad_port_start drivers/infiniband/core/mad.c:2862 [inline]
> ib_mad_port_open drivers/infiniband/core/mad.c:3016 [inline]
> ib_mad_init_device+0x72b/0x1400 drivers/infiniband/core/mad.c:3092
> add_client_context+0x405/0x5e0 drivers/infiniband/core/device.c:680
> enable_device_and_get+0x1d5/0x3c0
> drivers/infiniband/core/device.c:1301
> ib_register_device drivers/infiniband/core/device.c:1376 [inline]
> ib_register_device+0x7a7/0xa40 drivers/infiniband/core/device.c:1335
> rxe_register_device+0x46d/0x570
> drivers/infiniband/sw/rxe/rxe_verbs.c:1182
> rxe_add+0x12fe/0x16d0 drivers/infiniband/sw/rxe/rxe.c:247
> rxe_net_add+0x8c/0xe0 drivers/infiniband/sw/rxe/rxe_net.c:507
> rxe_newlink drivers/infiniband/sw/rxe/rxe.c:269 [inline]
> rxe_newlink+0xb7/0xe0 drivers/infiniband/sw/rxe/rxe.c:250
> nldev_newlink+0x30e/0x540 drivers/infiniband/core/nldev.c:1555
> rdma_nl_rcv_msg+0x367/0x690 drivers/infiniband/core/netlink.c:195
> rdma_nl_rcv_skb drivers/infiniband/core/netlink.c:239 [inline]
> rdma_nl_rcv+0x2f2/0x440 drivers/infiniband/core/netlink.c:259
> netlink_unicast_kernel net/netlink/af_netlink.c:1304 [inline]
> netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1330
> netlink_sendmsg+0x856/0xd90 net/netlink/af_netlink.c:1919
> sock_sendmsg_nosec net/socket.c:651 [inline]
> sock_sendmsg+0xcf/0x120 net/socket.c:671
> ____sys_sendmsg+0x6e8/0x810 net/socket.c:2353
> ___sys_sendmsg+0xf3/0x170 net/socket.c:2407
> __sys_sendmsg+0xe5/0x1b0 net/socket.c:2440
> do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46
> entry_SYSCALL_64_after_hwframe+0x44/0xa9
> RIP: 0033:0x443699
>
> [1] commit f959dcd6ddfd ("dma-direct: Fix potential NULL pointer dereference")
>
> Reported-by: syzbot+34dc2fea3478e659af01@syzkaller.appspotmail.com
> Fixes: e0477b34d9d1 ("RDMA: Explicitly pass in the dma_device to ib_register_device")
> Signed-off-by: Parav Pandit <parav@nvidia.com>
> ---
Fixed the issue which happened in my test.
Tested-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
Guoqing
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] RDMA: Fix software RDMA drivers for dma mapping error
2020-10-30 9:38 [PATCH] RDMA: Fix software RDMA drivers for dma mapping error Parav Pandit
2020-10-30 9:48 ` Guoqing Jiang
@ 2020-10-30 12:04 ` Dennis Dalessandro
2020-10-30 12:17 ` Jason Gunthorpe
` (3 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Dennis Dalessandro @ 2020-10-30 12:04 UTC (permalink / raw)
To: Parav Pandit, mike.marciniszyn, dledford, jgg, yanjunz, bmt, linux-rdma
Cc: hch, syzbot+34dc2fea3478e659af01
On 10/30/2020 5:38 AM, Parav Pandit wrote:
> A cited commit in fixes tag avoided setting dma_mask of the ib_device.
> Commit [1] made dma_mask as mandetory field to be setup even for
> dma_virt_ops based dma devices. Due to which below call trace occurred.
>
> Fix it by setting empty DMA MASK for software based RDMA devices.
>
> WARNING: CPU: 1 PID: 8488 at kernel/dma/mapping.c:149
> dma_map_page_attrs+0x493/0x700 kernel/dma/mapping.c:149 Modules linked in:
> CPU: 1 PID: 8488 Comm: syz-executor144 Not tainted 5.9.0-syzkaller #0
> Hardware name: Google Google Compute Engine/Google Compute Engine,
> BIOS Google 01/01/2011
> RIP: 0010:dma_map_page_attrs+0x493/0x700 kernel/dma/mapping.c:149
> Trace:
> dma_map_single_attrs include/linux/dma-mapping.h:279 [inline]
> ib_dma_map_single include/rdma/ib_verbs.h:3967 [inline]
> ib_mad_post_receive_mads+0x23f/0xd60
> drivers/infiniband/core/mad.c:2715
> ib_mad_port_start drivers/infiniband/core/mad.c:2862 [inline]
> ib_mad_port_open drivers/infiniband/core/mad.c:3016 [inline]
> ib_mad_init_device+0x72b/0x1400 drivers/infiniband/core/mad.c:3092
> add_client_context+0x405/0x5e0 drivers/infiniband/core/device.c:680
> enable_device_and_get+0x1d5/0x3c0
> drivers/infiniband/core/device.c:1301
> ib_register_device drivers/infiniband/core/device.c:1376 [inline]
> ib_register_device+0x7a7/0xa40 drivers/infiniband/core/device.c:1335
> rxe_register_device+0x46d/0x570
> drivers/infiniband/sw/rxe/rxe_verbs.c:1182
> rxe_add+0x12fe/0x16d0 drivers/infiniband/sw/rxe/rxe.c:247
> rxe_net_add+0x8c/0xe0 drivers/infiniband/sw/rxe/rxe_net.c:507
> rxe_newlink drivers/infiniband/sw/rxe/rxe.c:269 [inline]
> rxe_newlink+0xb7/0xe0 drivers/infiniband/sw/rxe/rxe.c:250
> nldev_newlink+0x30e/0x540 drivers/infiniband/core/nldev.c:1555
> rdma_nl_rcv_msg+0x367/0x690 drivers/infiniband/core/netlink.c:195
> rdma_nl_rcv_skb drivers/infiniband/core/netlink.c:239 [inline]
> rdma_nl_rcv+0x2f2/0x440 drivers/infiniband/core/netlink.c:259
> netlink_unicast_kernel net/netlink/af_netlink.c:1304 [inline]
> netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1330
> netlink_sendmsg+0x856/0xd90 net/netlink/af_netlink.c:1919
> sock_sendmsg_nosec net/socket.c:651 [inline]
> sock_sendmsg+0xcf/0x120 net/socket.c:671
> ____sys_sendmsg+0x6e8/0x810 net/socket.c:2353
> ___sys_sendmsg+0xf3/0x170 net/socket.c:2407
> __sys_sendmsg+0xe5/0x1b0 net/socket.c:2440
> do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46
> entry_SYSCALL_64_after_hwframe+0x44/0xa9
> RIP: 0033:0x443699
>
> [1] commit f959dcd6ddfd ("dma-direct: Fix potential NULL pointer dereference")
>
> Reported-by: syzbot+34dc2fea3478e659af01@syzkaller.appspotmail.com
> Fixes: e0477b34d9d1 ("RDMA: Explicitly pass in the dma_device to ib_register_device")
> Signed-off-by: Parav Pandit <parav@nvidia.com>
> ---
Patch did not apply cleanly in rxe but I took the hunk for rdmavt and it
seems to do the trick. So for the rvt bits:
Tested-by: Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] RDMA: Fix software RDMA drivers for dma mapping error
2020-10-30 9:38 [PATCH] RDMA: Fix software RDMA drivers for dma mapping error Parav Pandit
2020-10-30 9:48 ` Guoqing Jiang
2020-10-30 12:04 ` Dennis Dalessandro
@ 2020-10-30 12:17 ` Jason Gunthorpe
2020-10-30 12:19 ` Dennis Dalessandro
2020-10-30 15:01 ` Christoph Hellwig
` (2 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Jason Gunthorpe @ 2020-10-30 12:17 UTC (permalink / raw)
To: Parav Pandit
Cc: dennis.dalessandro, mike.marciniszyn, dledford, yanjunz, bmt,
linux-rdma, hch, syzbot+34dc2fea3478e659af01
On Fri, Oct 30, 2020 at 11:38:03AM +0200, Parav Pandit wrote:
> @@ -1140,7 +1141,10 @@ int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name)
> rxe->ndev->dev_addr);
> dev->dev.dma_parms = &rxe->dma_parms;
> dma_set_max_seg_size(&dev->dev, UINT_MAX);
> - dma_set_coherent_mask(&dev->dev, dma_get_required_mask(&dev->dev));
> + dma_mask = IS_ENABLED(CONFIG_64BIT) ? DMA_BIT_MASK(64) : DMA_BIT_MASK(32);
> + err = dma_coerce_mask_and_coherent(&dev->dev, dma_mask);
Since this mask doesn't actually do anything, what is the reason to
have the 64/32?
Jason
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] RDMA: Fix software RDMA drivers for dma mapping error
2020-10-30 12:17 ` Jason Gunthorpe
@ 2020-10-30 12:19 ` Dennis Dalessandro
2020-10-30 12:45 ` Parav Pandit
0 siblings, 1 reply; 14+ messages in thread
From: Dennis Dalessandro @ 2020-10-30 12:19 UTC (permalink / raw)
To: Jason Gunthorpe, Parav Pandit
Cc: mike.marciniszyn, dledford, yanjunz, bmt, linux-rdma, hch,
syzbot+34dc2fea3478e659af01
On 10/30/2020 8:17 AM, Jason Gunthorpe wrote:
> On Fri, Oct 30, 2020 at 11:38:03AM +0200, Parav Pandit wrote:
>> @@ -1140,7 +1141,10 @@ int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name)
>> rxe->ndev->dev_addr);
>> dev->dev.dma_parms = &rxe->dma_parms;
>> dma_set_max_seg_size(&dev->dev, UINT_MAX);
>> - dma_set_coherent_mask(&dev->dev, dma_get_required_mask(&dev->dev));
>> + dma_mask = IS_ENABLED(CONFIG_64BIT) ? DMA_BIT_MASK(64) : DMA_BIT_MASK(32);
>> + err = dma_coerce_mask_and_coherent(&dev->dev, dma_mask);
>
> Since this mask doesn't actually do anything, what is the reason to
> have the 64/32?
Technically there isn't. We are already dependent on 64bit config
anyway. Mike M just brought this up in a side bar conversation actually.
-Denny
^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [PATCH] RDMA: Fix software RDMA drivers for dma mapping error
2020-10-30 12:19 ` Dennis Dalessandro
@ 2020-10-30 12:45 ` Parav Pandit
2020-10-30 15:01 ` hch
0 siblings, 1 reply; 14+ messages in thread
From: Parav Pandit @ 2020-10-30 12:45 UTC (permalink / raw)
To: Dennis Dalessandro, Jason Gunthorpe
Cc: mike.marciniszyn, dledford, Yanjun Zhu, bmt, linux-rdma, hch,
syzbot+34dc2fea3478e659af01
> From: Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
> Sent: Friday, October 30, 2020 5:50 PM
>
> On 10/30/2020 8:17 AM, Jason Gunthorpe wrote:
> > On Fri, Oct 30, 2020 at 11:38:03AM +0200, Parav Pandit wrote:
> >> @@ -1140,7 +1141,10 @@ int rxe_register_device(struct rxe_dev *rxe,
> const char *ibdev_name)
> >> rxe->ndev->dev_addr);
> >> dev->dev.dma_parms = &rxe->dma_parms;
> >> dma_set_max_seg_size(&dev->dev, UINT_MAX);
> >> - dma_set_coherent_mask(&dev->dev,
> dma_get_required_mask(&dev->dev));
> >> + dma_mask = IS_ENABLED(CONFIG_64BIT) ? DMA_BIT_MASK(64) :
> DMA_BIT_MASK(32);
> >> + err = dma_coerce_mask_and_coherent(&dev->dev, dma_mask);
> >
> > Since this mask doesn't actually do anything, what is the reason to
> > have the 64/32?
>
Christoph did say 64-bit good enough, but he mentioned that it is not correct on 32-bit platforms.
So it is only for theoretical correctness.
> Technically there isn't. We are already dependent on 64bit config anyway.
> Mike M just brought this up in a side bar conversation actually.
For rvt driver, I should drop the check and always set to 64-bit.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] RDMA: Fix software RDMA drivers for dma mapping error
2020-10-30 12:45 ` Parav Pandit
@ 2020-10-30 15:01 ` hch
0 siblings, 0 replies; 14+ messages in thread
From: hch @ 2020-10-30 15:01 UTC (permalink / raw)
To: Parav Pandit
Cc: Dennis Dalessandro, Jason Gunthorpe, mike.marciniszyn, dledford,
Yanjun Zhu, bmt, linux-rdma, hch, syzbot+34dc2fea3478e659af01
On Fri, Oct 30, 2020 at 12:45:45PM +0000, Parav Pandit wrote:
> Christoph did say 64-bit good enough, but he mentioned that it is not correct on 32-bit platforms.
> So it is only for theoretical correctness.
>
> > Technically there isn't. We are already dependent on 64bit config anyway.
> > Mike M just brought this up in a side bar conversation actually.
> For rvt driver, I should drop the check and always set to 64-bit.
Strictly speaking a dma_addr_t that is just the kernel virtual address
will never be larger than 32-bit on a 32-bit platform (by definition).
But setting it to 64 is entirely harmless, as we can't generate a larger
one (also by definition).
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] RDMA: Fix software RDMA drivers for dma mapping error
2020-10-30 9:38 [PATCH] RDMA: Fix software RDMA drivers for dma mapping error Parav Pandit
` (2 preceding siblings ...)
2020-10-30 12:17 ` Jason Gunthorpe
@ 2020-10-30 15:01 ` Christoph Hellwig
2020-11-01 4:28 ` Zhu Yanjun
2020-11-02 19:20 ` Jason Gunthorpe
5 siblings, 0 replies; 14+ messages in thread
From: Christoph Hellwig @ 2020-10-30 15:01 UTC (permalink / raw)
To: Parav Pandit
Cc: dennis.dalessandro, mike.marciniszyn, dledford, jgg, yanjunz,
bmt, linux-rdma, hch, syzbot+34dc2fea3478e659af01
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] RDMA: Fix software RDMA drivers for dma mapping error
2020-10-30 9:38 [PATCH] RDMA: Fix software RDMA drivers for dma mapping error Parav Pandit
` (3 preceding siblings ...)
2020-10-30 15:01 ` Christoph Hellwig
@ 2020-11-01 4:28 ` Zhu Yanjun
2020-11-01 9:20 ` Zhu Yanjun
2020-11-02 19:20 ` Jason Gunthorpe
5 siblings, 1 reply; 14+ messages in thread
From: Zhu Yanjun @ 2020-11-01 4:28 UTC (permalink / raw)
To: Parav Pandit
Cc: dennis.dalessandro, mike.marciniszyn, Doug Ledford,
Jason Gunthorpe, Zhu Yanjun, bmt, linux-rdma, hch,
syzbot+34dc2fea3478e659af01
On Fri, Oct 30, 2020 at 5:39 PM Parav Pandit <parav@nvidia.com> wrote:
>
> A cited commit in fixes tag avoided setting dma_mask of the ib_device.
> Commit [1] made dma_mask as mandetory field to be setup even for
> dma_virt_ops based dma devices. Due to which below call trace occurred.
>
> Fix it by setting empty DMA MASK for software based RDMA devices.
>
> WARNING: CPU: 1 PID: 8488 at kernel/dma/mapping.c:149
> dma_map_page_attrs+0x493/0x700 kernel/dma/mapping.c:149 Modules linked in:
> CPU: 1 PID: 8488 Comm: syz-executor144 Not tainted 5.9.0-syzkaller #0
> Hardware name: Google Google Compute Engine/Google Compute Engine,
> BIOS Google 01/01/2011
> RIP: 0010:dma_map_page_attrs+0x493/0x700 kernel/dma/mapping.c:149
> Trace:
> dma_map_single_attrs include/linux/dma-mapping.h:279 [inline]
> ib_dma_map_single include/rdma/ib_verbs.h:3967 [inline]
> ib_mad_post_receive_mads+0x23f/0xd60
> drivers/infiniband/core/mad.c:2715
> ib_mad_port_start drivers/infiniband/core/mad.c:2862 [inline]
> ib_mad_port_open drivers/infiniband/core/mad.c:3016 [inline]
> ib_mad_init_device+0x72b/0x1400 drivers/infiniband/core/mad.c:3092
> add_client_context+0x405/0x5e0 drivers/infiniband/core/device.c:680
> enable_device_and_get+0x1d5/0x3c0
> drivers/infiniband/core/device.c:1301
> ib_register_device drivers/infiniband/core/device.c:1376 [inline]
> ib_register_device+0x7a7/0xa40 drivers/infiniband/core/device.c:1335
> rxe_register_device+0x46d/0x570
> drivers/infiniband/sw/rxe/rxe_verbs.c:1182
> rxe_add+0x12fe/0x16d0 drivers/infiniband/sw/rxe/rxe.c:247
> rxe_net_add+0x8c/0xe0 drivers/infiniband/sw/rxe/rxe_net.c:507
> rxe_newlink drivers/infiniband/sw/rxe/rxe.c:269 [inline]
> rxe_newlink+0xb7/0xe0 drivers/infiniband/sw/rxe/rxe.c:250
> nldev_newlink+0x30e/0x540 drivers/infiniband/core/nldev.c:1555
> rdma_nl_rcv_msg+0x367/0x690 drivers/infiniband/core/netlink.c:195
> rdma_nl_rcv_skb drivers/infiniband/core/netlink.c:239 [inline]
> rdma_nl_rcv+0x2f2/0x440 drivers/infiniband/core/netlink.c:259
> netlink_unicast_kernel net/netlink/af_netlink.c:1304 [inline]
> netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1330
> netlink_sendmsg+0x856/0xd90 net/netlink/af_netlink.c:1919
> sock_sendmsg_nosec net/socket.c:651 [inline]
> sock_sendmsg+0xcf/0x120 net/socket.c:671
> ____sys_sendmsg+0x6e8/0x810 net/socket.c:2353
> ___sys_sendmsg+0xf3/0x170 net/socket.c:2407
> __sys_sendmsg+0xe5/0x1b0 net/socket.c:2440
> do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46
> entry_SYSCALL_64_after_hwframe+0x44/0xa9
> RIP: 0033:0x443699
>
> [1] commit f959dcd6ddfd ("dma-direct: Fix potential NULL pointer dereference")
>
> Reported-by: syzbot+34dc2fea3478e659af01@syzkaller.appspotmail.com
> Fixes: e0477b34d9d1 ("RDMA: Explicitly pass in the dma_device to ib_register_device")
> Signed-off-by: Parav Pandit <parav@nvidia.com>
Thanks a lot. I have made tests and confirmed that this commit works very well.
Zhu Yanjun
> ---
> drivers/infiniband/sw/rdmavt/vt.c | 7 +++++--
> drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +++++-
> drivers/infiniband/sw/siw/siw_main.c | 7 +++++--
> 3 files changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
> index 43fbc4e54edf..5bd817490b1f 100644
> --- a/drivers/infiniband/sw/rdmavt/vt.c
> +++ b/drivers/infiniband/sw/rdmavt/vt.c
> @@ -525,6 +525,7 @@ static noinline int check_support(struct rvt_dev_info *rdi, int verb)
> int rvt_register_device(struct rvt_dev_info *rdi)
> {
> int ret = 0, i;
> + u64 dma_mask;
>
> if (!rdi)
> return -EINVAL;
> @@ -581,8 +582,10 @@ int rvt_register_device(struct rvt_dev_info *rdi)
>
> /* DMA Operations */
> rdi->ibdev.dev.dma_parms = rdi->ibdev.dev.parent->dma_parms;
> - dma_set_coherent_mask(&rdi->ibdev.dev,
> - rdi->ibdev.dev.parent->coherent_dma_mask);
> + dma_mask = IS_ENABLED(CONFIG_64BIT) ? DMA_BIT_MASK(64) : DMA_BIT_MASK(32);
> + ret = dma_coerce_mask_and_coherent(&rdi->ibdev.dev, dma_mask);
> + if (ret)
> + goto bail_wss;
>
> /* Protection Domain */
> spin_lock_init(&rdi->n_pds_lock);
> diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
> index 7652d53af2c1..50ad3dded786 100644
> --- a/drivers/infiniband/sw/rxe/rxe_verbs.c
> +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
> @@ -1128,6 +1128,7 @@ int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name)
> int err;
> struct ib_device *dev = &rxe->ib_dev;
> struct crypto_shash *tfm;
> + u64 dma_mask;
>
> strlcpy(dev->node_desc, "rxe", sizeof(dev->node_desc));
>
> @@ -1140,7 +1141,10 @@ int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name)
> rxe->ndev->dev_addr);
> dev->dev.dma_parms = &rxe->dma_parms;
> dma_set_max_seg_size(&dev->dev, UINT_MAX);
> - dma_set_coherent_mask(&dev->dev, dma_get_required_mask(&dev->dev));
> + dma_mask = IS_ENABLED(CONFIG_64BIT) ? DMA_BIT_MASK(64) : DMA_BIT_MASK(32);
> + err = dma_coerce_mask_and_coherent(&dev->dev, dma_mask);
> + if (err)
> + return err;
>
> dev->uverbs_cmd_mask |= BIT_ULL(IB_USER_VERBS_CMD_REQ_NOTIFY_CQ);
>
> diff --git a/drivers/infiniband/sw/siw/siw_main.c b/drivers/infiniband/sw/siw/siw_main.c
> index e49faefdee92..6fe120187238 100644
> --- a/drivers/infiniband/sw/siw/siw_main.c
> +++ b/drivers/infiniband/sw/siw/siw_main.c
> @@ -306,6 +306,7 @@ static struct siw_device *siw_device_create(struct net_device *netdev)
> struct siw_device *sdev = NULL;
> struct ib_device *base_dev;
> struct device *parent = netdev->dev.parent;
> + u64 dma_mask;
> int rv;
>
> if (!parent) {
> @@ -360,8 +361,10 @@ static struct siw_device *siw_device_create(struct net_device *netdev)
> base_dev->dev.parent = parent;
> base_dev->dev.dma_parms = &sdev->dma_parms;
> dma_set_max_seg_size(&base_dev->dev, UINT_MAX);
> - dma_set_coherent_mask(&base_dev->dev,
> - dma_get_required_mask(&base_dev->dev));
> + dma_mask = IS_ENABLED(CONFIG_64BIT) ? DMA_BIT_MASK(64) : DMA_BIT_MASK(32);
> + if (dma_coerce_mask_and_coherent(&base_dev->dev, dma_mask))
> + goto error;
> +
> base_dev->num_comp_vectors = num_possible_cpus();
>
> xa_init_flags(&sdev->qp_xa, XA_FLAGS_ALLOC1);
> --
> 2.26.2
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] RDMA: Fix software RDMA drivers for dma mapping error
2020-11-01 4:28 ` Zhu Yanjun
@ 2020-11-01 9:20 ` Zhu Yanjun
0 siblings, 0 replies; 14+ messages in thread
From: Zhu Yanjun @ 2020-11-01 9:20 UTC (permalink / raw)
To: Parav Pandit
Cc: dennis.dalessandro, mike.marciniszyn, Doug Ledford,
Jason Gunthorpe, Zhu Yanjun, bmt, linux-rdma, hch,
syzbot+34dc2fea3478e659af01
On Sun, Nov 1, 2020 at 12:28 PM Zhu Yanjun <zyjzyj2000@gmail.com> wrote:
>
> On Fri, Oct 30, 2020 at 5:39 PM Parav Pandit <parav@nvidia.com> wrote:
> >
> > A cited commit in fixes tag avoided setting dma_mask of the ib_device.
> > Commit [1] made dma_mask as mandetory field to be setup even for
> > dma_virt_ops based dma devices. Due to which below call trace occurred.
> >
> > Fix it by setting empty DMA MASK for software based RDMA devices.
> >
> > WARNING: CPU: 1 PID: 8488 at kernel/dma/mapping.c:149
> > dma_map_page_attrs+0x493/0x700 kernel/dma/mapping.c:149 Modules linked in:
> > CPU: 1 PID: 8488 Comm: syz-executor144 Not tainted 5.9.0-syzkaller #0
> > Hardware name: Google Google Compute Engine/Google Compute Engine,
> > BIOS Google 01/01/2011
> > RIP: 0010:dma_map_page_attrs+0x493/0x700 kernel/dma/mapping.c:149
> > Trace:
> > dma_map_single_attrs include/linux/dma-mapping.h:279 [inline]
> > ib_dma_map_single include/rdma/ib_verbs.h:3967 [inline]
> > ib_mad_post_receive_mads+0x23f/0xd60
> > drivers/infiniband/core/mad.c:2715
> > ib_mad_port_start drivers/infiniband/core/mad.c:2862 [inline]
> > ib_mad_port_open drivers/infiniband/core/mad.c:3016 [inline]
> > ib_mad_init_device+0x72b/0x1400 drivers/infiniband/core/mad.c:3092
> > add_client_context+0x405/0x5e0 drivers/infiniband/core/device.c:680
> > enable_device_and_get+0x1d5/0x3c0
> > drivers/infiniband/core/device.c:1301
> > ib_register_device drivers/infiniband/core/device.c:1376 [inline]
> > ib_register_device+0x7a7/0xa40 drivers/infiniband/core/device.c:1335
> > rxe_register_device+0x46d/0x570
> > drivers/infiniband/sw/rxe/rxe_verbs.c:1182
> > rxe_add+0x12fe/0x16d0 drivers/infiniband/sw/rxe/rxe.c:247
> > rxe_net_add+0x8c/0xe0 drivers/infiniband/sw/rxe/rxe_net.c:507
> > rxe_newlink drivers/infiniband/sw/rxe/rxe.c:269 [inline]
> > rxe_newlink+0xb7/0xe0 drivers/infiniband/sw/rxe/rxe.c:250
> > nldev_newlink+0x30e/0x540 drivers/infiniband/core/nldev.c:1555
> > rdma_nl_rcv_msg+0x367/0x690 drivers/infiniband/core/netlink.c:195
> > rdma_nl_rcv_skb drivers/infiniband/core/netlink.c:239 [inline]
> > rdma_nl_rcv+0x2f2/0x440 drivers/infiniband/core/netlink.c:259
> > netlink_unicast_kernel net/netlink/af_netlink.c:1304 [inline]
> > netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1330
> > netlink_sendmsg+0x856/0xd90 net/netlink/af_netlink.c:1919
> > sock_sendmsg_nosec net/socket.c:651 [inline]
> > sock_sendmsg+0xcf/0x120 net/socket.c:671
> > ____sys_sendmsg+0x6e8/0x810 net/socket.c:2353
> > ___sys_sendmsg+0xf3/0x170 net/socket.c:2407
> > __sys_sendmsg+0xe5/0x1b0 net/socket.c:2440
> > do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46
> > entry_SYSCALL_64_after_hwframe+0x44/0xa9
> > RIP: 0033:0x443699
> >
> > [1] commit f959dcd6ddfd ("dma-direct: Fix potential NULL pointer dereference")
> >
> > Reported-by: syzbot+34dc2fea3478e659af01@syzkaller.appspotmail.com
> > Fixes: e0477b34d9d1 ("RDMA: Explicitly pass in the dma_device to ib_register_device")
> > Signed-off-by: Parav Pandit <parav@nvidia.com>
Thanks a lot.
Acked-by: Zhu Yanjun <yanjunz@nvidia.com>
Zhu Yanjun
>
> Thanks a lot. I have made tests and confirmed that this commit works very well.
>
> Zhu Yanjun
>
> > ---
> > drivers/infiniband/sw/rdmavt/vt.c | 7 +++++--
> > drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +++++-
> > drivers/infiniband/sw/siw/siw_main.c | 7 +++++--
> > 3 files changed, 15 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
> > index 43fbc4e54edf..5bd817490b1f 100644
> > --- a/drivers/infiniband/sw/rdmavt/vt.c
> > +++ b/drivers/infiniband/sw/rdmavt/vt.c
> > @@ -525,6 +525,7 @@ static noinline int check_support(struct rvt_dev_info *rdi, int verb)
> > int rvt_register_device(struct rvt_dev_info *rdi)
> > {
> > int ret = 0, i;
> > + u64 dma_mask;
> >
> > if (!rdi)
> > return -EINVAL;
> > @@ -581,8 +582,10 @@ int rvt_register_device(struct rvt_dev_info *rdi)
> >
> > /* DMA Operations */
> > rdi->ibdev.dev.dma_parms = rdi->ibdev.dev.parent->dma_parms;
> > - dma_set_coherent_mask(&rdi->ibdev.dev,
> > - rdi->ibdev.dev.parent->coherent_dma_mask);
> > + dma_mask = IS_ENABLED(CONFIG_64BIT) ? DMA_BIT_MASK(64) : DMA_BIT_MASK(32);
> > + ret = dma_coerce_mask_and_coherent(&rdi->ibdev.dev, dma_mask);
> > + if (ret)
> > + goto bail_wss;
> >
> > /* Protection Domain */
> > spin_lock_init(&rdi->n_pds_lock);
> > diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
> > index 7652d53af2c1..50ad3dded786 100644
> > --- a/drivers/infiniband/sw/rxe/rxe_verbs.c
> > +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
> > @@ -1128,6 +1128,7 @@ int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name)
> > int err;
> > struct ib_device *dev = &rxe->ib_dev;
> > struct crypto_shash *tfm;
> > + u64 dma_mask;
> >
> > strlcpy(dev->node_desc, "rxe", sizeof(dev->node_desc));
> >
> > @@ -1140,7 +1141,10 @@ int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name)
> > rxe->ndev->dev_addr);
> > dev->dev.dma_parms = &rxe->dma_parms;
> > dma_set_max_seg_size(&dev->dev, UINT_MAX);
> > - dma_set_coherent_mask(&dev->dev, dma_get_required_mask(&dev->dev));
> > + dma_mask = IS_ENABLED(CONFIG_64BIT) ? DMA_BIT_MASK(64) : DMA_BIT_MASK(32);
> > + err = dma_coerce_mask_and_coherent(&dev->dev, dma_mask);
> > + if (err)
> > + return err;
> >
> > dev->uverbs_cmd_mask |= BIT_ULL(IB_USER_VERBS_CMD_REQ_NOTIFY_CQ);
> >
> > diff --git a/drivers/infiniband/sw/siw/siw_main.c b/drivers/infiniband/sw/siw/siw_main.c
> > index e49faefdee92..6fe120187238 100644
> > --- a/drivers/infiniband/sw/siw/siw_main.c
> > +++ b/drivers/infiniband/sw/siw/siw_main.c
> > @@ -306,6 +306,7 @@ static struct siw_device *siw_device_create(struct net_device *netdev)
> > struct siw_device *sdev = NULL;
> > struct ib_device *base_dev;
> > struct device *parent = netdev->dev.parent;
> > + u64 dma_mask;
> > int rv;
> >
> > if (!parent) {
> > @@ -360,8 +361,10 @@ static struct siw_device *siw_device_create(struct net_device *netdev)
> > base_dev->dev.parent = parent;
> > base_dev->dev.dma_parms = &sdev->dma_parms;
> > dma_set_max_seg_size(&base_dev->dev, UINT_MAX);
> > - dma_set_coherent_mask(&base_dev->dev,
> > - dma_get_required_mask(&base_dev->dev));
> > + dma_mask = IS_ENABLED(CONFIG_64BIT) ? DMA_BIT_MASK(64) : DMA_BIT_MASK(32);
> > + if (dma_coerce_mask_and_coherent(&base_dev->dev, dma_mask))
> > + goto error;
> > +
> > base_dev->num_comp_vectors = num_possible_cpus();
> >
> > xa_init_flags(&sdev->qp_xa, XA_FLAGS_ALLOC1);
> > --
> > 2.26.2
> >
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] RDMA: Fix software RDMA drivers for dma mapping error
2020-10-30 9:38 [PATCH] RDMA: Fix software RDMA drivers for dma mapping error Parav Pandit
` (4 preceding siblings ...)
2020-11-01 4:28 ` Zhu Yanjun
@ 2020-11-02 19:20 ` Jason Gunthorpe
5 siblings, 0 replies; 14+ messages in thread
From: Jason Gunthorpe @ 2020-11-02 19:20 UTC (permalink / raw)
To: Parav Pandit
Cc: dennis.dalessandro, mike.marciniszyn, dledford, yanjunz, bmt,
linux-rdma, hch, syzbot+34dc2fea3478e659af01
On Fri, Oct 30, 2020 at 11:38:03AM +0200, Parav Pandit wrote:
> A cited commit in fixes tag avoided setting dma_mask of the ib_device.
> Commit [1] made dma_mask as mandetory field to be setup even for
> dma_virt_ops based dma devices. Due to which below call trace occurred.
>
> Fix it by setting empty DMA MASK for software based RDMA devices.
>
> WARNING: CPU: 1 PID: 8488 at kernel/dma/mapping.c:149
> dma_map_page_attrs+0x493/0x700 kernel/dma/mapping.c:149 Modules linked in:
> CPU: 1 PID: 8488 Comm: syz-executor144 Not tainted 5.9.0-syzkaller #0
> Hardware name: Google Google Compute Engine/Google Compute Engine,
> BIOS Google 01/01/2011
> RIP: 0010:dma_map_page_attrs+0x493/0x700 kernel/dma/mapping.c:149
> Trace:
> dma_map_single_attrs include/linux/dma-mapping.h:279 [inline]
> ib_dma_map_single include/rdma/ib_verbs.h:3967 [inline]
> ib_mad_post_receive_mads+0x23f/0xd60
> drivers/infiniband/core/mad.c:2715
> ib_mad_port_start drivers/infiniband/core/mad.c:2862 [inline]
> ib_mad_port_open drivers/infiniband/core/mad.c:3016 [inline]
> ib_mad_init_device+0x72b/0x1400 drivers/infiniband/core/mad.c:3092
> add_client_context+0x405/0x5e0 drivers/infiniband/core/device.c:680
> enable_device_and_get+0x1d5/0x3c0
> drivers/infiniband/core/device.c:1301
> ib_register_device drivers/infiniband/core/device.c:1376 [inline]
> ib_register_device+0x7a7/0xa40 drivers/infiniband/core/device.c:1335
> rxe_register_device+0x46d/0x570
> drivers/infiniband/sw/rxe/rxe_verbs.c:1182
> rxe_add+0x12fe/0x16d0 drivers/infiniband/sw/rxe/rxe.c:247
> rxe_net_add+0x8c/0xe0 drivers/infiniband/sw/rxe/rxe_net.c:507
> rxe_newlink drivers/infiniband/sw/rxe/rxe.c:269 [inline]
> rxe_newlink+0xb7/0xe0 drivers/infiniband/sw/rxe/rxe.c:250
> nldev_newlink+0x30e/0x540 drivers/infiniband/core/nldev.c:1555
> rdma_nl_rcv_msg+0x367/0x690 drivers/infiniband/core/netlink.c:195
> rdma_nl_rcv_skb drivers/infiniband/core/netlink.c:239 [inline]
> rdma_nl_rcv+0x2f2/0x440 drivers/infiniband/core/netlink.c:259
> netlink_unicast_kernel net/netlink/af_netlink.c:1304 [inline]
> netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1330
> netlink_sendmsg+0x856/0xd90 net/netlink/af_netlink.c:1919
> sock_sendmsg_nosec net/socket.c:651 [inline]
> sock_sendmsg+0xcf/0x120 net/socket.c:671
> ____sys_sendmsg+0x6e8/0x810 net/socket.c:2353
> ___sys_sendmsg+0xf3/0x170 net/socket.c:2407
> __sys_sendmsg+0xe5/0x1b0 net/socket.c:2440
> do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46
> entry_SYSCALL_64_after_hwframe+0x44/0xa9
> RIP: 0033:0x443699
Do not word wrap oops reports!
> [1] commit f959dcd6ddfd ("dma-direct: Fix potential NULL pointer dereference")
>
> Reported-by: syzbot+34dc2fea3478e659af01@syzkaller.appspotmail.com
> Fixes: e0477b34d9d1 ("RDMA: Explicitly pass in the dma_device to ib_register_device")
> Signed-off-by: Parav Pandit <parav@nvidia.com>
> Tested-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
> Tested-by: Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> Acked-by: Zhu Yanjun <yanjunz@nvidia.com>
> ---
> drivers/infiniband/sw/rdmavt/vt.c | 7 +++++--
> drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +++++-
> drivers/infiniband/sw/siw/siw_main.c | 7 +++++--
> 3 files changed, 15 insertions(+), 5 deletions(-)
Applied to for-rc, thanks
Jason
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] RDMA: Fix software RDMA drivers for dma mapping error
2020-10-27 12:52 WARNING in dma_map_page_attrs Parav Pandit
2020-10-28 8:03 ` kernel test robot
@ 2020-10-28 8:03 ` kernel test robot
0 siblings, 0 replies; 14+ messages in thread
From: kernel test robot @ 2020-10-28 8:03 UTC (permalink / raw)
To: Parav Pandit, hch
Cc: kbuild-all, linux-kernel, dri-devel, linaro-mm-sig, iommu,
syzbot, linaro-mm-sig-owner, Jakub Kicinski, christian.koenig,
linux-media
[-- Attachment #1: Type: text/plain, Size: 3355 bytes --]
Hi Parav,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on rdma/for-next]
[also build test ERROR on v5.10-rc1 next-20201028]
[cannot apply to hch-configfs/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Parav-Pandit/RDMA-Fix-software-RDMA-drivers-for-dma-mapping-error/20201027-205440
base: https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git for-next
config: x86_64-rhel-8.3 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
reproduce (this is a W=1 build):
# https://github.com/0day-ci/linux/commit/cbe9509f0d3a076646d576c1d1f5adc59159316c
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Parav-Pandit/RDMA-Fix-software-RDMA-drivers-for-dma-mapping-error/20201027-205440
git checkout cbe9509f0d3a076646d576c1d1f5adc59159316c
# save the attached .config to linux build tree
make W=1 ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
drivers/infiniband/sw/rxe/rxe_verbs.c: In function 'rxe_register_device':
>> drivers/infiniband/sw/rxe/rxe_verbs.c:1133:48: error: 'DMA_MASK_NONE' undeclared (first use in this function); did you mean 'CPU_MASK_NONE'?
1133 | err = dma_coerce_mask_and_coherent(&dev->dev, DMA_MASK_NONE);
| ^~~~~~~~~~~~~
| CPU_MASK_NONE
drivers/infiniband/sw/rxe/rxe_verbs.c:1133:48: note: each undeclared identifier is reported only once for each function it appears in
--
drivers/infiniband/sw/siw/siw_main.c: In function 'siw_device_create':
>> drivers/infiniband/sw/siw/siw_main.c:387:51: error: 'DMA_MASK_NONE' undeclared (first use in this function); did you mean 'CPU_MASK_NONE'?
387 | if (dma_coerce_mask_and_coherent(&base_dev->dev, DMA_MASK_NONE))
| ^~~~~~~~~~~~~
| CPU_MASK_NONE
drivers/infiniband/sw/siw/siw_main.c:387:51: note: each undeclared identifier is reported only once for each function it appears in
vim +1133 drivers/infiniband/sw/rxe/rxe_verbs.c
1115
1116 int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name)
1117 {
1118 int err;
1119 struct ib_device *dev = &rxe->ib_dev;
1120 struct crypto_shash *tfm;
1121
1122 strlcpy(dev->node_desc, "rxe", sizeof(dev->node_desc));
1123
1124 dev->node_type = RDMA_NODE_IB_CA;
1125 dev->phys_port_cnt = 1;
1126 dev->num_comp_vectors = num_possible_cpus();
1127 dev->dev.parent = rxe_dma_device(rxe);
1128 dev->local_dma_lkey = 0;
1129 addrconf_addr_eui48((unsigned char *)&dev->node_guid,
1130 rxe->ndev->dev_addr);
1131 dev->dev.dma_parms = &rxe->dma_parms;
1132 dma_set_max_seg_size(&dev->dev, UINT_MAX);
> 1133 err = dma_coerce_mask_and_coherent(&dev->dev, DMA_MASK_NONE);
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 41020 bytes --]
[-- Attachment #3: Type: text/plain, Size: 156 bytes --]
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] RDMA: Fix software RDMA drivers for dma mapping error
@ 2020-10-28 8:03 ` kernel test robot
0 siblings, 0 replies; 14+ messages in thread
From: kernel test robot @ 2020-10-28 8:03 UTC (permalink / raw)
To: Parav Pandit, hch
Cc: kbuild-all, linux-kernel, dri-devel, linaro-mm-sig, iommu,
syzbot, linaro-mm-sig-owner, Jakub Kicinski, christian.koenig,
linux-media
[-- Attachment #1: Type: text/plain, Size: 3355 bytes --]
Hi Parav,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on rdma/for-next]
[also build test ERROR on v5.10-rc1 next-20201028]
[cannot apply to hch-configfs/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Parav-Pandit/RDMA-Fix-software-RDMA-drivers-for-dma-mapping-error/20201027-205440
base: https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git for-next
config: x86_64-rhel-8.3 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
reproduce (this is a W=1 build):
# https://github.com/0day-ci/linux/commit/cbe9509f0d3a076646d576c1d1f5adc59159316c
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Parav-Pandit/RDMA-Fix-software-RDMA-drivers-for-dma-mapping-error/20201027-205440
git checkout cbe9509f0d3a076646d576c1d1f5adc59159316c
# save the attached .config to linux build tree
make W=1 ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
drivers/infiniband/sw/rxe/rxe_verbs.c: In function 'rxe_register_device':
>> drivers/infiniband/sw/rxe/rxe_verbs.c:1133:48: error: 'DMA_MASK_NONE' undeclared (first use in this function); did you mean 'CPU_MASK_NONE'?
1133 | err = dma_coerce_mask_and_coherent(&dev->dev, DMA_MASK_NONE);
| ^~~~~~~~~~~~~
| CPU_MASK_NONE
drivers/infiniband/sw/rxe/rxe_verbs.c:1133:48: note: each undeclared identifier is reported only once for each function it appears in
--
drivers/infiniband/sw/siw/siw_main.c: In function 'siw_device_create':
>> drivers/infiniband/sw/siw/siw_main.c:387:51: error: 'DMA_MASK_NONE' undeclared (first use in this function); did you mean 'CPU_MASK_NONE'?
387 | if (dma_coerce_mask_and_coherent(&base_dev->dev, DMA_MASK_NONE))
| ^~~~~~~~~~~~~
| CPU_MASK_NONE
drivers/infiniband/sw/siw/siw_main.c:387:51: note: each undeclared identifier is reported only once for each function it appears in
vim +1133 drivers/infiniband/sw/rxe/rxe_verbs.c
1115
1116 int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name)
1117 {
1118 int err;
1119 struct ib_device *dev = &rxe->ib_dev;
1120 struct crypto_shash *tfm;
1121
1122 strlcpy(dev->node_desc, "rxe", sizeof(dev->node_desc));
1123
1124 dev->node_type = RDMA_NODE_IB_CA;
1125 dev->phys_port_cnt = 1;
1126 dev->num_comp_vectors = num_possible_cpus();
1127 dev->dev.parent = rxe_dma_device(rxe);
1128 dev->local_dma_lkey = 0;
1129 addrconf_addr_eui48((unsigned char *)&dev->node_guid,
1130 rxe->ndev->dev_addr);
1131 dev->dev.dma_parms = &rxe->dma_parms;
1132 dma_set_max_seg_size(&dev->dev, UINT_MAX);
> 1133 err = dma_coerce_mask_and_coherent(&dev->dev, DMA_MASK_NONE);
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 41020 bytes --]
[-- Attachment #3: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] RDMA: Fix software RDMA drivers for dma mapping error
@ 2020-10-28 8:03 ` kernel test robot
0 siblings, 0 replies; 14+ messages in thread
From: kernel test robot @ 2020-10-28 8:03 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 3424 bytes --]
Hi Parav,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on rdma/for-next]
[also build test ERROR on v5.10-rc1 next-20201028]
[cannot apply to hch-configfs/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Parav-Pandit/RDMA-Fix-software-RDMA-drivers-for-dma-mapping-error/20201027-205440
base: https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git for-next
config: x86_64-rhel-8.3 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
reproduce (this is a W=1 build):
# https://github.com/0day-ci/linux/commit/cbe9509f0d3a076646d576c1d1f5adc59159316c
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Parav-Pandit/RDMA-Fix-software-RDMA-drivers-for-dma-mapping-error/20201027-205440
git checkout cbe9509f0d3a076646d576c1d1f5adc59159316c
# save the attached .config to linux build tree
make W=1 ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
drivers/infiniband/sw/rxe/rxe_verbs.c: In function 'rxe_register_device':
>> drivers/infiniband/sw/rxe/rxe_verbs.c:1133:48: error: 'DMA_MASK_NONE' undeclared (first use in this function); did you mean 'CPU_MASK_NONE'?
1133 | err = dma_coerce_mask_and_coherent(&dev->dev, DMA_MASK_NONE);
| ^~~~~~~~~~~~~
| CPU_MASK_NONE
drivers/infiniband/sw/rxe/rxe_verbs.c:1133:48: note: each undeclared identifier is reported only once for each function it appears in
--
drivers/infiniband/sw/siw/siw_main.c: In function 'siw_device_create':
>> drivers/infiniband/sw/siw/siw_main.c:387:51: error: 'DMA_MASK_NONE' undeclared (first use in this function); did you mean 'CPU_MASK_NONE'?
387 | if (dma_coerce_mask_and_coherent(&base_dev->dev, DMA_MASK_NONE))
| ^~~~~~~~~~~~~
| CPU_MASK_NONE
drivers/infiniband/sw/siw/siw_main.c:387:51: note: each undeclared identifier is reported only once for each function it appears in
vim +1133 drivers/infiniband/sw/rxe/rxe_verbs.c
1115
1116 int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name)
1117 {
1118 int err;
1119 struct ib_device *dev = &rxe->ib_dev;
1120 struct crypto_shash *tfm;
1121
1122 strlcpy(dev->node_desc, "rxe", sizeof(dev->node_desc));
1123
1124 dev->node_type = RDMA_NODE_IB_CA;
1125 dev->phys_port_cnt = 1;
1126 dev->num_comp_vectors = num_possible_cpus();
1127 dev->dev.parent = rxe_dma_device(rxe);
1128 dev->local_dma_lkey = 0;
1129 addrconf_addr_eui48((unsigned char *)&dev->node_guid,
1130 rxe->ndev->dev_addr);
1131 dev->dev.dma_parms = &rxe->dma_parms;
1132 dma_set_max_seg_size(&dev->dev, UINT_MAX);
> 1133 err = dma_coerce_mask_and_coherent(&dev->dev, DMA_MASK_NONE);
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 41020 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2020-11-02 19:20 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-30 9:38 [PATCH] RDMA: Fix software RDMA drivers for dma mapping error Parav Pandit
2020-10-30 9:48 ` Guoqing Jiang
2020-10-30 12:04 ` Dennis Dalessandro
2020-10-30 12:17 ` Jason Gunthorpe
2020-10-30 12:19 ` Dennis Dalessandro
2020-10-30 12:45 ` Parav Pandit
2020-10-30 15:01 ` hch
2020-10-30 15:01 ` Christoph Hellwig
2020-11-01 4:28 ` Zhu Yanjun
2020-11-01 9:20 ` Zhu Yanjun
2020-11-02 19:20 ` Jason Gunthorpe
-- strict thread matches above, loose matches on Subject: below --
2020-10-27 12:52 WARNING in dma_map_page_attrs Parav Pandit
2020-10-28 8:03 ` [PATCH] RDMA: Fix software RDMA drivers for dma mapping error kernel test robot
2020-10-28 8:03 ` kernel test robot
2020-10-28 8:03 ` kernel test robot
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.