Michael S. Tsirkin
2020-Aug-05 12:00 UTC
[PATCH V4 linux-next 00/12] VDPA support for Mellanox ConnectX devices
On Tue, Aug 04, 2020 at 07:20:36PM +0300, Eli Cohen wrote:> Hi Michael, > please note that this series depends on mlx5 core device driver patches > in mlx5-next branch in > git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git. > > git pull git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next > > They also depend Jason Wang's patches: https://lkml.org/lkml/2020/7/1/301So if I apply this to linux-next branch of my tree, I get: CALL scripts/checksyscalls.sh CALL scripts/atomic/check-atomics.sh DESCEND objtool CHK include/generated/compile.h CC [M] drivers/vdpa/mlx5/net/main.o In file included from ./include/linux/swab.h:5, from ./include/uapi/linux/byteorder/little_endian.h:13, from ./include/linux/byteorder/little_endian.h:5, from ./arch/x86/include/uapi/asm/byteorder.h:5, from ./include/asm-generic/bitops/le.h:6, from ./arch/x86/include/asm/bitops.h:395, from ./include/linux/bitops.h:29, from ./include/linux/kernel.h:12, from ./include/linux/list.h:9, from ./include/linux/module.h:12, from drivers/vdpa/mlx5/net/main.c:4: drivers/vdpa/mlx5/net/main.c: In function ?required_caps_supported?: ././include/linux/compiler_types.h:129:35: error: ?struct mlx5_ifc_device_virtio_emulation_cap_bits? has no member named ?event_mode? 129 | #define __compiler_offsetof(a, b) __builtin_offsetof(a, b) | ^~~~~~~~~~~~~~~~~~ ./include/uapi/linux/swab.h:115:54: note: in definition of macro ?__swab32? 115 | #define __swab32(x) (__u32)__builtin_bswap32((__u32)(x)) | ^ ./include/linux/byteorder/generic.h:95:21: note: in expansion of macro ?__be32_to_cpu? 95 | #define be32_to_cpu __be32_to_cpu | ^~~~~~~~~~~~~ ./include/linux/stddef.h:17:32: note: in expansion of macro ?__compiler_offsetof? 17 | #define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER) | ^~~~~~~~~~~~~~~~~~~ ./include/linux/mlx5/device.h:51:35: note: in expansion of macro ?offsetof? 51 | #define __mlx5_bit_off(typ, fld) (offsetof(struct mlx5_ifc_##typ##_bits, fld)) | ^~~~~~~~ ./include/linux/mlx5/device.h:53:34: note: in expansion of macro ?__mlx5_bit_off? 53 | #define __mlx5_dw_off(typ, fld) (__mlx5_bit_off(typ, fld) / 32) | ^~~~~~~~~~~~~~ ./include/linux/mlx5/device.h:96:1: note: in expansion of macro ?__mlx5_dw_off? 96 | __mlx5_dw_off(typ, fld))) >> __mlx5_dw_bit_off(typ, fld)) & \ | ^~~~~~~~~~~~~ ./include/linux/mlx5/device.h:1355:2: note: in expansion of macro ?MLX5_GET? 1355 | MLX5_GET(device_virtio_emulation_cap, \ | ^~~~~~~~ drivers/vdpa/mlx5/net/main.c:24:15: note: in expansion of macro ?MLX5_CAP_DEV_VDPA_EMULATION? 24 | event_mode = MLX5_CAP_DEV_VDPA_EMULATION(mdev, event_mode); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from ./include/linux/mlx5/driver.h:52, from drivers/vdpa/mlx5/net/main.c:5: ./include/linux/mlx5/device.h:50:57: error: ?struct mlx5_ifc_device_virtio_emulation_cap_bits? has no member named ?event_mode? 50 | #define __mlx5_bit_sz(typ, fld) sizeof(__mlx5_nullp(typ)->fld) | ^~ ./include/linux/mlx5/device.h:56:43: note: in expansion of macro ?__mlx5_bit_sz? 56 | #define __mlx5_dw_bit_off(typ, fld) (32 - __mlx5_bit_sz(typ, fld) - (__mlx5_bit_off(typ, fld) & 0x1f)) | ^~~~~~~~~~~~~ ./include/linux/mlx5/device.h:96:30: note: in expansion of macro ?__mlx5_dw_bit_off? 96 | __mlx5_dw_off(typ, fld))) >> __mlx5_dw_bit_off(typ, fld)) & \ | ^~~~~~~~~~~~~~~~~ ./include/linux/mlx5/device.h:1355:2: note: in expansion of macro ?MLX5_GET? 1355 | MLX5_GET(device_virtio_emulation_cap, \ | ^~~~~~~~ drivers/vdpa/mlx5/net/main.c:24:15: note: in expansion of macro ?MLX5_CAP_DEV_VDPA_EMULATION? 24 | event_mode = MLX5_CAP_DEV_VDPA_EMULATION(mdev, event_mode); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from <command-line>: ././include/linux/compiler_types.h:129:35: error: ?struct mlx5_ifc_device_virtio_emulation_cap_bits? has no member named ?event_mode? 129 | #define __compiler_offsetof(a, b) __builtin_offsetof(a, b) | ^~~~~~~~~~~~~~~~~~ ./include/linux/stddef.h:17:32: note: in expansion of macro ?__compiler_offsetof? 17 | #define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER) | ^~~~~~~~~~~~~~~~~~~ ./include/linux/mlx5/device.h:51:35: note: in expansion of macro ?offsetof? 51 | #define __mlx5_bit_off(typ, fld) (offsetof(struct mlx5_ifc_##typ##_bits, fld)) | ^~~~~~~~ ./include/linux/mlx5/device.h:56:70: note: in expansion of macro ?__mlx5_bit_off? 56 | #define __mlx5_dw_bit_off(typ, fld) (32 - __mlx5_bit_sz(typ, fld) - (__mlx5_bit_off(typ, fld) & 0x1f)) | ^~~~~~~~~~~~~~ ./include/linux/mlx5/device.h:96:30: note: in expansion of macro ?__mlx5_dw_bit_off? 96 | __mlx5_dw_off(typ, fld))) >> __mlx5_dw_bit_off(typ, fld)) & \ | ^~~~~~~~~~~~~~~~~ ./include/linux/mlx5/device.h:1355:2: note: in expansion of macro ?MLX5_GET? 1355 | MLX5_GET(device_virtio_emulation_cap, \ | ^~~~~~~~ drivers/vdpa/mlx5/net/main.c:24:15: note: in expansion of macro ?MLX5_CAP_DEV_VDPA_EMULATION? 24 | event_mode = MLX5_CAP_DEV_VDPA_EMULATION(mdev, event_mode); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from ./include/linux/mlx5/driver.h:52, from drivers/vdpa/mlx5/net/main.c:5: ./include/linux/mlx5/device.h:50:57: error: ?struct mlx5_ifc_device_virtio_emulation_cap_bits? has no member named ?event_mode? 50 | #define __mlx5_bit_sz(typ, fld) sizeof(__mlx5_nullp(typ)->fld) | ^~ ./include/linux/mlx5/device.h:57:47: note: in expansion of macro ?__mlx5_bit_sz? 57 | #define __mlx5_mask(typ, fld) ((u32)((1ull << __mlx5_bit_sz(typ, fld)) - 1)) | ^~~~~~~~~~~~~ ./include/linux/mlx5/device.h:97:1: note: in expansion of macro ?__mlx5_mask? 97 | __mlx5_mask(typ, fld)) | ^~~~~~~~~~~ ./include/linux/mlx5/device.h:1355:2: note: in expansion of macro ?MLX5_GET? 1355 | MLX5_GET(device_virtio_emulation_cap, \ | ^~~~~~~~ drivers/vdpa/mlx5/net/main.c:24:15: note: in expansion of macro ?MLX5_CAP_DEV_VDPA_EMULATION? 24 | event_mode = MLX5_CAP_DEV_VDPA_EMULATION(mdev, event_mode); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from ./include/linux/swab.h:5, from ./include/uapi/linux/byteorder/little_endian.h:13, from ./include/linux/byteorder/little_endian.h:5, from ./arch/x86/include/uapi/asm/byteorder.h:5, from ./include/asm-generic/bitops/le.h:6, from ./arch/x86/include/asm/bitops.h:395, from ./include/linux/bitops.h:29, from ./include/linux/kernel.h:12, from ./include/linux/list.h:9, from ./include/linux/module.h:12, from drivers/vdpa/mlx5/net/main.c:4: ././include/linux/compiler_types.h:129:35: error: ?struct mlx5_ifc_device_virtio_emulation_cap_bits? has no member named ?eth_frame_offload_type? 129 | #define __compiler_offsetof(a, b) __builtin_offsetof(a, b) | ^~~~~~~~~~~~~~~~~~ ./include/uapi/linux/swab.h:115:54: note: in definition of macro ?__swab32? 115 | #define __swab32(x) (__u32)__builtin_bswap32((__u32)(x)) | ^ ./include/linux/byteorder/generic.h:95:21: note: in expansion of macro ?__be32_to_cpu? 95 | #define be32_to_cpu __be32_to_cpu | ^~~~~~~~~~~~~ ./include/linux/stddef.h:17:32: note: in expansion of macro ?__compiler_offsetof? 17 | #define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER) | ^~~~~~~~~~~~~~~~~~~ ./include/linux/mlx5/device.h:51:35: note: in expansion of macro ?offsetof? 51 | #define __mlx5_bit_off(typ, fld) (offsetof(struct mlx5_ifc_##typ##_bits, fld)) | ^~~~~~~~ ./include/linux/mlx5/device.h:53:34: note: in expansion of macro ?__mlx5_bit_off? 53 | #define __mlx5_dw_off(typ, fld) (__mlx5_bit_off(typ, fld) / 32) | ^~~~~~~~~~~~~~ ./include/linux/mlx5/device.h:96:1: note: in expansion of macro ?__mlx5_dw_off? 96 | __mlx5_dw_off(typ, fld))) >> __mlx5_dw_bit_off(typ, fld)) & \ | ^~~~~~~~~~~~~ ./include/linux/mlx5/device.h:1355:2: note: in expansion of macro ?MLX5_GET? 1355 | MLX5_GET(device_virtio_emulation_cap, \ | ^~~~~~~~ drivers/vdpa/mlx5/net/main.c:28:7: note: in expansion of macro ?MLX5_CAP_DEV_VDPA_EMULATION? 28 | if (!MLX5_CAP_DEV_VDPA_EMULATION(mdev, eth_frame_offload_type)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from ./include/linux/mlx5/driver.h:52, from drivers/vdpa/mlx5/net/main.c:5: ./include/linux/mlx5/device.h:50:57: error: ?struct mlx5_ifc_device_virtio_emulation_cap_bits? has no member named ?eth_frame_offload_type? 50 | #define __mlx5_bit_sz(typ, fld) sizeof(__mlx5_nullp(typ)->fld) | ^~ ./include/linux/mlx5/device.h:56:43: note: in expansion of macro ?__mlx5_bit_sz? 56 | #define __mlx5_dw_bit_off(typ, fld) (32 - __mlx5_bit_sz(typ, fld) - (__mlx5_bit_off(typ, fld) & 0x1f)) | ^~~~~~~~~~~~~ ./include/linux/mlx5/device.h:96:30: note: in expansion of macro ?__mlx5_dw_bit_off? 96 | __mlx5_dw_off(typ, fld))) >> __mlx5_dw_bit_off(typ, fld)) & \ | ^~~~~~~~~~~~~~~~~ ./include/linux/mlx5/device.h:1355:2: note: in expansion of macro ?MLX5_GET? 1355 | MLX5_GET(device_virtio_emulation_cap, \ | ^~~~~~~~ drivers/vdpa/mlx5/net/main.c:28:7: note: in expansion of macro ?MLX5_CAP_DEV_VDPA_EMULATION? 28 | if (!MLX5_CAP_DEV_VDPA_EMULATION(mdev, eth_frame_offload_type)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from <command-line>: ././include/linux/compiler_types.h:129:35: error: ?struct mlx5_ifc_device_virtio_emulation_cap_bits? has no member named ?eth_frame_offload_type? 129 | #define __compiler_offsetof(a, b) __builtin_offsetof(a, b) | ^~~~~~~~~~~~~~~~~~ ./include/linux/stddef.h:17:32: note: in expansion of macro ?__compiler_offsetof? 17 | #define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER) | ^~~~~~~~~~~~~~~~~~~ ./include/linux/mlx5/device.h:51:35: note: in expansion of macro ?offsetof? 51 | #define __mlx5_bit_off(typ, fld) (offsetof(struct mlx5_ifc_##typ##_bits, fld)) | ^~~~~~~~ ./include/linux/mlx5/device.h:56:70: note: in expansion of macro ?__mlx5_bit_off? 56 | #define __mlx5_dw_bit_off(typ, fld) (32 - __mlx5_bit_sz(typ, fld) - (__mlx5_bit_off(typ, fld) & 0x1f)) | ^~~~~~~~~~~~~~ ./include/linux/mlx5/device.h:96:30: note: in expansion of macro ?__mlx5_dw_bit_off? 96 | __mlx5_dw_off(typ, fld))) >> __mlx5_dw_bit_off(typ, fld)) & \ | ^~~~~~~~~~~~~~~~~ ./include/linux/mlx5/device.h:1355:2: note: in expansion of macro ?MLX5_GET? 1355 | MLX5_GET(device_virtio_emulation_cap, \ | ^~~~~~~~ drivers/vdpa/mlx5/net/main.c:28:7: note: in expansion of macro ?MLX5_CAP_DEV_VDPA_EMULATION? 28 | if (!MLX5_CAP_DEV_VDPA_EMULATION(mdev, eth_frame_offload_type)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from ./include/linux/mlx5/driver.h:52, from drivers/vdpa/mlx5/net/main.c:5: ./include/linux/mlx5/device.h:50:57: error: ?struct mlx5_ifc_device_virtio_emulation_cap_bits? has no member named ?eth_frame_offload_type? 50 | #define __mlx5_bit_sz(typ, fld) sizeof(__mlx5_nullp(typ)->fld) | ^~ ./include/linux/mlx5/device.h:57:47: note: in expansion of macro ?__mlx5_bit_sz? 57 | #define __mlx5_mask(typ, fld) ((u32)((1ull << __mlx5_bit_sz(typ, fld)) - 1)) | ^~~~~~~~~~~~~ ./include/linux/mlx5/device.h:97:1: note: in expansion of macro ?__mlx5_mask? 97 | __mlx5_mask(typ, fld)) | ^~~~~~~~~~~ ./include/linux/mlx5/device.h:1355:2: note: in expansion of macro ?MLX5_GET? 1355 | MLX5_GET(device_virtio_emulation_cap, \ | ^~~~~~~~ drivers/vdpa/mlx5/net/main.c:28:7: note: in expansion of macro ?MLX5_CAP_DEV_VDPA_EMULATION? 28 | if (!MLX5_CAP_DEV_VDPA_EMULATION(mdev, eth_frame_offload_type)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/vdpa/mlx5/net/main.c: At top level: drivers/vdpa/mlx5/net/main.c:62:14: error: ?MLX5_INTERFACE_PROTOCOL_VDPA? undeclared here (not in a function); did you mean ?MLX5_INTERFACE_PROTOCOL_ETH?? 62 | .protocol = MLX5_INTERFACE_PROTOCOL_VDPA, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ | MLX5_INTERFACE_PROTOCOL_ETH make[3]: *** [scripts/Makefile.build:281: drivers/vdpa/mlx5/net/main.o] Error 1 make[2]: *** [scripts/Makefile.build:497: drivers/vdpa/mlx5] Error 2 make[1]: *** [scripts/Makefile.build:497: drivers/vdpa] Error 2 make: *** [Makefile:1756: drivers] Error 2 I am guessing this is because of the missing dependency, right? So what's the plan for merging this? -- MST