These two series from Mark and Shun extend RDMA mlx5 API. Mark's series provides c0 register used to match egress traffic sent by local device. Shun's series adds new type for ICM area.
Showing the changes to include/uapi (7 of 1114 files). Show all
Unified · Split
| @@ -219,6 +219,22 @@ · 218 unmodified lines | ||
| 219 | 219 | */ |
| 220 | 220 | #define BTRFS_METADATA_ITEM_KEY 169 |
| 221 | 221 | |
| 222 | +/* | |
| 223 | + * Special inline ref key which stores the id of the subvolume which originally | |
| 224 | + * created the extent. This subvolume owns the extent permanently from the | |
| 225 | + * perspective of simple quotas. Needed to know which subvolume to free quota | |
| 226 | + * usage from when the extent is deleted. | |
| 227 | + * | |
| 228 | + * Stored as an inline ref rather to avoid wasting space on a separate item on | |
| 229 | + * top of the existing extent item. However, unlike the other inline refs, | |
| 230 | + * there is one one owner ref per extent rather than one per extent. | |
| 231 | + * | |
| 232 | + * Because of this, it goes at the front of the list of inline refs, and thus | |
| 233 | + * must have a lower type value than any other inline ref type (to satisfy the | |
| 234 | + * disk format rule that inline refs have non-decreasing type). | |
| 235 | + */ | |
| 236 | +#define BTRFS_EXTENT_OWNER_REF_KEY 172 | |
| 237 | + | |
| 222 | 238 | #define BTRFS_TREE_BLOCK_REF_KEY 176 |
| 223 | 239 | |
| 224 | 240 | #define BTRFS_EXTENT_DATA_REF_KEY 178 |
| @@ -233,14 +249,6 @@ · 8 unmodified lines | ||
| 233 | 249 | |
| 234 | 250 | #define BTRFS_SHARED_DATA_REF_KEY 184 |
| 235 | 251 | |
| 236 | −/* | |
| 237 | − * Special inline ref key which stores the id of the subvolume which originally | |
| 238 | − * created the extent. This subvolume owns the extent permanently from the | |
| 239 | − * perspective of simple quotas. Needed to know which subvolume to free quota | |
| 240 | − * usage from when the extent is deleted. | |
| 241 | − */ | |
| 242 | −#define BTRFS_EXTENT_OWNER_REF_KEY 188 | |
| 243 | − | |
| 244 | 252 | /* |
| 245 | 253 | * block groups give us hints into the extent allocation trees. Which |
| 246 | 254 | * blocks are free etc etc |
| @@ -116,5 +116,8 @@ · 115 unmodified lines | ||
| 116 | 116 | #define AT_HANDLE_FID AT_REMOVEDIR /* file handle is needed to |
| 117 | 117 | compare object identity and may not |
| 118 | 118 | be usable to open_by_handle_at(2) */ |
| 119 | +#if defined(__KERNEL__) | |
| 120 | +#define AT_GETATTR_NOSEC 0x80000000 | |
| 121 | +#endif | |
| 119 | 122 | |
| 120 | 123 | #endif /* _UAPI_LINUX_FCNTL_H */ |
| @@ -27,7 +27,7 @@ · 26 unmodified lines | ||
| 27 | 27 | union { \ |
| 28 | 28 | struct { MEMBERS } ATTRS; \ |
| 29 | 29 | struct TAG { MEMBERS } ATTRS NAME; \ |
| 30 | − } | |
| 30 | + } ATTRS | |
| 31 | 31 | |
| 32 | 32 | #ifdef __cplusplus |
| 33 | 33 | /* sizeof(struct{}) is 1 in C++, not 0, can't use C version of the macro. */ |
| @@ -239,7 +239,7 @@ struct v4l2_subdev_routing { · 238 unmodified lines | ||
| 239 | 239 | * set (which is the default), the 'stream' fields will be forced to 0 by the |
| 240 | 240 | * kernel. |
| 241 | 241 | */ |
| 242 | − #define V4L2_SUBDEV_CLIENT_CAP_STREAMS (1U << 0) | |
| 242 | + #define V4L2_SUBDEV_CLIENT_CAP_STREAMS (1ULL << 0) | |
| 243 | 243 | |
| 244 | 244 | /** |
| 245 | 245 | * struct v4l2_subdev_client_capability - Capabilities of the client accessing |
| @@ -166,6 +166,17 @@ struct virtio_pci_common_cfg { · 165 unmodified lines | ||
| 166 | 166 | __le32 queue_used_hi; /* read-write */ |
| 167 | 167 | }; |
| 168 | 168 | |
| 169 | +/* | |
| 170 | + * Warning: do not use sizeof on this: use offsetofend for | |
| 171 | + * specific fields you need. | |
| 172 | + */ | |
| 173 | +struct virtio_pci_modern_common_cfg { | |
| 174 | + struct virtio_pci_common_cfg cfg; | |
| 175 | + | |
| 176 | + __le16 queue_notify_data; /* read-write */ | |
| 177 | + __le16 queue_reset; /* read-write */ | |
| 178 | +}; | |
| 179 | + | |
| 169 | 180 | /* Fields in VIRTIO_PCI_CAP_PCI_CFG: */ |
| 170 | 181 | struct virtio_pci_cfg_cap { |
| 171 | 182 | struct virtio_pci_cap cap; |
| @@ -37,6 +37,7 @@ · 36 unmodified lines | ||
| 37 | 37 | #include <linux/types.h> |
| 38 | 38 | #include <linux/if_ether.h> /* For ETH_ALEN. */ |
| 39 | 39 | #include <rdma/ib_user_ioctl_verbs.h> |
| 40 | +#include <rdma/mlx5_user_ioctl_verbs.h> | |
| 40 | 41 | |
| 41 | 42 | enum { |
| 42 | 43 | MLX5_QP_FLAG_SIGNATURE = 1 << 0, |
| @@ -275,6 +276,7 @@ struct mlx5_ib_query_device_resp { · 232 unmodified lines | ||
| 275 | 276 | __u32 tunnel_offloads_caps; /* enum mlx5_ib_tunnel_offloads */ |
| 276 | 277 | struct mlx5_ib_dci_streams_caps dci_streams_caps; |
| 277 | 278 | __u16 reserved; |
| 279 | + struct mlx5_ib_uapi_reg reg_c0; | |
| 278 | 280 | }; |
| 279 | 281 | |
| 280 | 282 | enum mlx5_ib_create_cq_flags { |
| @@ -64,6 +64,7 @@ enum mlx5_ib_uapi_dm_type { · 63 unmodified lines | ||
| 64 | 64 | MLX5_IB_UAPI_DM_TYPE_STEERING_SW_ICM, |
| 65 | 65 | MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_SW_ICM, |
| 66 | 66 | MLX5_IB_UAPI_DM_TYPE_HEADER_MODIFY_PATTERN_SW_ICM, |
| 67 | + MLX5_IB_UAPI_DM_TYPE_ENCAP_SW_ICM, | |
| 67 | 68 | }; |
| 68 | 69 | |
| 69 | 70 | enum mlx5_ib_uapi_devx_create_event_channel_flags { |