|
Thomas Bogendoerfer |
dea350 |
From: yonatanc <yonatanc@mellanox.com>
|
|
Thomas Bogendoerfer |
dea350 |
Date: Thu, 22 Jun 2017 17:10:00 +0300
|
|
Thomas Bogendoerfer |
dea350 |
Subject: IB/rxe: Set dma_mask and coherent_dma_mask
|
|
Thomas Bogendoerfer |
dea350 |
Patch-mainline: v4.13-rc2
|
|
Thomas Bogendoerfer |
dea350 |
Git-commit: 56012e1cada54460f9e456cd77276e765e06ce6c
|
|
Thomas Bogendoerfer |
dea350 |
References: bsc#1050662 FATE#323951
|
|
Thomas Bogendoerfer |
dea350 |
|
|
Thomas Bogendoerfer |
dea350 |
The RXE coupled with dummy device causes to the kernel panic attached
|
|
Thomas Bogendoerfer |
dea350 |
below. The panic happens when ib_register_device tries to set dma_mask
|
|
Thomas Bogendoerfer |
dea350 |
by accessing a NULLed parent device.
|
|
Thomas Bogendoerfer |
dea350 |
|
|
Thomas Bogendoerfer |
dea350 |
The RXE does not actually use DMA, so we can set the dma_mask
|
|
Thomas Bogendoerfer |
dea350 |
to architecture value.
|
|
Thomas Bogendoerfer |
dea350 |
|
|
Thomas Bogendoerfer |
dea350 |
[16240.199689] RIP: 0010:ib_register_device+0x468/0x5a0 [ib_core]
|
|
Thomas Bogendoerfer |
dea350 |
[16240.205289] RSP: 0018:ffffc9000220fc10 EFLAGS: 00010246
|
|
Thomas Bogendoerfer |
dea350 |
[16240.209909] RAX: 0000000000000024 RBX: ffff880220d1a2a8 RCX: 0000000000000000
|
|
Thomas Bogendoerfer |
dea350 |
[16240.212244] RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000009
|
|
Thomas Bogendoerfer |
dea350 |
[16240.214385] RBP: ffffc9000220fcb0 R08: 0000000000000000 R09: 000000000000023f
|
|
Thomas Bogendoerfer |
dea350 |
[16240.254465] R10: 0000000000000007 R11: 0000000000000000 R12: 0000000000000000
|
|
Thomas Bogendoerfer |
dea350 |
[16240.259467] R13: 0000000000000000 R14: 0000000000000000 R15: ffff880220d1a2a8
|
|
Thomas Bogendoerfer |
dea350 |
[16240.263314] FS: 00007fd8ecca0740(0000) GS:ffff8802364c0000(0000) knlGS:0000000000000000
|
|
Thomas Bogendoerfer |
dea350 |
[16240.267292] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
|
|
Thomas Bogendoerfer |
dea350 |
[16240.273503] CR2: 0000000000000218 CR3: 00000002253ba000 CR4: 00000000000006e0
|
|
Thomas Bogendoerfer |
dea350 |
[16240.277066] Call Trace:
|
|
Thomas Bogendoerfer |
dea350 |
[16240.281836] ? __kmalloc+0x26f/0x280
|
|
Thomas Bogendoerfer |
dea350 |
[16240.286596] rxe_register_device+0x297/0x300 [rdma_rxe]
|
|
Thomas Bogendoerfer |
dea350 |
[16240.291377] rxe_add+0x535/0x5b0 [rdma_rxe]
|
|
Thomas Bogendoerfer |
dea350 |
[16240.297586] rxe_net_add+0x3e/0xc0 [rdma_rxe]
|
|
Thomas Bogendoerfer |
dea350 |
[16240.302375] rxe_param_set_add+0x65/0x144 [rdma_rxe]
|
|
Thomas Bogendoerfer |
dea350 |
[16240.307769] param_attr_store+0x68/0xd0
|
|
Thomas Bogendoerfer |
dea350 |
[16240.311640] module_attr_store+0x1d/0x30
|
|
Thomas Bogendoerfer |
dea350 |
[16240.316421] sysfs_kf_write+0x3a/0x50
|
|
Thomas Bogendoerfer |
dea350 |
[16240.317802] kernfs_fop_write+0xff/0x180
|
|
Thomas Bogendoerfer |
dea350 |
[16240.322989] __vfs_write+0x37/0x140
|
|
Thomas Bogendoerfer |
dea350 |
[16240.328164] ? handle_mm_fault+0xce/0x240
|
|
Thomas Bogendoerfer |
dea350 |
[16240.333340] vfs_write+0xb2/0x1b0
|
|
Thomas Bogendoerfer |
dea350 |
[16240.335013] SyS_write+0x55/0xc0
|
|
Thomas Bogendoerfer |
dea350 |
[16240.340632] entry_SYSCALL_64_fastpath+0x1a/0xa9
|
|
Thomas Bogendoerfer |
dea350 |
|
|
Thomas Bogendoerfer |
dea350 |
Fixes: 8700e3e7c485 ("Soft RoCE driver")
|
|
Thomas Bogendoerfer |
dea350 |
Signed-off-by: Yonatan Cohen <yonatanc@mellanox.com>
|
|
Thomas Bogendoerfer |
dea350 |
Reviewed-by: Moni Shoua <monis@mellanox.com>
|
|
Thomas Bogendoerfer |
dea350 |
Signed-off-by: Leon Romanovsky <leon@kernel.org>
|
|
Thomas Bogendoerfer |
dea350 |
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
|
|
Thomas Bogendoerfer |
dea350 |
Signed-off-by: Doug Ledford <dledford@redhat.com>
|
|
Thomas Bogendoerfer |
dea350 |
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
|
|
Thomas Bogendoerfer |
dea350 |
---
|
|
Thomas Bogendoerfer |
dea350 |
drivers/infiniband/sw/rxe/rxe_verbs.c | 2 ++
|
|
Thomas Bogendoerfer |
dea350 |
1 file changed, 2 insertions(+)
|
|
Thomas Bogendoerfer |
dea350 |
|
|
Thomas Bogendoerfer |
dea350 |
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
|
|
Thomas Bogendoerfer |
dea350 |
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
|
|
Thomas Bogendoerfer |
dea350 |
@@ -1240,6 +1240,8 @@ int rxe_register_device(struct rxe_dev *
|
|
Thomas Bogendoerfer |
dea350 |
addrconf_addr_eui48((unsigned char *)&dev->node_guid,
|
|
Thomas Bogendoerfer |
dea350 |
rxe->ndev->dev_addr);
|
|
Thomas Bogendoerfer |
dea350 |
dev->dev.dma_ops = &dma_virt_ops;
|
|
Thomas Bogendoerfer |
dea350 |
+ dma_coerce_mask_and_coherent(&dev->dev,
|
|
Thomas Bogendoerfer |
dea350 |
+ dma_get_required_mask(dev->dev.parent));
|
|
Thomas Bogendoerfer |
dea350 |
|
|
Thomas Bogendoerfer |
dea350 |
dev->uverbs_abi_ver = RXE_UVERBS_ABI_VERSION;
|
|
Thomas Bogendoerfer |
dea350 |
dev->uverbs_cmd_mask = BIT_ULL(IB_USER_VERBS_CMD_GET_CONTEXT)
|