vdpa/ifc: fix vring update after device config
PATCH 1/1 vdpa/ifc: fix vring update after device config
The device ready state in vhost lib is now defined as the state that first queue pair is ready. And kick/callfd may be updated by QEMU when ifc device is configured.
Although now ifc driver only supports one queue pair, it still has to update callfd when working with QEMU. This patch fixes this vring update problem by implementing the set_vring_state callback.
--- drivers/vdpa/ifc/base/ifcvf.h | 1 + drivers/vdpa/ifc/ifcvf_vdpa.c | 54 ++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-)
drivers/vdpa/ifc/base/ifcvf.h +1 -0
@@ -115,6 +115,7 @@ struct vring_info {u16 size;u16 last_avail_idx;u16 last_used_idx; +bool enable; };struct ifcvf_hw {
drivers/vdpa/ifc/ifcvf_vdpa.c +53 -1
90 lines not on this page · raw message
Signature · 1 line
2.17.1
Hi,
Quoted 106 lines
-----Original Message-----
From: Xia, Chenbo <[email protected]>
Sent: Saturday, July 25, 2020 1:09
To: [email protected]
Cc: [email protected]; Yigit, Ferruh <[email protected]>; Wang, Xiao W <[email protected]>; Xu, Rosen <[email protected]>
Subject: [PATCH v1] vdpa/ifc: fix vring update after device configThe device ready state in vhost lib is now defined as the state that first queue pair is ready. And kick/callfd may be updated by QEMU when ifc device is configured.
Although now ifc driver only supports one queue pair, it still has to update callfd when working with QEMU. This patch fixes this vring update problem by implementing the
set_vring_statecallback.Fixes a3f8150eac6d (net/ifcvf: add ifcvf vDPA driver)Suggested-by Maxime Coquelin <[email protected]>Signed-off-by Chenbo Xia <[email protected]>Acked-by Wang Xiao W <[email protected]>--- drivers/vdpa/ifc/base/ifcvf.h | 1 + drivers/vdpa/ifc/ifcvf_vdpa.c | 54 ++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-)drivers/vdpa/ifc/base/ifcvf.h +1
-0@@ -115,6 +115,7 @@ struct vring_info {u16 size;u16 last_avail_idx;u16 last_used_idx; +bool enable; };struct ifcvf_hw {drivers/vdpa/ifc/ifcvf_vdpa.c +37
-0@@ -49,6 +49,7 @@ static const char * const ifcvf_valid_arguments[] = {struct ifcvf_internal {struct rte_pci_device *pdev;struct ifcvf_hw hw; +int configured;int vfio_container_fd;int vfio_group_fd;int vfio_dev_fd;@@ -897,6 +898,7 @@ ifcvf_dev_config(int vid)DRV_LOG (NOTICE ,"vDPA (%s): software relay is used." , vdev->device->name); + internal->configured =1 ;return 0 ; }@@ -935,6 +937,7 @@ ifcvf_dev_close(int vid)update_datapath (internal); } + internal->configured =0 ;return 0 ; }@@ -1084,13 +1087,61 @@ ifcvf_get_protocol_features(struct rte_vdpa_device *vdev, uint64_t *features)return 0 ; } +static int +ifcvf_set_vring_state (int vid,int vring,int state) { +struct rte_vdpa_device *vdev; +struct internal_list *list; +struct ifcvf_internal *internal; +struct ifcvf_hw *hw; +struct ifcvf_pci_common_cfg *cfg; +int ret =0 ; + + vdev =rte_vhost_get_vdpa_device (vid); + list =find_internal_resource_by_vdev (vdev); +if (list ==NULL ) { +DRV_LOG (ERR ,"Invalid vDPA device: %p" , vdev); +return -1 ; + } + + internal = list->internal; +if (vring <0 || vring >= internal->max_queues *2 ) { +DRV_LOG (ERR ,"Vring index %d not correct" , vring); +return -1 ; + } + + hw = &internal->hw; +if (!internal->configured) + goto exit; + + cfg = hw->common_cfg; +IFCVF_WRITE_REG16 (vring, &cfg->queue_select); +IFCVF_WRITE_REG16 (state, &cfg->queue_enable); + +if (!state && hw->vring[vring].enable) { + ret =vdpa_disable_vfio_intr (internal); +if (ret) +return ret;
drivers/vdpa/ifc/ifcvf_vdpa.c ifcvf_get_protocol_features(struct · line 1134
Quoted 10 lines
drivers/vdpa/ifc/ifcvf_vdpa.c +10
-0+ } + +if (state && !hw->vring[vring].enable) { + ret =vdpa_enable_vfio_intr (internal,0 ); +if (ret) +return ret; + } + +exit: + hw->vring[vring].enable = !!state;
Redundant operation on variable "state".
Quoted 24 lines
drivers/vdpa/ifc/ifcvf_vdpa.c +4
-1+return 0 ; +} +static struct rte_vdpa_dev_ops ifcvf_ops = { .get_queue_num = ifcvf_get_queue_num, .get_features = ifcvf_get_vdpa_features, .get_protocol_features = ifcvf_get_protocol_features, .dev_conf = ifcvf_dev_config, .dev_close = ifcvf_dev_close, - .set_vring_state =NULL , + .set_vring_state = ifcvf_set_vring_state, .set_features = ifcvf_set_features, .migration_done =NULL , .get_vfio_group_fd = ifcvf_get_vfio_group_fd, @@ -1170,6 +1221,7@@ ifcvf_pci_probe(struct
rte_pci_driver*pci_drv__rte_unused,drivers/vdpa/ifc/ifcvf_vdpa.c +1
-1goto error; } + internal->configured =0 ; internal->max_queues =IFCVF_MAX_QUEUES ; features =ifcvf_get_features (&internal->hw); internal->features = (features & --2.17.1
Hi Rosen,
Quoted 121 lines
-----Original Message-----
From: Xu, Rosen <[email protected]>
Sent: Sunday, July 26, 2020 9:27 PM
To: Xia, Chenbo <[email protected]>; [email protected]
Cc: [email protected]; Yigit, Ferruh <[email protected]>; Wang, Xiao W <[email protected]>
Subject: RE: [PATCH v1] vdpa/ifc: fix vring update after device configHi,
Quoted 111 lines
-----Original Message-----
From: Xia, Chenbo <[email protected]>
Sent: Saturday, July 25, 2020 1:09
To: [email protected]
Cc: [email protected]; Yigit, Ferruh <[email protected]>; Wang, Xiao W <[email protected]>; Xu, Rosen <[email protected]>
Subject: [PATCH v1] vdpa/ifc: fix vring update after device configThe device ready state in vhost lib is now defined as the state that first queue pair is ready. And kick/callfd may be updated by QEMU when ifc device is configured.
Although now ifc driver only supports one queue pair, it still has to update callfd when working with QEMU. This patch fixes this vring update problem by implementing the
set_vring_statecallback.Fixes a3f8150eac6d (net/ifcvf: add ifcvf vDPA driver)Suggested-by Maxime Coquelin <[email protected]>Signed-off-by Chenbo Xia <[email protected]>Acked-by Wang Xiao W <[email protected]>--- drivers/vdpa/ifc/base/ifcvf.h | 1 + drivers/vdpa/ifc/ifcvf_vdpa.c | 54 ++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/vdpa/ifc/base/ifcvf.hindexeb04a9406..a288ce57d100644drivers/vdpa/ifc/base/ifcvf.h +1
-0@@ -115,6 +115,7 @@ struct vring_info {u16 size;u16 last_avail_idx;u16 last_used_idx; +bool enable; };struct ifcvf_hw {(quoted diff) +0
-0
b/drivers/vdpa/ifc/ifcvf_vdpa.cindexa757d45ec..9da25f0c7100644drivers/vdpa/ifc/ifcvf_vdpa.c +41
-0@@ -49,6 +49,7 @@ static const char * const ifcvf_valid_arguments[] = {struct ifcvf_internal {struct rte_pci_device *pdev;struct ifcvf_hw hw; +int configured;int vfio_container_fd;int vfio_group_fd;int vfio_dev_fd;@@ -897,6 +898,7 @@ ifcvf_dev_config(int vid)DRV_LOG (NOTICE ,"vDPA (%s): software relay is used." , vdev->device->name); + internal->configured =1 ;return 0 ; }@@ -935,6 +937,7 @@ ifcvf_dev_close(int vid)update_datapath (internal); } + internal->configured =0 ;return 0 ; }@@ -1084,13 +1087,61 @@ ifcvf_get_protocol_features(struct rte_vdpa_device *vdev, uint64_t *features)return 0 ; } +static int +ifcvf_set_vring_state (int vid,int vring,int state) { +struct rte_vdpa_device *vdev; +struct internal_list *list; +struct ifcvf_internal *internal; +struct ifcvf_hw *hw; +struct ifcvf_pci_common_cfg *cfg; +int ret =0 ; + + vdev =rte_vhost_get_vdpa_device (vid); + list =find_internal_resource_by_vdev (vdev); +if (list ==NULL ) { +DRV_LOG (ERR ,"Invalid vDPA device: %p" , vdev); +return -1 ; + } + + internal = list->internal; +if (vring <0 || vring >= internal->max_queues *2 ) { +DRV_LOG (ERR ,"Vring index %d not correct" , vring); +return -1 ; + } + + hw = &internal->hw; +if (!internal->configured) + goto exit; + + cfg = hw->common_cfg; +IFCVF_WRITE_REG16 (vring, &cfg->queue_select); +IFCVF_WRITE_REG16 (state, &cfg->queue_enable); + +if (!state && hw->vring[vring].enable) { + ret =vdpa_disable_vfio_intr (internal); +if (ret) +return ret; + } + +if (state && !hw->vring[vring].enable) { + ret =vdpa_enable_vfio_intr (internal,0 );
Quoted 8 lines
drivers/vdpa/ifc/ifcvf_vdpa.c ifcvf_get_protocol_features(struct rte_vdpa_device *vdev, uint64_t *features) · line 1134
Quoted 6 lines
drivers/vdpa/ifc/ifcvf_vdpa.c +6
-0+if (ret) +return ret; + } + +exit: + hw->vring[vring].enable = !!state;Redundant operation on variable "state".
The state should be 0/1 by default, but as the callback definition uses 'int', for other lib passing non-0/1 to the callback, we'd better to make sure it's 0/1 internally. What do you think?
And thanks to your comments, I find that the register writing does not make sure it's a 0/1.
Thanks!
Chenbo
Quoted 26 lines
Quoted 5 lines
drivers/vdpa/ifc/ifcvf_vdpa.c +3
-0+return 0 ; +} +static struct rte_vdpa_dev_ops ifcvf_ops = {drivers/vdpa/ifc/ifcvf_vdpa.c ifcvf_get_protocol_features(struct rte_vdpa_device *vdev, uint64_t *features)
Quoted 10 lines
drivers/vdpa/ifc/ifcvf_vdpa.c +1
-1.get_queue_num = ifcvf_get_queue_num, .get_features = ifcvf_get_vdpa_features, .get_protocol_features = ifcvf_get_protocol_features, .dev_conf = ifcvf_dev_config, .dev_close = ifcvf_dev_close, - .set_vring_state = NULL, + .set_vring_state = ifcvf_set_vring_state, .set_features = ifcvf_set_features, .migration_done = NULL, .get_vfio_group_fd = ifcvf_get_vfio_group_fd, @@ -1170,6 +1221,7@@
Quoted 10 lines
ifcvf_pci_probe(struct
rte_pci_driver*pci_drv__rte_unused,drivers/vdpa/ifc/ifcvf_vdpa.c +1
-1goto error; } + internal->configured =0 ; internal->max_queues =IFCVF_MAX_QUEUES ; features =ifcvf_get_features (&internal->hw); internal->features = (features & --2.17.1
Hi Chenbo,
Quoted 140 lines
-----Original Message-----
From: Xia, Chenbo <[email protected]>
Sent: Tuesday, July 28, 2020 10:35
To: Xu, Rosen <[email protected]>; [email protected]
Cc: [email protected]; Yigit, Ferruh <[email protected]>; Wang, Xiao W <[email protected]>
Subject: RE: [PATCH v1] vdpa/ifc: fix vring update after device configHi Rosen,
Quoted 121 lines
-----Original Message-----
From: Xu, Rosen <[email protected]>
Sent: Sunday, July 26, 2020 9:27 PM
To: Xia, Chenbo <[email protected]>; [email protected]
Cc: [email protected]; Yigit, Ferruh <[email protected]>; Wang, Xiao W <[email protected]>
Subject: RE: [PATCH v1] vdpa/ifc: fix vring update after device configHi,
Quoted 111 lines
-----Original Message-----
From: Xia, Chenbo <[email protected]>
Sent: Saturday, July 25, 2020 1:09
To: [email protected]
Cc: [email protected]; Yigit, Ferruh <[email protected]>; Wang, Xiao W <[email protected]>; Xu, Rosen <[email protected]>
Subject: [PATCH v1] vdpa/ifc: fix vring update after device configThe device ready state in vhost lib is now defined as the state that first queue pair is ready. And kick/callfd may be updated by QEMU when ifc device is configured.
Although now ifc driver only supports one queue pair, it still has to update callfd when working with QEMU. This patch fixes this vring update problem by implementing the
set_vring_statecallback.Fixes a3f8150eac6d (net/ifcvf: add ifcvf vDPA driver)Suggested-by Maxime Coquelin <[email protected]>Signed-off-by Chenbo Xia <[email protected]>Acked-by Wang Xiao W <[email protected]>---
drivers/vdpa/ifc/base/ifcvf.h| 1 +drivers/vdpa/ifc/ifcvf_vdpa.c
| 54
++++++++++++++++++++++++++++++++++-2 files changed, 54 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/vdpa/ifc/base/ifcvf.hindexeb04a9406..a288ce57d100644drivers/vdpa/ifc/base/ifcvf.h +1
-0@@ -115,6 +115,7 @@ struct vring_info {u16 size;u16 last_avail_idx;u16 last_used_idx; +bool enable; };struct ifcvf_hw {(quoted diff) +0
-0
b/drivers/vdpa/ifc/ifcvf_vdpa.cindexa757d45ec..9da25f0c7100644drivers/vdpa/ifc/ifcvf_vdpa.c +41
-0@@ -49,6 +49,7 @@ static const char * const ifcvf_valid_arguments[] = { struct ifcvf_internal {struct rte_pci_device *pdev;struct ifcvf_hw hw; +int configured;int vfio_container_fd;int vfio_group_fd;int vfio_dev_fd;@@ -897,6 +898,7 @@ ifcvf_dev_config(int vid)DRV_LOG (NOTICE ,"vDPA (%s): software relay is used." , vdev->device->name); + internal->configured =1 ;return 0 ; }@@ -935,6 +937,7 @@ ifcvf_dev_close(int vid)update_datapath (internal); } + internal->configured =0 ;return 0 ; }@@ -1084,13 +1087,61 @@ ifcvf_get_protocol_features(struct rte_vdpa_device *vdev, uint64_t *features)return 0 ; } +static int +ifcvf_set_vring_state (int vid,int vring,int state) { +struct rte_vdpa_device *vdev; +struct internal_list *list; +struct ifcvf_internal *internal; +struct ifcvf_hw *hw; +struct ifcvf_pci_common_cfg *cfg; +int ret =0 ; + + vdev =rte_vhost_get_vdpa_device (vid); + list =find_internal_resource_by_vdev (vdev); +if (list ==NULL ) { +DRV_LOG (ERR ,"Invalid vDPA device: %p" , vdev); +return -1 ; + } + + internal = list->internal; +if (vring <0 || vring >= internal->max_queues *2 ) { +DRV_LOG (ERR ,"Vring index %d not correct" , vring); +return -1 ; + } + + hw = &internal->hw; +if (!internal->configured) + goto exit; + + cfg = hw->common_cfg; +IFCVF_WRITE_REG16 (vring, &cfg->queue_select); +IFCVF_WRITE_REG16 (state, &cfg->queue_enable); + +if (!state && hw->vring[vring].enable) { + ret =vdpa_disable_vfio_intr (internal); +if (ret) +return ret; + } + +if (state && !hw->vring[vring].enable) { + ret =vdpa_enable_vfio_intr (internal,0 );Quoted 8 lines
drivers/vdpa/ifc/ifcvf_vdpa.c ifcvf_get_protocol_features(struct rte_vdpa_device *vdev, uint64_t *features) · line 1134
Quoted 6 lines
drivers/vdpa/ifc/ifcvf_vdpa.c +6
-0+if (ret) +return ret; + } + +exit: + hw->vring[vring].enable = !!state;Redundant operation on variable "state".
Quoted 3 lines
The state should be 0/1 by default, but as the callback definition uses 'int', for other lib passing non-0/1 to the callback, we'd better to make sure it's 0/1 internally. What do you think?
Got, it make sense.
Quoted 32 lines
And thanks to your comments, I find that the register writing does not make sure it's a 0/1.
Thanks!
ChenboQuoted 26 lines
Quoted 5 lines
drivers/vdpa/ifc/ifcvf_vdpa.c +3
-0+return 0 ; +} +static struct rte_vdpa_dev_ops ifcvf_ops = {drivers/vdpa/ifc/ifcvf_vdpa.c ifcvf_get_protocol_features(struct rte_vdpa_device *vdev, uint64_t *features)
Quoted 10 lines
drivers/vdpa/ifc/ifcvf_vdpa.c +1
-1.get_queue_num = ifcvf_get_queue_num, .get_features = ifcvf_get_vdpa_features, .get_protocol_features = ifcvf_get_protocol_features, .dev_conf = ifcvf_dev_config, .dev_close = ifcvf_dev_close, - .set_vring_state = NULL, + .set_vring_state = ifcvf_set_vring_state, .set_features = ifcvf_set_features, .migration_done = NULL, .get_vfio_group_fd = ifcvf_get_vfio_group_fd, @@ -1170,6 +1221,7@@
Quoted 10 lines
ifcvf_pci_probe(struct
rte_pci_driver*pci_drv__rte_unused,drivers/vdpa/ifc/ifcvf_vdpa.c +1
-1goto error; } + internal->configured =0 ; internal->max_queues =IFCVF_MAX_QUEUES ; features =ifcvf_get_features (&internal->hw); internal->features = (features & --2.17.1
PATCH v2 1/1 vdpa/ifc: fix vring update after device config
In reply to Chenbo XiaThe device ready state in vhost lib is now defined as the state that first queue pair is ready. And kick/callfd may be updated by QEMU when ifc device is configured.
Although now ifc driver only supports one queue pair, it still has to update callfd when working with QEMU. This patch fixes this vring update problem by implementing the set_vring_state callback.
--- drivers/vdpa/ifc/base/ifcvf.h | 1 + drivers/vdpa/ifc/ifcvf_vdpa.c | 54 ++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-)
drivers/vdpa/ifc/base/ifcvf.h +1 -0
@@ -115,6 +115,7 @@ struct vring_info {u16 size;u16 last_avail_idx;u16 last_used_idx; +bool enable; };struct ifcvf_hw {
drivers/vdpa/ifc/ifcvf_vdpa.c +53 -1
90 lines not on this page · raw message
Signature · 1 line
2.17.1
Hi,
Quoted 139 lines
-----Original Message-----
From: Xia, Chenbo <[email protected]>
Sent: Tuesday, July 28, 2020 10:32 PM
To: [email protected]
Cc: [email protected]; Yigit, Ferruh <[email protected]>; Wang, Xiao W <[email protected]>; Xu, Rosen <[email protected]>
Subject: [PATCH v2] vdpa/ifc: fix vring update after device configThe device ready state in vhost lib is now defined as the state that first queue pair is ready. And kick/callfd may be updated by QEMU when ifc device is configured.
Although now ifc driver only supports one queue pair, it still has to update callfd when working with QEMU. This patch fixes this vring update problem by implementing the
set_vring_statecallback.Fixes a3f8150eac6d (net/ifcvf: add ifcvf vDPA driver)Suggested-by Maxime Coquelin <[email protected]>Signed-off-by Chenbo Xia <[email protected]>Acked-by Wang Xiao W <[email protected]>--- drivers/vdpa/ifc/base/ifcvf.h | 1 + drivers/vdpa/ifc/ifcvf_vdpa.c | 54 ++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-)drivers/vdpa/ifc/base/ifcvf.h +1
-0@@ -115,6 +115,7 @@ struct vring_info {u16 size;u16 last_avail_idx;u16 last_used_idx; +bool enable; };struct ifcvf_hw {drivers/vdpa/ifc/ifcvf_vdpa.c +52
-1@@ -49,6 +49,7 @@ static const char * const ifcvf_valid_arguments[] = {struct ifcvf_internal {struct rte_pci_device *pdev;struct ifcvf_hw hw; +int configured;int vfio_container_fd;int vfio_group_fd;int vfio_dev_fd;@@ -897,6 +898,7 @@ ifcvf_dev_config(int vid)DRV_LOG (NOTICE ,"vDPA (%s): software relay is used." , vdev->device->name); + internal->configured =1 ;return 0 ; }@@ -935,6 +937,7 @@ ifcvf_dev_close(int vid)update_datapath (internal); } + internal->configured =0 ;return 0 ; }@@ -1084,13 +1087,61 @@ ifcvf_get_protocol_features(struct rte_vdpa_device *vdev, uint64_t *features)return 0 ; } +static int +ifcvf_set_vring_state (int vid,int vring,int state) +{ +struct rte_vdpa_device *vdev; +struct internal_list *list; +struct ifcvf_internal *internal; +struct ifcvf_hw *hw; +struct ifcvf_pci_common_cfg *cfg; +int ret =0 ; + + vdev =rte_vhost_get_vdpa_device (vid); + list =find_internal_resource_by_vdev (vdev); +if (list ==NULL ) { +DRV_LOG (ERR ,"Invalid vDPA device: %p" , vdev); +return -1 ; + } + + internal = list->internal; +if (vring <0 || vring >= internal->max_queues *2 ) { +DRV_LOG (ERR ,"Vring index %d not correct" , vring); +return -1 ; + } + + hw = &internal->hw; +if (!internal->configured) + goto exit; + + cfg = hw->common_cfg; +IFCVF_WRITE_REG16 (vring, &cfg->queue_select); +IFCVF_WRITE_REG16 (!!state, &cfg->queue_enable); + +if (!state && hw->vring[vring].enable) { + ret =vdpa_disable_vfio_intr (internal); +if (ret) +return ret; + } + +if (state && !hw->vring[vring].enable) { + ret =vdpa_enable_vfio_intr (internal,0 ); +if (ret) +return ret; + } + +exit: + hw->vring[vring].enable = !!state; +return 0 ; +} +static struct rte_vdpa_dev_ops ifcvf_ops = { .get_queue_num = ifcvf_get_queue_num, .get_features = ifcvf_get_vdpa_features, .get_protocol_features = ifcvf_get_protocol_features, .dev_conf = ifcvf_dev_config, .dev_close = ifcvf_dev_close, - .set_vring_state =NULL , + .set_vring_state = ifcvf_set_vring_state, .set_features = ifcvf_set_features, .migration_done =NULL ,drivers/vdpa/ifc/ifcvf_vdpa.c +1
-0.get_vfio_group_fd = ifcvf_get_vfio_group_fd,@@ -1170,6 +1221,7 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, goto error; } + internal->configured =0 ; internal->max_queues =IFCVF_MAX_QUEUES ; features =ifcvf_get_features (&internal->hw);
Quoted 3 lines
internal->features= (features &
--
2.17.1
BRs,
Xiao
Hi,
Quoted 138 lines
-----Original Message-----
From: Xia, Chenbo <[email protected]>
Sent: Tuesday, July 28, 2020 22:32
To: [email protected]
Cc: [email protected]; Yigit, Ferruh <[email protected]>; Wang, Xiao W <[email protected]>; Xu, Rosen <[email protected]>
Subject: [PATCH v2] vdpa/ifc: fix vring update after device configThe device ready state in vhost lib is now defined as the state that first queue pair is ready. And kick/callfd may be updated by QEMU when ifc device is configured.
Although now ifc driver only supports one queue pair, it still has to update callfd when working with QEMU. This patch fixes this vring update problem by implementing the
set_vring_statecallback.Fixes a3f8150eac6d (net/ifcvf: add ifcvf vDPA driver)Suggested-by Maxime Coquelin <[email protected]>Signed-off-by Chenbo Xia <[email protected]>Acked-by Wang Xiao W <[email protected]>--- drivers/vdpa/ifc/base/ifcvf.h | 1 + drivers/vdpa/ifc/ifcvf_vdpa.c | 54 ++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-)drivers/vdpa/ifc/base/ifcvf.h +1
-0@@ -115,6 +115,7 @@ struct vring_info {u16 size;u16 last_avail_idx;u16 last_used_idx; +bool enable; };struct ifcvf_hw {drivers/vdpa/ifc/ifcvf_vdpa.c +51
-1@@ -49,6 +49,7 @@ static const char * const ifcvf_valid_arguments[] = {struct ifcvf_internal {struct rte_pci_device *pdev;struct ifcvf_hw hw; +int configured;int vfio_container_fd;int vfio_group_fd;int vfio_dev_fd;@@ -897,6 +898,7 @@ ifcvf_dev_config(int vid)DRV_LOG (NOTICE ,"vDPA (%s): software relay is used." , vdev->device->name); + internal->configured =1 ;return 0 ; }@@ -935,6 +937,7 @@ ifcvf_dev_close(int vid)update_datapath (internal); } + internal->configured =0 ;return 0 ; }@@ -1084,13 +1087,61 @@ ifcvf_get_protocol_features(struct rte_vdpa_device *vdev, uint64_t *features)return 0 ; } +static int +ifcvf_set_vring_state (int vid,int vring,int state) { +struct rte_vdpa_device *vdev; +struct internal_list *list; +struct ifcvf_internal *internal; +struct ifcvf_hw *hw; +struct ifcvf_pci_common_cfg *cfg; +int ret =0 ; + + vdev =rte_vhost_get_vdpa_device (vid); + list =find_internal_resource_by_vdev (vdev); +if (list ==NULL ) { +DRV_LOG (ERR ,"Invalid vDPA device: %p" , vdev); +return -1 ; + } + + internal = list->internal; +if (vring <0 || vring >= internal->max_queues *2 ) { +DRV_LOG (ERR ,"Vring index %d not correct" , vring); +return -1 ; + } + + hw = &internal->hw; +if (!internal->configured) + goto exit; + + cfg = hw->common_cfg; +IFCVF_WRITE_REG16 (vring, &cfg->queue_select); +IFCVF_WRITE_REG16 (!!state, &cfg->queue_enable); + +if (!state && hw->vring[vring].enable) { + ret =vdpa_disable_vfio_intr (internal); +if (ret) +return ret; + } + +if (state && !hw->vring[vring].enable) { + ret =vdpa_enable_vfio_intr (internal,0 ); +if (ret) +return ret; + } + +exit: + hw->vring[vring].enable = !!state; +return 0 ; +} +static struct rte_vdpa_dev_ops ifcvf_ops = { .get_queue_num = ifcvf_get_queue_num, .get_features = ifcvf_get_vdpa_features, .get_protocol_features = ifcvf_get_protocol_features, .dev_conf = ifcvf_dev_config, .dev_close = ifcvf_dev_close, - .set_vring_state =NULL , + .set_vring_state = ifcvf_set_vring_state, .set_features = ifcvf_set_features, .migration_done =NULL , .get_vfio_group_fd = ifcvf_get_vfio_group_fd, @@ -1170,6 +1221,7@@ ifcvf_pci_probe(struct
rte_pci_driver*pci_drv__rte_unused,drivers/vdpa/ifc/ifcvf_vdpa.c +1
-1goto error; } + internal->configured =0 ; internal->max_queues =IFCVF_MAX_QUEUES ; features =ifcvf_get_features (&internal->hw); internal->features = (features & --
Quoted 1 line
2.17.1
Quoted 11 lines · Chenbo Xia
The device ready state in vhost lib is now defined as the state that first queue pair is ready. And kick/callfd may be updated by QEMU when ifc device is configured.
Although now ifc driver only supports one queue pair, it still has to update callfd when working with QEMU. This patch fixes this vring update problem by implementing the
set_vring_statecallback.Fixes a3f8150eac6d (net/ifcvf: add ifcvf vDPA driver)
Quoted 8 lines
Suggested-by Maxime Coquelin <[email protected]>Signed-off-by Chenbo Xia <[email protected]>Acked-by Wang Xiao W <[email protected]>--- drivers/vdpa/ifc/base/ifcvf.h | 1 + drivers/vdpa/ifc/ifcvf_vdpa.c | 54 ++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-)
Thanks Chenbo for doing the change!
Thanks,
Maxime
Maxime Coquelin
AppliedQuoted 11 lines · Chenbo Xia
The device ready state in vhost lib is now defined as the state that first queue pair is ready. And kick/callfd may be updated by QEMU when ifc device is configured.
Although now ifc driver only supports one queue pair, it still has to update callfd when working with QEMU. This patch fixes this vring update problem by implementing the
set_vring_statecallback.Fixes a3f8150eac6d (net/ifcvf: add ifcvf vDPA driver)
Quoted 8 lines
Suggested-by Maxime Coquelin <[email protected]>Signed-off-by Chenbo Xia <[email protected]>Acked-by Wang Xiao W <[email protected]>--- drivers/vdpa/ifc/base/ifcvf.h | 1 + drivers/vdpa/ifc/ifcvf_vdpa.c | 54 ++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-)
Applied to dpdk-next-virtio/master
Thanks,
Maxime