| Message ID | 20211118180000.30627-1-stephen@networkplumber.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fa58de9b0c73e8e02104603d82aa5b92df2a0e0f |
| Delegated to: | David Ahern |
| Headers | show |
| Series | [iproute2] vdpa: align uapi headers | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Hello: This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger <stephen@networkplumber.org>: On Thu, 18 Nov 2021 10:00:00 -0800 you wrote: > Update vdpa headers based on 5.16.0-rc1 and remove redundant copy. > > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> > --- > include/uapi/linux/vdpa.h | 47 ---------------------------- > vdpa/include/uapi/linux/vdpa.h | 7 +++++ > vdpa/include/uapi/linux/virtio_ids.h | 26 +++++++++++++++ > 3 files changed, 33 insertions(+), 47 deletions(-) > delete mode 100644 include/uapi/linux/vdpa.h Here is the summary with links: - [iproute2] vdpa: align uapi headers https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=fa58de9b0c73 You are awesome, thank you!
> From: patchwork-bot+netdevbpf@kernel.org <patchwork- > bot+netdevbpf@kernel.org> > > Hello: > > This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger > <stephen@networkplumber.org>: > > On Thu, 18 Nov 2021 10:00:00 -0800 you wrote: > > Update vdpa headers based on 5.16.0-rc1 and remove redundant copy. > > > > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> > > --- > > include/uapi/linux/vdpa.h | 47 ---------------------------- This will conflict with commit [1] in iproute2-next branch. [1] https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/commit/?h=master&id=a21458fc35336108acd4b75b4d8e1ef7f7e7d9a1
On Mon, 22 Nov 2021 02:52:29 +0000 Parav Pandit <parav@nvidia.com> wrote: > > From: patchwork-bot+netdevbpf@kernel.org <patchwork- > > bot+netdevbpf@kernel.org> > > > > Hello: > > > > This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger > > <stephen@networkplumber.org>: > > > > On Thu, 18 Nov 2021 10:00:00 -0800 you wrote: > > > Update vdpa headers based on 5.16.0-rc1 and remove redundant copy. > > > > > > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> > > > --- > > > include/uapi/linux/vdpa.h | 47 ---------------------------- > > This will conflict with commit [1] in iproute2-next branch. > [1] https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/commit/?h=master&id=a21458fc35336108acd4b75b4d8e1ef7f7e7d9a1 No worries, Dave will do a header merge.
> From: Stephen Hemminger <stephen@networkplumber.org> > Sent: Monday, November 22, 2021 9:41 AM > > On Mon, 22 Nov 2021 02:52:29 +0000 > Parav Pandit <parav@nvidia.com> wrote: > > > > From: patchwork-bot+netdevbpf@kernel.org <patchwork- > > > bot+netdevbpf@kernel.org> > > > > > > Hello: > > > > > > This patch was applied to iproute2/iproute2.git (main) by Stephen > Hemminger > > > <stephen@networkplumber.org>: > > > > > > On Thu, 18 Nov 2021 10:00:00 -0800 you wrote: > > > > Update vdpa headers based on 5.16.0-rc1 and remove redundant copy. > > > > > > > > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> > > > > --- > > > > include/uapi/linux/vdpa.h | 47 ---------------------------- > > > > This will conflict with commit [1] in iproute2-next branch. > > [1] https://git.kernel.org/pub/scm/network/iproute2/iproute2- > next.git/commit/?h=master&id=a21458fc35336108acd4b75b4d8e1ef7f7e7d9a > 1 > > No worries, Dave will do a header merge. Ok. thanks.
diff --git a/include/uapi/linux/vdpa.h b/include/uapi/linux/vdpa.h deleted file mode 100644 index b7eab069988a..000000000000 --- a/include/uapi/linux/vdpa.h +++ /dev/null @@ -1,47 +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 */ - VDPA_CMD_DEV_CONFIG_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 */ - VDPA_ATTR_DEV_MIN_VQ_SIZE, /* u16 */ - - VDPA_ATTR_DEV_NET_CFG_MACADDR, /* binary */ - VDPA_ATTR_DEV_NET_STATUS, /* u8 */ - VDPA_ATTR_DEV_NET_CFG_MAX_VQP, /* u16 */ - VDPA_ATTR_DEV_NET_CFG_MTU, /* u16 */ - - /* new attributes must be added above here */ - VDPA_ATTR_MAX, -}; - -#endif diff --git a/vdpa/include/uapi/linux/vdpa.h b/vdpa/include/uapi/linux/vdpa.h index 37ae26b6ba26..b7eab069988a 100644 --- a/vdpa/include/uapi/linux/vdpa.h +++ b/vdpa/include/uapi/linux/vdpa.h @@ -17,6 +17,7 @@ enum vdpa_command { VDPA_CMD_DEV_NEW, VDPA_CMD_DEV_DEL, VDPA_CMD_DEV_GET, /* can dump */ + VDPA_CMD_DEV_CONFIG_GET, /* can dump */ }; enum vdpa_attr { @@ -32,6 +33,12 @@ enum vdpa_attr { VDPA_ATTR_DEV_VENDOR_ID, /* u32 */ VDPA_ATTR_DEV_MAX_VQS, /* u32 */ VDPA_ATTR_DEV_MAX_VQ_SIZE, /* u16 */ + VDPA_ATTR_DEV_MIN_VQ_SIZE, /* u16 */ + + VDPA_ATTR_DEV_NET_CFG_MACADDR, /* binary */ + VDPA_ATTR_DEV_NET_STATUS, /* u8 */ + VDPA_ATTR_DEV_NET_CFG_MAX_VQP, /* u16 */ + VDPA_ATTR_DEV_NET_CFG_MTU, /* u16 */ /* new attributes must be added above here */ VDPA_ATTR_MAX, diff --git a/vdpa/include/uapi/linux/virtio_ids.h b/vdpa/include/uapi/linux/virtio_ids.h index bc1c0621f5ed..80d76b75bccd 100644 --- a/vdpa/include/uapi/linux/virtio_ids.h +++ b/vdpa/include/uapi/linux/virtio_ids.h @@ -51,8 +51,34 @@ #define VIRTIO_ID_PSTORE 22 /* virtio pstore device */ #define VIRTIO_ID_IOMMU 23 /* virtio IOMMU */ #define VIRTIO_ID_MEM 24 /* virtio mem */ +#define VIRTIO_ID_SOUND 25 /* virtio sound */ #define VIRTIO_ID_FS 26 /* virtio filesystem */ #define VIRTIO_ID_PMEM 27 /* virtio pmem */ +#define VIRTIO_ID_RPMB 28 /* virtio rpmb */ #define VIRTIO_ID_MAC80211_HWSIM 29 /* virtio mac80211-hwsim */ +#define VIRTIO_ID_VIDEO_ENCODER 30 /* virtio video encoder */ +#define VIRTIO_ID_VIDEO_DECODER 31 /* virtio video decoder */ +#define VIRTIO_ID_SCMI 32 /* virtio SCMI */ +#define VIRTIO_ID_NITRO_SEC_MOD 33 /* virtio nitro secure module*/ +#define VIRTIO_ID_I2C_ADAPTER 34 /* virtio i2c adapter */ +#define VIRTIO_ID_WATCHDOG 35 /* virtio watchdog */ +#define VIRTIO_ID_CAN 36 /* virtio can */ +#define VIRTIO_ID_DMABUF 37 /* virtio dmabuf */ +#define VIRTIO_ID_PARAM_SERV 38 /* virtio parameter server */ +#define VIRTIO_ID_AUDIO_POLICY 39 /* virtio audio policy */ +#define VIRTIO_ID_BT 40 /* virtio bluetooth */ +#define VIRTIO_ID_GPIO 41 /* virtio gpio */ + +/* + * Virtio Transitional IDs + */ + +#define VIRTIO_TRANS_ID_NET 1000 /* transitional virtio net */ +#define VIRTIO_TRANS_ID_BLOCK 1001 /* transitional virtio block */ +#define VIRTIO_TRANS_ID_BALLOON 1002 /* transitional virtio balloon */ +#define VIRTIO_TRANS_ID_CONSOLE 1003 /* transitional virtio console */ +#define VIRTIO_TRANS_ID_SCSI 1004 /* transitional virtio SCSI */ +#define VIRTIO_TRANS_ID_RNG 1005 /* transitional virtio rng */ +#define VIRTIO_TRANS_ID_9P 1009 /* transitional virtio 9p console */ #endif /* _LINUX_VIRTIO_IDS_H */
Update vdpa headers based on 5.16.0-rc1 and remove redundant copy. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- include/uapi/linux/vdpa.h | 47 ---------------------------- vdpa/include/uapi/linux/vdpa.h | 7 +++++ vdpa/include/uapi/linux/virtio_ids.h | 26 +++++++++++++++ 3 files changed, 33 insertions(+), 47 deletions(-) delete mode 100644 include/uapi/linux/vdpa.h