| Message ID | 20211106064152.313417-1-parav@nvidia.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,iproute2] vdpa: Remove duplicate vdpa UAPI header file | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/apply | fail | Patch does not apply to net-next |
Hi David, Stephen, > From: Parav Pandit <parav@nvidia.com> > Sent: Saturday, November 6, 2021 12:12 PM > > vdpa header file is already present in the tree at > vdpa/include/uapi/linux/vdpa.h and used by vdpa/vdpa.c. > > As we discussed in thread [1] vdpa header comes from a different tree, similar > to rdma subsystem. Hence remove the duplicate vdpa UAPI header file. > [..] > > Fixes: b5a6ed9cc9fc ("uapi: add missing virtio related headers") > Signed-off-by: Parav Pandit <parav@nvidia.com> Can you please review this fix? I need to submit further extensions to vdpa tool that needs header update; and above fix is necessary. > --- > include/uapi/linux/vdpa.h | 40 --------------------------------------- > 1 file changed, 40 deletions(-) > delete mode 100644 include/uapi/linux/vdpa.h > > diff --git a/include/uapi/linux/vdpa.h b/include/uapi/linux/vdpa.h deleted file > mode 100644 index 37ae26b6..00000000 > --- a/include/uapi/linux/vdpa.h > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ > -/* > - * vdpa device management interface > - * Copyright (c) 2020 Mellanox Technologies Ltd. All rights reserved. > - */ > - > -#ifndef _LINUX_VDPA_H_ > -#define _LINUX_VDPA_H_ > - > -#define VDPA_GENL_NAME "vdpa" > -#define VDPA_GENL_VERSION 0x1 > - > -enum vdpa_command { > - VDPA_CMD_UNSPEC, > - VDPA_CMD_MGMTDEV_NEW, > - VDPA_CMD_MGMTDEV_GET, /* can dump */ > - VDPA_CMD_DEV_NEW, > - VDPA_CMD_DEV_DEL, > - VDPA_CMD_DEV_GET, /* can dump */ > -}; > - > -enum vdpa_attr { > - VDPA_ATTR_UNSPEC, > - > - /* bus name (optional) + dev name together make the parent device > handle */ > - VDPA_ATTR_MGMTDEV_BUS_NAME, /* string */ > - VDPA_ATTR_MGMTDEV_DEV_NAME, /* string */ > - VDPA_ATTR_MGMTDEV_SUPPORTED_CLASSES, /* u64 */ > - > - VDPA_ATTR_DEV_NAME, /* string */ > - VDPA_ATTR_DEV_ID, /* u32 */ > - VDPA_ATTR_DEV_VENDOR_ID, /* u32 */ > - VDPA_ATTR_DEV_MAX_VQS, /* u32 */ > - VDPA_ATTR_DEV_MAX_VQ_SIZE, /* u16 */ > - > - /* new attributes must be added above here */ > - VDPA_ATTR_MAX, > -}; > - > -#endif > -- > 2.26.2
On Sat, 6 Nov 2021 08:41:52 +0200 Parav Pandit <parav@nvidia.com> wrote: > vdpa header file is already present in the tree at > vdpa/include/uapi/linux/vdpa.h and used by vdpa/vdpa.c. > > As we discussed in thread [1] vdpa header comes from a different > tree, similar to rdma subsystem. Hence remove the duplicate vdpa > UAPI header file. > > [1] https://www.spinics.net/lists/netdev/msg748458.html > > Fixes: b5a6ed9cc9fc ("uapi: add missing virtio related headers") > Signed-off-by: Parav Pandit <parav@nvidia.com> > --- > include/uapi/linux/vdpa.h | 40 --------------------------------------- > 1 file changed, 40 deletions(-) > delete mode 100644 include/uapi/linux/vdpa.h Ok, but the vdpa.h needs to be kept updated, let me add that subtree to my update-headers script. The update headers script does 'make install_headers' in the Linux kernel tree then clones them to iproute2. I would prefer that Rdma and Vdpa do not have their own headers. The future chance of version skew is too high. For now, the tool will update all three locations.
On 11/6/21 12:41 AM, Parav Pandit wrote: > vdpa header file is already present in the tree at > vdpa/include/uapi/linux/vdpa.h and used by vdpa/vdpa.c. > > As we discussed in thread [1] vdpa header comes from a different > tree, similar to rdma subsystem. Hence remove the duplicate vdpa > UAPI header file. > > [1] https://www.spinics.net/lists/netdev/msg748458.html > > Fixes: b5a6ed9cc9fc ("uapi: add missing virtio related headers") > Signed-off-by: Parav Pandit <parav@nvidia.com> > --- > include/uapi/linux/vdpa.h | 40 --------------------------------------- > 1 file changed, 40 deletions(-) > delete mode 100644 include/uapi/linux/vdpa.h > applied to iproute2-next.
diff --git a/include/uapi/linux/vdpa.h b/include/uapi/linux/vdpa.h deleted file mode 100644 index 37ae26b6..00000000 --- a/include/uapi/linux/vdpa.h +++ /dev/null @@ -1,40 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ -/* - * vdpa device management interface - * Copyright (c) 2020 Mellanox Technologies Ltd. All rights reserved. - */ - -#ifndef _LINUX_VDPA_H_ -#define _LINUX_VDPA_H_ - -#define VDPA_GENL_NAME "vdpa" -#define VDPA_GENL_VERSION 0x1 - -enum vdpa_command { - VDPA_CMD_UNSPEC, - VDPA_CMD_MGMTDEV_NEW, - VDPA_CMD_MGMTDEV_GET, /* can dump */ - VDPA_CMD_DEV_NEW, - VDPA_CMD_DEV_DEL, - VDPA_CMD_DEV_GET, /* can dump */ -}; - -enum vdpa_attr { - VDPA_ATTR_UNSPEC, - - /* bus name (optional) + dev name together make the parent device handle */ - VDPA_ATTR_MGMTDEV_BUS_NAME, /* string */ - VDPA_ATTR_MGMTDEV_DEV_NAME, /* string */ - VDPA_ATTR_MGMTDEV_SUPPORTED_CLASSES, /* u64 */ - - VDPA_ATTR_DEV_NAME, /* string */ - VDPA_ATTR_DEV_ID, /* u32 */ - VDPA_ATTR_DEV_VENDOR_ID, /* u32 */ - VDPA_ATTR_DEV_MAX_VQS, /* u32 */ - VDPA_ATTR_DEV_MAX_VQ_SIZE, /* u16 */ - - /* new attributes must be added above here */ - VDPA_ATTR_MAX, -}; - -#endif
vdpa header file is already present in the tree at vdpa/include/uapi/linux/vdpa.h and used by vdpa/vdpa.c. As we discussed in thread [1] vdpa header comes from a different tree, similar to rdma subsystem. Hence remove the duplicate vdpa UAPI header file. [1] https://www.spinics.net/lists/netdev/msg748458.html Fixes: b5a6ed9cc9fc ("uapi: add missing virtio related headers") Signed-off-by: Parav Pandit <parav@nvidia.com> --- include/uapi/linux/vdpa.h | 40 --------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 include/uapi/linux/vdpa.h