[v2] infiniband: disable IB HW for UML

Message ID 20221202211940.29111-1-rdunlap@infradead.org
State New
Headers
Series [v2] infiniband: disable IB HW for UML |

Commit Message

Randy Dunlap Dec. 2, 2022, 9:19 p.m. UTC
  Disable all of drivers/infiniband/hw/ for UML builds until someone
needs it and provides patches to support it.

This prevents build errors in hw/qib/qib_wc_x86_64.c.

Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Suggested-by: Leon Romanovsky <leon@kernel.org>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: linux-rdma@vger.kernel.org
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-um@lists.infradead.org
---
v2: just disable infiniband/hw/, not all of infiniband.

 drivers/infiniband/Kconfig |    2 ++
 1 file changed, 2 insertions(+)
  

Comments

Leon Romanovsky Dec. 4, 2022, 1:21 p.m. UTC | #1
On Fri, Dec 02, 2022 at 01:19:40PM -0800, Randy Dunlap wrote:
> Disable all of drivers/infiniband/hw/ for UML builds until someone
> needs it and provides patches to support it.
> 
> This prevents build errors in hw/qib/qib_wc_x86_64.c.
> 
> Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver")
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Suggested-by: Leon Romanovsky <leon@kernel.org>
> Cc: Jason Gunthorpe <jgg@nvidia.com>
> Cc: Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
> Cc: Christoph Hellwig <hch@infradead.org>
> Cc: linux-rdma@vger.kernel.org
> Cc: Jeff Dike <jdike@addtoit.com>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
> Cc: Johannes Berg <johannes@sipsolutions.net>
> Cc: linux-um@lists.infradead.org
> ---
> v2: just disable infiniband/hw/, not all of infiniband.
> 
>  drivers/infiniband/Kconfig |    2 ++
>  1 file changed, 2 insertions(+)

I added rdmavt to the mix and applied.
https://lore.kernel.org/linux-rdma/20221130200958.25305-1-rdunlap@infradead.org/

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index 6ee97c898231..a5827d11e934 100644
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -95,8 +95,8 @@ source "drivers/infiniband/hw/qedr/Kconfig"
 source "drivers/infiniband/hw/qib/Kconfig"
 source "drivers/infiniband/hw/usnic/Kconfig"
 source "drivers/infiniband/hw/vmw_pvrdma/Kconfig"
-endif # !UML
 source "drivers/infiniband/sw/rdmavt/Kconfig"
+endif # !UML
 source "drivers/infiniband/sw/rxe/Kconfig"
 source "drivers/infiniband/sw/siw/Kconfig"
 endif
(END)




> 
> diff -- a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
> --- a/drivers/infiniband/Kconfig
> +++ b/drivers/infiniband/Kconfig
> @@ -78,6 +78,7 @@ config INFINIBAND_VIRT_DMA
>  	def_bool !HIGHMEM
>  
>  if INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS
> +if !UML
>  source "drivers/infiniband/hw/bnxt_re/Kconfig"
>  source "drivers/infiniband/hw/cxgb4/Kconfig"
>  source "drivers/infiniband/hw/efa/Kconfig"
> @@ -94,6 +95,7 @@ source "drivers/infiniband/hw/qedr/Kconf
>  source "drivers/infiniband/hw/qib/Kconfig"
>  source "drivers/infiniband/hw/usnic/Kconfig"
>  source "drivers/infiniband/hw/vmw_pvrdma/Kconfig"
> +endif # !UML
>  source "drivers/infiniband/sw/rdmavt/Kconfig"
>  source "drivers/infiniband/sw/rxe/Kconfig"
>  source "drivers/infiniband/sw/siw/Kconfig"
  
Leon Romanovsky Dec. 4, 2022, 1:23 p.m. UTC | #2
On Fri, 2 Dec 2022 13:19:40 -0800, Randy Dunlap wrote:
> Disable all of drivers/infiniband/hw/ for UML builds until someone
> needs it and provides patches to support it.
> 
> This prevents build errors in hw/qib/qib_wc_x86_64.c.
> 
> 

Applied, thanks!

[1/1] infiniband: disable IB HW for UML
      https://git.kernel.org/rdma/rdma/c/323a74fc20f53c

Best regards,
  
Randy Dunlap Dec. 4, 2022, 4:10 p.m. UTC | #3
On 12/4/22 05:21, Leon Romanovsky wrote:
> On Fri, Dec 02, 2022 at 01:19:40PM -0800, Randy Dunlap wrote:
>> Disable all of drivers/infiniband/hw/ for UML builds until someone
>> needs it and provides patches to support it.
>>
>> This prevents build errors in hw/qib/qib_wc_x86_64.c.
>>
>> Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver")
>> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
>> Suggested-by: Leon Romanovsky <leon@kernel.org>
>> Cc: Jason Gunthorpe <jgg@nvidia.com>
>> Cc: Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
>> Cc: Christoph Hellwig <hch@infradead.org>
>> Cc: linux-rdma@vger.kernel.org
>> Cc: Jeff Dike <jdike@addtoit.com>
>> Cc: Richard Weinberger <richard@nod.at>
>> Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
>> Cc: Johannes Berg <johannes@sipsolutions.net>
>> Cc: linux-um@lists.infradead.org
>> ---
>> v2: just disable infiniband/hw/, not all of infiniband.
>>
>>  drivers/infiniband/Kconfig |    2 ++
>>  1 file changed, 2 insertions(+)
> 
> I added rdmavt to the mix and applied.

Sounds good. Thanks.

> https://lore.kernel.org/linux-rdma/20221130200958.25305-1-rdunlap@infradead.org/
> 
> diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
> index 6ee97c898231..a5827d11e934 100644
> --- a/drivers/infiniband/Kconfig
> +++ b/drivers/infiniband/Kconfig
> @@ -95,8 +95,8 @@ source "drivers/infiniband/hw/qedr/Kconfig"
>  source "drivers/infiniband/hw/qib/Kconfig"
>  source "drivers/infiniband/hw/usnic/Kconfig"
>  source "drivers/infiniband/hw/vmw_pvrdma/Kconfig"
> -endif # !UML
>  source "drivers/infiniband/sw/rdmavt/Kconfig"
> +endif # !UML
>  source "drivers/infiniband/sw/rxe/Kconfig"
>  source "drivers/infiniband/sw/siw/Kconfig"
>  endif
> (END)
  

Patch

diff -- a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -78,6 +78,7 @@  config INFINIBAND_VIRT_DMA
 	def_bool !HIGHMEM
 
 if INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS
+if !UML
 source "drivers/infiniband/hw/bnxt_re/Kconfig"
 source "drivers/infiniband/hw/cxgb4/Kconfig"
 source "drivers/infiniband/hw/efa/Kconfig"
@@ -94,6 +95,7 @@  source "drivers/infiniband/hw/qedr/Kconf
 source "drivers/infiniband/hw/qib/Kconfig"
 source "drivers/infiniband/hw/usnic/Kconfig"
 source "drivers/infiniband/hw/vmw_pvrdma/Kconfig"
+endif # !UML
 source "drivers/infiniband/sw/rdmavt/Kconfig"
 source "drivers/infiniband/sw/rxe/Kconfig"
 source "drivers/infiniband/sw/siw/Kconfig"