Implement vdpasim stop operation
Subsystems (5)
Eugenio Pérez
maintainerv3 cover Implement vdpasim stop operation
Implement stop operation for vdpa_sim devices, so vhost-vdpa will offer that backend feature and userspace can effectively stop the device.
This is a must before get virtqueue indexes (base) for live migration, since the device could modify them after userland gets them. There are individual ways to perform that action for some devices (VHOST_NET_SET_BACKEND, VHOST_VSOCK_SET_RUNNING, ...) but there was no way to perform it for any vhost device (and, in particular, vhost-vdpa).
After the return of ioctl with stop != 0, the device MUST finish any pending operations like in flight requests. It must also preserve all the necessary state (the virtqueue vring base plus the possible device specific states) that is required for restoring in the future. The device must not change its configuration after that point.
After the return of ioctl with stop == 0, the device can continue processing buffers as long as typical conditions are met (vq is enabled, DRIVER_OK status bit is enabled, etc).
In the future, we will provide features similar to VHOST_USER_GET_INFLIGHT_FD so the device can save pending operations.
Comments are welcome.
v3:
* s/VHOST_STOP/VHOST_VDPA_STOP/
* Add documentation and requirements of the ioctl above its definition.
v2:
* Replace raw _F_STOP with BIT_ULL(_F_STOP).
* Fix obtaining of stop ioctl arg (it was not obtained but written).
* Add stop to vdpa_sim_blk.
Eugenio Pérez (4):
vdpa: Add stop operation
vhost-vdpa: introduce STOP backend feature bit
vhost-vdpa: uAPI to stop the device
vdpa_sim: Implement stop vdpa op
drivers/vdpa/vdpa_sim/vdpa_sim.c | 21 +++++++++++++++++ drivers/vdpa/vdpa_sim/vdpa_sim.h | 1 + drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 3 +++ drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 3 +++ drivers/vhost/vdpa.c | 34 +++++++++++++++++++++++++++- include/linux/vdpa.h | 6 +++++ include/uapi/linux/vhost.h | 14 ++++++++++++ include/uapi/linux/vhost_types.h | 2 ++ 8 files changed, 83 insertions(+), 1 deletion(-)
Signature · 1 line
2.27.0
Eugenio Pérez
maintainerPATCH v3 1/4 vdpa: Add stop operation
This operation is optional: It it's not implemented, backend feature bit will not be exposed.
--- include/linux/vdpa.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/linux/vdpa.h +6 -0
@@ -215,6 +215,11 @@ struct vdpa_map_file {* @reset: Reset device * @vdev: vdpa device * Returns integer: success (0) or error (< 0) +* @stop: Stop or resume the device (optional, but it must +* be implemented if require device stop) +* @vdev: vdpa device +* @stop: stop (true), not stop (false) +* Returns integer: success (0) or error (< 0) * @get_config_size: Get the size of the configuration space includes * fields that are conditional on feature bits. * @vdev: vdpa device
@@ -316,6 +321,7 @@ struct vdpa_config_ops {u8 (*get_status)(struct vdpa_device *vdev);void (*set_status)(struct vdpa_device *vdev,u8 status);int (*reset)(struct vdpa_device *vdev); +int (*stop)(struct vdpa_device *vdev,bool stop);size_t (*get_config_size)(struct vdpa_device *vdev);void (*get_config)(struct vdpa_device *vdev,unsigned int offset,void *buf,unsigned int len);
Signature · 1 line
2.27.0
Eugenio Pérez
maintainerPATCH v3 2/4 vhost-vdpa: introduce STOP backend feature bit
In reply to Eugenio PérezUserland knows if it can stop the device or not by checking this feature bit.
It's only offered if the vdpa driver backend implements the stop() operation callback, and try to set it if the backend does not offer that callback is an error.
--- drivers/vhost/vdpa.c | 16 +++++++++++++++- include/uapi/linux/vhost_types.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/vhost/vdpa.c +15 -1
@@ -347,6 +347,14 @@ static long vhost_vdpa_set_config(struct vhost_vdpa *v,return 0 ; } +static bool vhost_vdpa_can_stop (const struct vhost_vdpa *v) +{ +struct vdpa_device *vdpa = v->vdpa; +const struct vdpa_config_ops *ops = vdpa->config; + +return ops->stop; +} +static long vhost_vdpa_get_features (struct vhost_vdpa *v,u64 __user *featurep) {struct vdpa_device *vdpa = v->vdpa;
@@ -575,7 +583,11 @@ static long vhost_vdpa_unlocked_ioctl(struct file *filep,if (cmd ==VHOST_SET_BACKEND_FEATURES ) {if (copy_from_user (&features, featurep,sizeof (features)))return -EFAULT ; -if (features & ~VHOST_VDPA_BACKEND_FEATURES ) +if (features & ~(VHOST_VDPA_BACKEND_FEATURES | +BIT_ULL (VHOST_BACKEND_F_STOP ))) +return -EOPNOTSUPP ; +if ((features &BIT_ULL (VHOST_BACKEND_F_STOP )) && + !vhost_vdpa_can_stop (v))return -EOPNOTSUPP ;vhost_set_backend_features (&v->vdev, features);return 0 ;
@@ -624,6 +636,8 @@ static long vhost_vdpa_unlocked_ioctl(struct file *filep,break ;case VHOST_GET_BACKEND_FEATURES : features =VHOST_VDPA_BACKEND_FEATURES ; +if (vhost_vdpa_can_stop (v)) + features |=BIT_ULL (VHOST_BACKEND_F_STOP );if (copy_to_user (featurep, &features,sizeof (features))) r = -EFAULT ;break ;
include/uapi/linux/vhost_types.h +2 -0
@@ -161,5 +161,7 @@ struct vhost_vdpa_iova_range {* message */ #define VHOST_BACKEND_F_IOTLB_ASID 0x3 +/* Stop device from processing virtqueue buffers */ +#define VHOST_BACKEND_F_STOP 0x4#endif
Signature · 1 line
2.27.0
RE: [PATCH v3 2/4] vhost-vdpa: introduce STOP backend feature bit
[AMD Official Use Only - General]
-----Original Message-----
From: Eugenio Pérez <[email protected]>
Sent: Wednesday, May 25, 2022 4:29 PM
To: Michael S. Tsirkin <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; Jason Wang <[email protected]>
Cc: Zhu Lingshan <[email protected]>; [email protected]; Stefano Garzarella <[email protected]>; [email protected]; Eli Cohen <[email protected]>; Dan Carpenter <[email protected]>; Parav Pandit <[email protected]>; Wu Zongyong <[email protected]>; [email protected]; Christophe JAILLET <[email protected]>; Xie Yongji <[email protected]>; Dawar, Gautam <[email protected]>; [email protected]; [email protected]; [email protected]; Longpeng <[email protected]>; [email protected]; Kamde, Tanuj <[email protected]>; Si-Wei Liu <[email protected]>; [email protected]; [email protected]; Zhang Min <[email protected]>; [email protected]
Subject: [PATCH v3 2/4] vhost-vdpa: introduce STOP backend feature bit
[CAUTION: External Email]
Userland knows if it can stop the device or not by checking this feature bit.
It's only offered if the vdpa driver backend implements the stop() operation callback, and try to set it if the backend does not offer that callback is an error.
--- drivers/vhost/vdpa.c | 16 +++++++++++++++- include/uapi/linux/vhost_types.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/vhost/vdpa.c +5 -0
@@ -347,6 +347,14 @@ static long vhost_vdpa_set_config(struct vhost_vdpa *v,return 0 ; } +static bool vhost_vdpa_can_stop (const struct vhost_vdpa *v) { +struct vdpa_device *vdpa = v->vdpa; +const struct vdpa_config_ops *ops = vdpa->config; + +return ops->stop;
[GD>>] Would it be better to explicitly return a bool to match the return type? +}
+
static long vhost_vdpa_get_features(struct vhost_vdpa *v, u64 __user *featurep) {
struct vdpa_device *vdpa = v->vdpa; @@ -575,7 +583,11 @@ static long vhost_vdpa_unlocked_ioctl(struct file *filep,
if (cmd == VHOST_SET_BACKEND_FEATURES) {
if (copy_from_user(&features, featurep, sizeof(features)))
return -EFAULT;- if (features & ~VHOST_VDPA_BACKEND_FEATURES)
+ if (features & ~(VHOST_VDPA_BACKEND_FEATURES |
+ BIT_ULL(VHOST_BACKEND_F_STOP)))
+ return -EOPNOTSUPP;
+ if ((features & BIT_ULL(VHOST_BACKEND_F_STOP)) &&
+ !vhost_vdpa_can_stop(v))
return -EOPNOTSUPP;
vhost_set_backend_features(&v->vdev, features);
return 0;
@@ -624,6 +636,8 @@ static long vhost_vdpa_unlocked_ioctl(struct file *filep,
break;
case VHOST_GET_BACKEND_FEATURES:
features = VHOST_VDPA_BACKEND_FEATURES;
+ if (vhost_vdpa_can_stop(v))
+ features |= BIT_ULL(VHOST_BACKEND_F_STOP);
if (copy_to_user(featurep, &features, sizeof(features)))
r = -EFAULT;
break;include/uapi/linux/vhost_types.h +2 -0
@@ -161,5 +161,7 @@ struct vhost_vdpa_iova_range {* message */ #define VHOST_BACKEND_F_IOTLB_ASID 0x3 +/* Stop device from processing virtqueue buffers */ #define +VHOST_BACKEND_F_STOP 0x4#endif
--
2.27.0
Eugenio Perez Martin
maintainerRe: [PATCH v3 2/4] vhost-vdpa: introduce STOP backend feature bit
Quoted 34 lines · Gautam
[AMD Official Use Only - General]
-----Original Message-----
From: Eugenio Pérez <[email protected]>
Sent: Wednesday, May 25, 2022 4:29 PM
To: Michael S. Tsirkin <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; Jason Wang <[email protected]>
Cc: Zhu Lingshan <[email protected]>; [email protected]; Stefano Garzarella <[email protected]>; [email protected]; Eli Cohen <[email protected]>; Dan Carpenter <[email protected]>; Parav Pandit <[email protected]>; Wu Zongyong <[email protected]>; [email protected]; Christophe JAILLET <[email protected]>; Xie Yongji <[email protected]>; Dawar, Gautam <[email protected]>; [email protected]; [email protected]; [email protected]; Longpeng <[email protected]>; [email protected]; Kamde, Tanuj <[email protected]>; Si-Wei Liu <[email protected]>; [email protected]; [email protected]; Zhang Min <[email protected]>; [email protected]
Subject: [PATCH v3 2/4] vhost-vdpa: introduce STOP backend feature bit[CAUTION: External Email]
Userland knows if it can stop the device or not by checking this feature bit.
It's only offered if the vdpa driver backend implements the
stop()operation callback, and try to set it if the backend does not offer that callback is an error.Signed-off-by Eugenio Pérez <[email protected]>--- drivers/vhost/vdpa.c | 16 +++++++++++++++- include/uapi/linux/vhost_types.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-)drivers/vhost/vdpa.c +5
-0@@ -347,6 +347,14 @@ static long vhost_vdpa_set_config(struct vhost_vdpa *v,return 0 ; } +static bool vhost_vdpa_can_stop (const struct vhost_vdpa *v) { +struct vdpa_device *vdpa = v->vdpa; +const struct vdpa_config_ops *ops = vdpa->config; + +return ops->stop;
Quoted 1 line
[GD>>] Would it be better to explicitly return a bool to match the return type?
I'm not sure about the kernel code style regarding that casting. Maybe it's better to return !!ops->stop here. The macros likely and unlikely do that.
Thanks!
Quoted 40 lines
drivers/vhost/vdpa.c +9
-1+} +static long vhost_vdpa_get_features (struct vhost_vdpa *v,u64 __user *featurep) { struct vdpa_device *vdpa = v->vdpa; @@ -575,7 +583,11 @@ static long vhost_vdpa_unlocked_ioctl(struct file *filep, if (cmd == VHOST_SET_BACKEND_FEATURES) {if (copy_from_user (&features, featurep,sizeof (features)))return -EFAULT ; -if (features & ~VHOST_VDPA_BACKEND_FEATURES ) +if (features & ~(VHOST_VDPA_BACKEND_FEATURES | +BIT_ULL (VHOST_BACKEND_F_STOP ))) +return -EOPNOTSUPP ; +if ((features &BIT_ULL (VHOST_BACKEND_F_STOP )) && + !vhost_vdpa_can_stop (v))return -EOPNOTSUPP ;vhost_set_backend_features (&v->vdev, features);return 0 ;@@ -624,6 +636,8 @@ static long vhost_vdpa_unlocked_ioctl(struct file *filep,break ;case VHOST_GET_BACKEND_FEATURES : features =VHOST_VDPA_BACKEND_FEATURES ; +if (vhost_vdpa_can_stop (v)) + features |=BIT_ULL (VHOST_BACKEND_F_STOP );if (copy_to_user (featurep, &features,sizeof (features))) r = -EFAULT ;break ;include/uapi/linux/vhost_types.h +2
-1@@ -161,5 +161,7 @@ struct vhost_vdpa_iova_range {* message */ #define VHOST_BACKEND_F_IOTLB_ASID 0x3 +/* Stop device from processing virtqueue buffers */ #define +VHOST_BACKEND_F_STOP 0x4#endif --2.27.0
Re: [PATCH v3 2/4] vhost-vdpa: introduce STOP backend feature bit
Quoted 30 lines · Eugenio Perez Martin
Quoted 29 lines · Gautam
[AMD Official Use Only - General]
-----Original Message-----
From: Eugenio Pérez <[email protected]>
Sent: Wednesday, May 25, 2022 4:29 PM
To: Michael S. Tsirkin <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; Jason Wang <[email protected]>
Cc: Zhu Lingshan <[email protected]>; [email protected]; Stefano Garzarella <[email protected]>; [email protected]; Eli Cohen <[email protected]>; Dan Carpenter <[email protected]>; Parav Pandit <[email protected]>; Wu Zongyong <[email protected]>; [email protected]; Christophe JAILLET <[email protected]>; Xie Yongji <[email protected]>; Dawar, Gautam <[email protected]>; [email protected]; [email protected]; [email protected]; Longpeng <[email protected]>; [email protected]; Kamde, Tanuj <[email protected]>; Si-Wei Liu <[email protected]>; [email protected]; [email protected]; Zhang Min <[email protected]>; [email protected]
Subject: [PATCH v3 2/4] vhost-vdpa: introduce STOP backend feature bit[CAUTION: External Email]
Userland knows if it can stop the device or not by checking this feature bit.
It's only offered if the vdpa driver backend implements the
stop()operation callback, and try to set it if the backend does not offer that callback is an error.Signed-off-by Eugenio Pérez <[email protected]>--- drivers/vhost/vdpa.c | 16 +++++++++++++++- include/uapi/linux/vhost_types.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-)drivers/vhost/vdpa.c +0
-0@@ -347,6 +347,14 @@ static long vhost_vdpa_set_config(struct vhost_vdpa *v,return 0 ; }
Quoted 10 lines
Quoted 6 lines
drivers/vhost/vdpa.c +5
-0+static bool vhost_vdpa_can_stop (const struct vhost_vdpa *v) { +struct vdpa_device *vdpa = v->vdpa; +const struct vdpa_config_ops *ops = vdpa->config; + +return ops->stop;[GD>>] Would it be better to explicitly return a bool to match the return type?
I'm not sure about the kernel code style regarding that casting. Maybe it's better to return !!ops->stop here. The macros likely and unlikely do that.
IIUC ops->stop is a function pointer, so what about
return ops->stop != NULL;
Thanks,
Stefano
Eugenio Perez Martin
maintainerRe: [PATCH v3 2/4] vhost-vdpa: introduce STOP backend feature bit
Quoted 43 lines · Stefano Garzarella
Quoted 30 lines · Eugenio Perez Martin
Quoted 29 lines · Gautam
[AMD Official Use Only - General]
-----Original Message-----
From: Eugenio Pérez <[email protected]>
Sent: Wednesday, May 25, 2022 4:29 PM
To: Michael S. Tsirkin <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; Jason Wang <[email protected]>
Cc: Zhu Lingshan <[email protected]>; [email protected]; Stefano Garzarella <[email protected]>; [email protected]; Eli Cohen <[email protected]>; Dan Carpenter <[email protected]>; Parav Pandit <[email protected]>; Wu Zongyong <[email protected]>; [email protected]; Christophe JAILLET <[email protected]>; Xie Yongji <[email protected]>; Dawar, Gautam <[email protected]>; [email protected]; [email protected]; [email protected]; Longpeng <[email protected]>; [email protected]; Kamde, Tanuj <[email protected]>; Si-Wei Liu <[email protected]>; [email protected]; [email protected]; Zhang Min <[email protected]>; [email protected]
Subject: [PATCH v3 2/4] vhost-vdpa: introduce STOP backend feature bit[CAUTION: External Email]
Userland knows if it can stop the device or not by checking this feature bit.
It's only offered if the vdpa driver backend implements the
stop()operation callback, and try to set it if the backend does not offer that callback is an error.Signed-off-by Eugenio Pérez <[email protected]>--- drivers/vhost/vdpa.c | 16 +++++++++++++++- include/uapi/linux/vhost_types.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-)drivers/vhost/vdpa.c +0
-0@@ -347,6 +347,14 @@ static long vhost_vdpa_set_config(struct vhost_vdpa *v,return 0 ; }Quoted 10 lines
Quoted 6 lines
drivers/vhost/vdpa.c +5
-0+static bool vhost_vdpa_can_stop (const struct vhost_vdpa *v) { +struct vdpa_device *vdpa = v->vdpa; +const struct vdpa_config_ops *ops = vdpa->config; + +return ops->stop;[GD>>] Would it be better to explicitly return a bool to match the return type?
I'm not sure about the kernel code style regarding that casting. Maybe it's better to return !!ops->stop here. The macros likely and unlikely do that.
Quoted 4 lines
IIUC
ops->stopis a function pointer, so what aboutreturn ops->stop != NULL;
I'm ok with any method proposed. Both three ways can be found in the kernel so I think they are all valid (although the double negation is from bool to integer in (0,1) set actually).
Maybe Jason or Michael (as maintainers) can state the preferred method here.
Generally I prefer explicit conversions, both signed and from/to different types length. But I find conversion to bool to be simple enough to be an exception to the rule. Same with void *. Let's see!
Sending v4 without this changed, waiting for answers.
Thanks!
Re: [PATCH v3 2/4] vhost-vdpa: introduce STOP backend feature bit
Quoted 13 lines · Eugenio Perez Martin
Quoted 13 lines
Quoted 10 lines
Quoted 6 lines
drivers/vhost/vdpa.c +5
-0+static bool vhost_vdpa_can_stop (const struct vhost_vdpa *v) { +struct vdpa_device *vdpa = v->vdpa; +const struct vdpa_config_ops *ops = vdpa->config; + +return ops->stop;[GD>>] Would it be better to explicitly return a bool to match the return type?
I'm not sure about the kernel code style regarding that casting. Maybe it's better to return !!ops->stop here. The macros likely and unlikely do that.
IIUC
ops->stopis a function pointer, so what about
Quoted 8 lines
Quoted 2 lines
return ops->stop != NULL;I'm ok with any method proposed. Both three ways can be found in the kernel so I think they are all valid (although the double negation is from bool to integer in (0,1) set actually).
Maybe Jason or Michael (as maintainers) can state the preferred method here.
Always just do whatever the person who responded feels like because they're likely the person who cares the most. ;)
I don't think there are any static analysis tools which will complain about this. Smatch will complain if you return a negative literal. It feels like returning any literal that isn't 1 or 0 should trigger a warning... I've written that and will check it out tonight.
Really anything negative should trigger a warning. See new Smatch stuff below.
regards,
dan carpenter
================ TEST CASE =========================
int x;_Bool one(int *p)
{
if (p)
x = -2;
return x;
}_Bool two(int *p)
{
return -4; // returning 2 triggers a warning now
}
=============== OUTPUT =============================
test.c:10 one() warn: potential negative cast to bool 'x' test.c:14 two() warn: signedness bug returning '(-4)' test.c:14 two() warn: '(-4)' is not bool
=============== CODE ===============================
#include "smatch.h"
#include "smatch_extra.h"
#include "smatch_slist.h"
static int my_id;
static void match_literals(struct expression *ret_value)
{
struct symbol *type;
sval_t sval;
type = cur_func_return_type();
if (!type || sval_type_max(type).value != 1)
return;
if (!get_implied_value(ret_value, &sval))
return;
if (sval.value == 0 || sval.value == 1)
return;
sm_warning("'%s' is not bool", sval_to_str(sval));
}static void match_any_negative(struct expression *ret_value)
{
struct symbol *type;
struct sm_state *extra, *sm;
sval_t sval;
char *name;
type = cur_func_return_type();
if (!type || sval_type_max(type).value != 1)
return;
extra = get_extra_sm_state(ret_value);
if (!extra)
return;
FOR_EACH_PTR(extra->possible, sm) {
if (estate_get_single_value(sm->state, &sval) &&
sval_is_negative(sval)) {
name = expr_to_str(ret_value);
sm_warning("potential negative cast to bool '%s'", name);
free_string(name);
return;
}
} END_FOR_EACH_PTR(sm);
}void check_bool_return(int id)
{
my_id = id;
add_hook(&match_literals, RETURN_HOOK);
add_hook(&match_any_negative, RETURN_HOOK);
}_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Eugenio Perez Martin
maintainerRe: [PATCH v3 2/4] vhost-vdpa: introduce STOP backend feature bit
Quoted 18 lines · Dan Carpenter
Quoted 16 lines · Eugenio Perez Martin
Quoted 15 lines
Quoted 10 lines
Quoted 6 lines
drivers/vhost/vdpa.c +5
-0+static bool vhost_vdpa_can_stop (const struct vhost_vdpa *v) { +struct vdpa_device *vdpa = v->vdpa; +const struct vdpa_config_ops *ops = vdpa->config; + +return ops->stop;[GD>>] Would it be better to explicitly return a bool to match the return type?
I'm not sure about the kernel code style regarding that casting. Maybe it's better to return !!ops->stop here. The macros likely and unlikely do that.
IIUC
ops->stopis a function pointer, so what aboutreturn ops->stop != NULL;
Quoted 9 lines
Quoted 5 lines
I'm ok with any method proposed. Both three ways can be found in the kernel so I think they are all valid (although the double negation is from bool to integer in (0,1) set actually).
Maybe Jason or Michael (as maintainers) can state the preferred method here.
Always just do whatever the person who responded feels like because they're likely the person who cares the most. ;)
This is interesting and I think it's good advice :). I'm fine with whatever we chose, I just wanted to "break the tie" between the three.
Quoted 2 lines
I don't think there are any static analysis tools which will complain about this. Smatch will complain if you return a negative literal.
Maybe a negative literal is a bad code signal, yes.
Quoted 3 lines
It feels like returning any literal that isn't 1 or 0 should trigger a warning... I've written that and will check it out tonight.
I'm not sure this should be so strict, or "literal" does not include pointers?
As an experiment, can Smatch be used to count how many times a returned pointer is converted to int / bool before returning vs not converted?
I find Smatch interesting, especially when switching between projects frequently. Does it support changing the code like clang-format? To offload cognitive load to tools is usually good :).
Thanks!
Quoted 85 lines
Really anything negative should trigger a warning. See new Smatch stuff below.
regards,
dan carpenter================ TEST CASE =========================
int x;
_Boolone(int *p){ if (p) x = -2; return x; }
_Booltwo(int *p)
{
return -4; // returning 2 triggers a warning now
}=============== OUTPUT =============================
test.c:10
one()warn: potential negative cast to bool 'x' test.c:14two()warn: signedness bug returning '(-4)' test.c:14two()warn: '(-4)' is not bool=============== CODE ===============================
#include "
smatch.h"
#include "smatch_extra.h"
#include "smatch_slist.h"static int
my_id;static void
match_literals(struct expression *ret_value){ struct symbol *type; sval_t sval; type = cur_func_return_type(); if (!type || sval_type_max(type).value != 1) return; if (!get_implied_value(ret_value, &sval)) return; if (sval.value == 0 || sval.value == 1) return; sm_warning("'%s' is not bool", sval_to_str(sval)); }static void
match_any_negative(struct expression *ret_value){ struct symbol *type; struct sm_state *extra, *sm; sval_t sval; char *name; type = cur_func_return_type(); if (!type || sval_type_max(type).value != 1) return; extra = get_extra_sm_state(ret_value); if (!extra) return; FOR_EACH_PTR(extra->possible, sm) { if (estate_get_single_value(sm->state, &sval) && sval_is_negative(sval)) { name = expr_to_str(ret_value); sm_warning("potential negative cast to bool '%s'", name); free_string(name); return; } } END_FOR_EACH_PTR(sm); }void
check_bool_return(int id){ my_id = id; add_hook(&match_literals, RETURN_HOOK); add_hook(&match_any_negative, RETURN_HOOK); }
Re: [PATCH v3 2/4] vhost-vdpa: introduce STOP backend feature bit
Quoted 6 lines · Eugenio Perez Martin
Quoted 3 lines
It feels like returning any literal that isn't 1 or 0 should trigger a warning... I've written that and will check it out tonight.
I'm not sure this should be so strict, or "literal" does not include pointers?
What I mean in exact terms, is that if you're returning a known value and the function returns bool then the known value should be 0 or 1. Don't "return 3;". This new warning will complain if you return a known pointer as in "return &a;". It won't complain if you return an unknown pointer "return p;".
Quoted 3 lines
As an experiment, can Smatch be used to count how many times a returned pointer is converted to int / bool before returning vs not converted?
I'm not super excited to write that code... :/
Quoted 4 lines
I find Smatch interesting, especially when switching between projects frequently. Does it support changing the code like clang-format? To offload cognitive load to tools is usually good :).
No. Coccinelle does that really well though.
regards,
dan carpenter
Eugenio Perez Martin
maintainerRe: [PATCH v3 2/4] vhost-vdpa: introduce STOP backend feature bit
Quoted 6 lines · Dan Carpenter
Quoted 4 lines · Eugenio Perez Martin
Quoted 3 lines
It feels like returning any literal that isn't 1 or 0 should trigger a warning... I've written that and will check it out tonight.
Quoted 9 lines
Quoted 2 lines
I'm not sure this should be so strict, or "literal" does not include pointers?
What I mean in exact terms, is that if you're returning a known value and the function returns bool then the known value should be 0 or 1. Don't "return 3;". This new warning will complain if you return a known pointer as in "return &a;". It won't complain if you return an unknown pointer "return p;".
Ok, thanks for the clarification.
Quoted 6 lines
Quoted 3 lines
As an experiment, can Smatch be used to count how many times a returned pointer is converted to int / bool before returning vs not converted?
I'm not super excited to write that code... :/
Sure, I understand. I meant if it was possible or if that is too far beyond its scope.
Quoted 7 lines
Quoted 4 lines
I find Smatch interesting, especially when switching between projects frequently. Does it support changing the code like clang-format? To offload cognitive load to tools is usually good :).
No. Coccinelle does that really well though.
Understood.
Thanks!
Quoted 3 lines
regards,
dan carpenter
Re: [PATCH v3 2/4] vhost-vdpa: introduce STOP backend feature bit
Quoted 23 lines · Eugenio Perez Martin
Quoted 6 lines · Dan Carpenter
Quoted 4 lines · Eugenio Perez Martin
Quoted 3 lines
It feels like returning any literal that isn't 1 or 0 should trigger a warning... I've written that and will check it out tonight.
Quoted 9 lines
Quoted 2 lines
I'm not sure this should be so strict, or "literal" does not include pointers?
What I mean in exact terms, is that if you're returning a known value and the function returns bool then the known value should be 0 or 1. Don't "return 3;". This new warning will complain if you return a known pointer as in "return &a;". It won't complain if you return an unknown pointer "return p;".
Ok, thanks for the clarification.
Quoted 4 lines
Quoted 3 lines
As an experiment, can Smatch be used to count how many times a returned pointer is converted to int / bool before returning vs not converted?
Quoted 5 lines
Quoted 2 lines
I'm not super excited to write that code... :/
Sure, I understand. I meant if it was possible or if that is too far beyond its scope.
To be honest, I misread what you were asking. GCC won't let you return a pointer with an implied cast to int. It has to be explicit. So there are zero of those. It's not hard to look for pointers with an implied cast to bool.
static void match_pointer(struct expression *ret_value)
{
struct symbol *type;
char *name;
type = cur_func_return_type();
if (!type || sval_type_max(type).value != 1)
return;
if (!is_pointer(ret_value))
return;
name = expr_to_str(ret_value);
sm_msg("'%s' return pointer cast to bool", name);
free_string(name);
}regards,
dan carpenter
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
RE: [PATCH v3 2/4] vhost-vdpa: introduce STOP backend feature bit
[AMD Official Use Only - General]
IMHO replacing "return ops->stop;" with "return ops->stop?true:false;" should be good enough.
Quoted 23 lines · Eugenio Perez Martin
Quoted 6 lines · Dan Carpenter
Quoted 4 lines · Eugenio Perez Martin
Quoted 3 lines
It feels like returning any literal that isn't 1 or 0 should trigger a warning... I've written that and will check it out tonight.
Quoted 9 lines
Quoted 2 lines
I'm not sure this should be so strict, or "literal" does not include pointers?
What I mean in exact terms, is that if you're returning a known value and the function returns bool then the known value should be 0 or 1. Don't "return 3;". This new warning will complain if you return a known pointer as in "return &a;". It won't complain if you return an unknown pointer "return p;".
Ok, thanks for the clarification.
Quoted 4 lines
Quoted 3 lines
As an experiment, can Smatch be used to count how many times a returned pointer is converted to int / bool before returning vs not converted?
Quoted 5 lines
Quoted 2 lines
I'm not super excited to write that code... :/
Sure, I understand. I meant if it was possible or if that is too far beyond its scope.
To be honest, I misread what you were asking. GCC won't let you return a pointer with an implied cast to int. It has to be explicit. So there are zero of those. It's not hard to look for pointers with an implied cast to bool.
static void match_pointer(struct expression *ret_value) {
struct symbol *type;
char *name;
type = cur_func_return_type();
if (!type || sval_type_max(type).value != 1)
return;
if (!is_pointer(ret_value))
return;
name = expr_to_str(ret_value);
sm_msg("'%s' return pointer cast to bool", name);
free_string(name);
}regards,
dan carpenter
Re: [PATCH v3 2/4] vhost-vdpa: introduce STOP backend feature bit
In reply to Dan CarpenterQuoted 16 lines · Dan Carpenter
static void
match_pointer(struct expression *ret_value){ struct symbol *type; char *name; type = cur_func_return_type(); if (!type || sval_type_max(type).value != 1) return; if (!is_pointer(ret_value)) return; name = expr_to_str(ret_value); sm_msg("'%s' return pointer cast to bool", name); free_string(name); }
I found a bug in Smatch with this check. With the Smatch bug fixed then there is only only place which does a legitimate implied pointer to bool cast. A different function returns NULL on error instead of false.
drivers/gpu/drm/i915/display/intel_dmc.c:249 intel_dmc_has_payload() 'i915->dmc.dmc_info[0]->payload' return pointer cast to bool drivers/net/wireless/rndis_wlan.c:1980 rndis_bss_info_update() '(0)' return pointer cast to bool drivers/net/wireless/rndis_wlan.c:1989 rndis_bss_info_update() '(0)' return pointer cast to bool drivers/net/wireless/rndis_wlan.c:1995 rndis_bss_info_update() '(0)' return pointer cast to bool
regards,
dan carpenter
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v3 2/4] vhost-vdpa: introduce STOP backend feature bit
Quoted 18 lines · Dan Carpenter
Quoted 16 lines · Dan Carpenter
static void
match_pointer(struct expression *ret_value){ struct symbol *type; char *name; type = cur_func_return_type(); if (!type || sval_type_max(type).value != 1) return; if (!is_pointer(ret_value)) return; name = expr_to_str(ret_value); sm_msg("'%s' return pointer cast to bool", name); free_string(name); }
Quoted 8 lines
I found a bug in Smatch with this check. With the Smatch bug fixed then there is only only place which does a legitimate implied pointer to bool cast. A different function returns NULL on error instead of false.
drivers/gpu/drm/i915/display/intel_dmc.c:249intel_dmc_has_payload()'i915->dmc.dmc_info[0]->payload' return pointer cast to booldrivers/net/wireless/rndis_wlan.c:1980rndis_bss_info_update()'(0)' return pointer cast to booldrivers/net/wireless/rndis_wlan.c:1989rndis_bss_info_update()'(0)' return pointer cast to booldrivers/net/wireless/rndis_wlan.c:1995rndis_bss_info_update()'(0)' return pointer cast to bool
Hm... I found another. I'm not sure why it wasn't showing up before.
lib/assoc_array.c:941 assoc_array_insert_mid_shortcut() 'edit' return pointer cast to bool
That's weird. I will re-run the test.
regards,
dan carpenter
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Eugenio Pérez
maintainerPATCH v3 3/4 vhost-vdpa: uAPI to stop the device
In reply to Eugenio PérezThe ioctl adds support for stop the device from userspace.
--- drivers/vhost/vdpa.c | 18 ++++++++++++++++++ include/uapi/linux/vhost.h | 14 ++++++++++++++ 2 files changed, 32 insertions(+)
drivers/vhost/vdpa.c +18 -0
@@ -478,6 +478,21 @@ static long vhost_vdpa_get_vqs_count(struct vhost_vdpa *v, u32 __user *argp)return 0 ; } +static long vhost_vdpa_stop (struct vhost_vdpa *v,u32 __user *argp) +{ +struct vdpa_device *vdpa = v->vdpa; +const struct vdpa_config_ops *ops = vdpa->config; +int stop; + +if (!ops->stop) +return -EOPNOTSUPP ; + +if (copy_from_user (&stop, argp,sizeof (stop))) +return -EFAULT ; + +return ops->stop (vdpa, stop); +} +static long vhost_vdpa_vring_ioctl (struct vhost_vdpa *v,unsigned int cmd,void __user *argp) {
@@ -650,6 +665,9 @@ static long vhost_vdpa_unlocked_ioctl(struct file *filep,case VHOST_VDPA_GET_VQS_COUNT : r =vhost_vdpa_get_vqs_count (v, argp);break ; +case VHOST_STOP : + r =vhost_vdpa_stop (v, argp); +break ;default : r =vhost_dev_ioctl (&v->vdev, cmd, argp);if (r == -ENOIOCTLCMD )
include/uapi/linux/vhost.h +14 -0
@@ -171,4 +171,18 @@#define VHOST_VDPA_SET_GROUP_ASID _IOW(VHOST_VIRTIO, 0x7C, \ struct vhost_vring_state) +/* Stop or resume a device so it does not process virtqueue requests anymore +* +* After the return of ioctl with stop != 0, the device must finish any +* pending operations like in flight requests. It must also preserve all +* the necessary state (the virtqueue vring base plus the possible device +* specific states) that is required for restoring in the future. The +* device must not change its configuration after that point. +* +* After the return of ioctl with stop == 0, the device can continue +* processing buffers as long as typical conditions are met (vq is enabled, +* DRIVER_OK status bit is enabled, etc). +*/ +#define VHOST_VDPA_STOP _IOW(VHOST_VIRTIO, 0x7D, int) +#endif
Signature · 1 line
2.27.0
kernel test robot
build botRe: [PATCH v3 3/4] vhost-vdpa: uAPI to stop the device
Thank you for the patch! Yet something to improve:
Hi "Eugenio,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on mst-vhost/linux-next]
[also build test ERROR on next-20220525]
[cannot apply to horms-ipvs/master linux/master linus/master v5.18] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Eugenio-P-rez/Implement-vdpasim-stop-operation/20220525-190143 base: https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git linux-next config: x86_64-randconfig-a013 (https://download.01.org/0day-ci/archive/20220525/[email protected]/config) compiler: gcc-11 (Debian 11.3.0-1) 11.3.0 reproduce (this is a W=1 build): # https://github.com/intel-lab-lkp/linux/commit/515f6b6d2a0164df801ddbe61e1cb1ae4e763873 git remote add linux-review https://github.com/intel-lab-lkp/linux git fetch --no-tags linux-review Eugenio-P-rez/Implement-vdpasim-stop-operation/20220525-190143 git checkout 515f6b6d2a0164df801ddbe61e1cb1ae4e763873 # save the config file mkdir build_dir && cp config build_dir/.config make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash
If you fix the issue, kindly add following tag where applicable
All errors (new ones prefixed by >>):
drivers/vhost/vdpa.c: In function 'vhost_vdpa_unlocked_ioctl':
>> drivers/vhost/vdpa.c:668:14: error: 'VHOST_STOP' undeclared (first use in this function)
668 | case VHOST_STOP:
| ^~~~~~~~~~
drivers/vhost/vdpa.c:668:14: note: each undeclared identifier is reported only once for each function it appears in
vim +/VHOST_STOP +668 drivers/vhost/vdpa.c
587
588 static long vhost_vdpa_unlocked_ioctl(struct file *filep,
589 unsigned int cmd, unsigned long arg)
590 {
591 struct vhost_vdpa *v = filep->private_data;
592 struct vhost_dev *d = &v->vdev;
593 void __user *argp = (void __user *)arg;
594 u64 __user *featurep = argp;
595 u64 features;
596 long r = 0;
597
598 if (cmd == VHOST_SET_BACKEND_FEATURES) {
599 if (copy_from_user(&features, featurep, sizeof(features)))
600 return -EFAULT;
601 if (features & ~(VHOST_VDPA_BACKEND_FEATURES |
602 BIT_ULL(VHOST_BACKEND_F_STOP)))
603 return -EOPNOTSUPP;
604 if ((features & BIT_ULL(VHOST_BACKEND_F_STOP)) &&
605 !vhost_vdpa_can_stop(v))
606 return -EOPNOTSUPP;
607 vhost_set_backend_features(&v->vdev, features);
608 return 0;
609 }
610
611 mutex_lock(&d->mutex);
612
613 switch (cmd) {
614 case VHOST_VDPA_GET_DEVICE_ID:
615 r = vhost_vdpa_get_device_id(v, argp);
616 break;
617 case VHOST_VDPA_GET_STATUS:
618 r = vhost_vdpa_get_status(v, argp);
619 break;
620 case VHOST_VDPA_SET_STATUS:
621 r = vhost_vdpa_set_status(v, argp);
622 break;
623 case VHOST_VDPA_GET_CONFIG:
624 r = vhost_vdpa_get_config(v, argp);
625 break;
626 case VHOST_VDPA_SET_CONFIG:
627 r = vhost_vdpa_set_config(v, argp);
628 break;
629 case VHOST_GET_FEATURES:
630 r = vhost_vdpa_get_features(v, argp);
631 break;
632 case VHOST_SET_FEATURES:
633 r = vhost_vdpa_set_features(v, argp);
634 break;
635 case VHOST_VDPA_GET_VRING_NUM:
636 r = vhost_vdpa_get_vring_num(v, argp);
637 break;
638 case VHOST_VDPA_GET_GROUP_NUM:
639 r = copy_to_user(argp, &v->vdpa->ngroups,
640 sizeof(v->vdpa->ngroups));
641 break;
642 case VHOST_VDPA_GET_AS_NUM:
643 r = copy_to_user(argp, &v->vdpa->nas, sizeof(v->vdpa->nas));
644 break;
645 case VHOST_SET_LOG_BASE:
646 case VHOST_SET_LOG_FD:
647 r = -ENOIOCTLCMD;
648 break;
649 case VHOST_VDPA_SET_CONFIG_CALL:
650 r = vhost_vdpa_set_config_call(v, argp);
651 break;
652 case VHOST_GET_BACKEND_FEATURES:
653 features = VHOST_VDPA_BACKEND_FEATURES;
654 if (vhost_vdpa_can_stop(v))
655 features |= BIT_ULL(VHOST_BACKEND_F_STOP);
656 if (copy_to_user(featurep, &features, sizeof(features)))
657 r = -EFAULT;
658 break;
659 case VHOST_VDPA_GET_IOVA_RANGE:
660 r = vhost_vdpa_get_iova_range(v, argp);
661 break;
662 case VHOST_VDPA_GET_CONFIG_SIZE:
663 r = vhost_vdpa_get_config_size(v, argp);
664 break;
665 case VHOST_VDPA_GET_VQS_COUNT:
666 r = vhost_vdpa_get_vqs_count(v, argp);
667 break;
> 668 case VHOST_STOP:
669 r = vhost_vdpa_stop(v, argp);
670 break;
671 default:
672 r = vhost_dev_ioctl(&v->vdev, cmd, argp);
673 if (r == -ENOIOCTLCMD)
674 r = vhost_vdpa_vring_ioctl(v, cmd, argp);
675 break;
676 }
677
678 mutex_unlock(&d->mutex);
679 return r;
680 }
681
Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
kernel test robot
build botRe: [PATCH v3 3/4] vhost-vdpa: uAPI to stop the device
In reply to Eugenio PérezThank you for the patch! Yet something to improve:
Hi "Eugenio,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on mst-vhost/linux-next]
[also build test ERROR on next-20220525]
[cannot apply to horms-ipvs/master linux/master linus/master v5.18] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Eugenio-P-rez/Implement-vdpasim-stop-operation/20220525-190143 base: https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git linux-next config: x86_64-randconfig-a005 (https://download.01.org/0day-ci/archive/20220526/[email protected]/config) compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project d52a6e75b0c402c7f3b42a2b1b2873f151220947)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/515f6b6d2a0164df801ddbe61e1cb1ae4e763873
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Eugenio-P-rez/Implement-vdpasim-stop-operation/20220525-190143 git checkout 515f6b6d2a0164df801ddbe61e1cb1ae4e763873
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/vhost/
If you fix the issue, kindly add following tag where applicable
All errors (new ones prefixed by >>):
>> drivers/vhost/vdpa.c:668:7: error: use of undeclared identifier 'VHOST_STOP'
case VHOST_STOP:
^1 error generated.
vim +/VHOST_STOP +668 drivers/vhost/vdpa.c
587
588 static long vhost_vdpa_unlocked_ioctl(struct file *filep,
589 unsigned int cmd, unsigned long arg)
590 {
591 struct vhost_vdpa *v = filep->private_data;
592 struct vhost_dev *d = &v->vdev;
593 void __user *argp = (void __user *)arg;
594 u64 __user *featurep = argp;
595 u64 features;
596 long r = 0;
597
598 if (cmd == VHOST_SET_BACKEND_FEATURES) {
599 if (copy_from_user(&features, featurep, sizeof(features)))
600 return -EFAULT;
601 if (features & ~(VHOST_VDPA_BACKEND_FEATURES |
602 BIT_ULL(VHOST_BACKEND_F_STOP)))
603 return -EOPNOTSUPP;
604 if ((features & BIT_ULL(VHOST_BACKEND_F_STOP)) &&
605 !vhost_vdpa_can_stop(v))
606 return -EOPNOTSUPP;
607 vhost_set_backend_features(&v->vdev, features);
608 return 0;
609 }
610
611 mutex_lock(&d->mutex);
612
613 switch (cmd) {
614 case VHOST_VDPA_GET_DEVICE_ID:
615 r = vhost_vdpa_get_device_id(v, argp);
616 break;
617 case VHOST_VDPA_GET_STATUS:
618 r = vhost_vdpa_get_status(v, argp);
619 break;
620 case VHOST_VDPA_SET_STATUS:
621 r = vhost_vdpa_set_status(v, argp);
622 break;
623 case VHOST_VDPA_GET_CONFIG:
624 r = vhost_vdpa_get_config(v, argp);
625 break;
626 case VHOST_VDPA_SET_CONFIG:
627 r = vhost_vdpa_set_config(v, argp);
628 break;
629 case VHOST_GET_FEATURES:
630 r = vhost_vdpa_get_features(v, argp);
631 break;
632 case VHOST_SET_FEATURES:
633 r = vhost_vdpa_set_features(v, argp);
634 break;
635 case VHOST_VDPA_GET_VRING_NUM:
636 r = vhost_vdpa_get_vring_num(v, argp);
637 break;
638 case VHOST_VDPA_GET_GROUP_NUM:
639 r = copy_to_user(argp, &v->vdpa->ngroups,
640 sizeof(v->vdpa->ngroups));
641 break;
642 case VHOST_VDPA_GET_AS_NUM:
643 r = copy_to_user(argp, &v->vdpa->nas, sizeof(v->vdpa->nas));
644 break;
645 case VHOST_SET_LOG_BASE:
646 case VHOST_SET_LOG_FD:
647 r = -ENOIOCTLCMD;
648 break;
649 case VHOST_VDPA_SET_CONFIG_CALL:
650 r = vhost_vdpa_set_config_call(v, argp);
651 break;
652 case VHOST_GET_BACKEND_FEATURES:
653 features = VHOST_VDPA_BACKEND_FEATURES;
654 if (vhost_vdpa_can_stop(v))
655 features |= BIT_ULL(VHOST_BACKEND_F_STOP);
656 if (copy_to_user(featurep, &features, sizeof(features)))
657 r = -EFAULT;
658 break;
659 case VHOST_VDPA_GET_IOVA_RANGE:
660 r = vhost_vdpa_get_iova_range(v, argp);
661 break;
662 case VHOST_VDPA_GET_CONFIG_SIZE:
663 r = vhost_vdpa_get_config_size(v, argp);
664 break;
665 case VHOST_VDPA_GET_VQS_COUNT:
666 r = vhost_vdpa_get_vqs_count(v, argp);
667 break;
> 668 case VHOST_STOP:
669 r = vhost_vdpa_stop(v, argp);
670 break;
671 default:
672 r = vhost_dev_ioctl(&v->vdev, cmd, argp);
673 if (r == -ENOIOCTLCMD)
674 r = vhost_vdpa_vring_ioctl(v, cmd, argp);
675 break;
676 }
677
678 mutex_unlock(&d->mutex);
679 return r;
680 }
681
Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
Eugenio Pérez
maintainerPATCH v3 4/4 vdpa_sim: Implement stop vdpa op
In reply to Eugenio PérezImplement stop operation for vdpa_sim devices, so vhost-vdpa will offer that backend feature and userspace can effectively stop the device.
This is a must before get virtqueue indexes (base) for live migration, since the device could modify them after userland gets them. There are individual ways to perform that action for some devices (VHOST_NET_SET_BACKEND, VHOST_VSOCK_SET_RUNNING, ...) but there was no way to perform it for any vhost device (and, in particular, vhost-vdpa).
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 21 +++++++++++++++++++++ drivers/vdpa/vdpa_sim/vdpa_sim.h | 1 + drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 3 +++ drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 3 +++ 4 files changed, 28 insertions(+)
drivers/vdpa/vdpa_sim/vdpa_sim.c +21 -0
@@ -107,6 +107,7 @@ static void vdpasim_do_reset(struct vdpasim *vdpasim)for (i =0 ; i < vdpasim->dev_attr.nas; i++)vhost_iotlb_reset (&vdpasim->iommu[i]); + vdpasim->running = true;spin_unlock (&vdpasim->iommu_lock); vdpasim->features =0 ;
@@ -505,6 +506,24 @@ static int vdpasim_reset(struct vdpa_device *vdpa)return 0 ; } +static int vdpasim_stop (struct vdpa_device *vdpa,bool stop) +{ +struct vdpasim *vdpasim =vdpa_to_sim (vdpa); +int i; + +spin_lock (&vdpasim->lock); + vdpasim->running = !stop; +if (vdpasim->running) { +/* Check for missed buffers */ +for (i =0 ; i < vdpasim->dev_attr.nvqs; ++i) +vdpasim_kick_vq (vdpa, i); + + } +spin_unlock (&vdpasim->lock); + +return 0 ; +} +static size_t vdpasim_get_config_size (struct vdpa_device *vdpa) {struct vdpasim *vdpasim =vdpa_to_sim (vdpa);
@@ -694,6 +713,7 @@ static const struct vdpa_config_ops vdpasim_config_ops = { .get_status = vdpasim_get_status, .set_status = vdpasim_set_status, .reset = vdpasim_reset, + .stop = vdpasim_stop, .get_config_size = vdpasim_get_config_size, .get_config = vdpasim_get_config, .set_config = vdpasim_set_config,
@@ -726,6 +746,7 @@ static const struct vdpa_config_ops vdpasim_batch_config_ops = { .get_status = vdpasim_get_status, .set_status = vdpasim_set_status, .reset = vdpasim_reset, + .stop = vdpasim_stop, .get_config_size = vdpasim_get_config_size, .get_config = vdpasim_get_config, .set_config = vdpasim_set_config,
drivers/vdpa/vdpa_sim/vdpa_sim.h +1 -0
@@ -66,6 +66,7 @@ struct vdpasim {u32 generation;u64 features;u32 groups; +bool running;/* spinlock to synchronize iommu table */ spinlock_t iommu_lock; };
drivers/vdpa/vdpa_sim/vdpa_sim_blk.c +3 -0
@@ -204,6 +204,9 @@ static void vdpasim_blk_work(struct work_struct *work)if (!(vdpasim->status &VIRTIO_CONFIG_S_DRIVER_OK )) goto out; +if (!vdpasim->running) + goto out; +for (i =0 ; i <VDPASIM_BLK_VQ_NUM ; i++) {struct vdpasim_virtqueue *vq = &vdpasim->vqs[i];
drivers/vdpa/vdpa_sim/vdpa_sim_net.c +3 -0
@@ -154,6 +154,9 @@ static void vdpasim_net_work(struct work_struct *work)spin_lock (&vdpasim->lock); +if (!vdpasim->running) + goto out; +if (!(vdpasim->status &VIRTIO_CONFIG_S_DRIVER_OK )) goto out;
Signature · 1 line
2.27.0