From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Mon, 7 Nov 2022 07:16:58 -0500 From: "Michael S. Tsirkin" Message-ID: <20221107071516-mutt-send-email-mst@kernel.org> References: <20221107121407.1010913-1-alex.bennee@linaro.org> MIME-Version: 1.0 In-Reply-To: <20221107121407.1010913-1-alex.bennee@linaro.org> Content-Type: text/plain; charset="windows-1252" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Subject: Re: [Virtio-fs] [RFC PATCH] hw/virtio: introduce virtio_device_should_start List-Id: Development discussions about virtio-fs List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex =?iso-8859-1?Q?Benn=E9e?= Cc: qemu-devel@nongnu.org, Raphael Norwitz , Kevin Wolf , Hanna Reitz , "Dr. David Alan Gilbert" , Stefan Hajnoczi , Viresh Kumar , Mathieu Poirier , "open list:Block layer core" , "open list:virtiofs" On Mon, Nov 07, 2022 at 12:14:07PM +0000, Alex Benn=E9e wrote: > The previous fix to virtio_device_started revealed a problem in its > use by both the core and the device code. The core code should be able > to handle the device "starting" while the VM isn't running to handle > the restoration of migration state. To solve this duel use introduce a > new helper for use by the vhost-user backends who all use it to feed a > should_start variable. >=20 > We can also pick up a change vhost_user_blk_set_status while we are at > it which follows the same pattern. >=20 > Fixes: 9f6bcfd99f (hw/virtio: move vm_running check to virtio_device_star= ted) > Signed-off-by: Alex Benn=E9e > Cc: "Michael S. Tsirkin" Hi Alex, did you actually check this under gitlab CI? > --- > include/hw/virtio/virtio.h | 18 ++++++++++++++++++ > hw/block/vhost-user-blk.c | 6 +----- > hw/virtio/vhost-user-fs.c | 2 +- > hw/virtio/vhost-user-gpio.c | 2 +- > hw/virtio/vhost-user-i2c.c | 2 +- > hw/virtio/vhost-user-rng.c | 2 +- > hw/virtio/vhost-user-vsock.c | 2 +- > hw/virtio/vhost-vsock.c | 2 +- > 8 files changed, 25 insertions(+), 11 deletions(-) >=20 > diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h > index f41b4a7e64..3191c618f3 100644 > --- a/include/hw/virtio/virtio.h > +++ b/include/hw/virtio/virtio.h > @@ -389,6 +389,24 @@ static inline bool virtio_device_started(VirtIODevic= e *vdev, uint8_t status) > return vdev->started; > } > =20 > + return status & VIRTIO_CONFIG_S_DRIVER_OK; > +} > + > +/** > + * virtio_device_should_start() - check if device startable > + * @vdev - the VirtIO device > + * @status - the devices status bits > + * > + * This is similar to virtio_device_started() but also encapsulates a > + * check on the VM status which would prevent a device starting > + * anyway. > + */ > +static inline bool virtio_device_should_start(VirtIODevice *vdev, uint8_= t status) > +{ > + if (vdev->use_started) { > + return vdev->started; > + } > + > if (!vdev->vm_running) { > return false; > } > diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c > index 13bf5cc47a..8feaf12e4e 100644 > --- a/hw/block/vhost-user-blk.c > +++ b/hw/block/vhost-user-blk.c > @@ -222,14 +222,10 @@ static void vhost_user_blk_stop(VirtIODevice *vdev) > static void vhost_user_blk_set_status(VirtIODevice *vdev, uint8_t status) > { > VHostUserBlk *s =3D VHOST_USER_BLK(vdev); > - bool should_start =3D virtio_device_started(vdev, status); > + bool should_start =3D virtio_device_should_start(vdev, status); > Error *local_err =3D NULL; > int ret; > =20 > - if (!vdev->vm_running) { > - should_start =3D false; > - } > - > if (!s->connected) { > return; > } > diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c > index ad0f91c607..1c40f42045 100644 > --- a/hw/virtio/vhost-user-fs.c > +++ b/hw/virtio/vhost-user-fs.c > @@ -123,7 +123,7 @@ static void vuf_stop(VirtIODevice *vdev) > static void vuf_set_status(VirtIODevice *vdev, uint8_t status) > { > VHostUserFS *fs =3D VHOST_USER_FS(vdev); > - bool should_start =3D virtio_device_started(vdev, status); > + bool should_start =3D virtio_device_should_start(vdev, status); > =20 > if (vhost_dev_is_started(&fs->vhost_dev) =3D=3D should_start) { > return; > diff --git a/hw/virtio/vhost-user-gpio.c b/hw/virtio/vhost-user-gpio.c > index 8b40fe450c..677d1c7730 100644 > --- a/hw/virtio/vhost-user-gpio.c > +++ b/hw/virtio/vhost-user-gpio.c > @@ -152,7 +152,7 @@ static void vu_gpio_stop(VirtIODevice *vdev) > static void vu_gpio_set_status(VirtIODevice *vdev, uint8_t status) > { > VHostUserGPIO *gpio =3D VHOST_USER_GPIO(vdev); > - bool should_start =3D virtio_device_started(vdev, status); > + bool should_start =3D virtio_device_should_start(vdev, status); > =20 > trace_virtio_gpio_set_status(status); > =20 > diff --git a/hw/virtio/vhost-user-i2c.c b/hw/virtio/vhost-user-i2c.c > index bc58b6c0d1..864eba695e 100644 > --- a/hw/virtio/vhost-user-i2c.c > +++ b/hw/virtio/vhost-user-i2c.c > @@ -93,7 +93,7 @@ static void vu_i2c_stop(VirtIODevice *vdev) > static void vu_i2c_set_status(VirtIODevice *vdev, uint8_t status) > { > VHostUserI2C *i2c =3D VHOST_USER_I2C(vdev); > - bool should_start =3D virtio_device_started(vdev, status); > + bool should_start =3D virtio_device_should_start(vdev, status); > =20 > if (vhost_dev_is_started(&i2c->vhost_dev) =3D=3D should_start) { > return; > diff --git a/hw/virtio/vhost-user-rng.c b/hw/virtio/vhost-user-rng.c > index bc1f36c5ac..8b47287875 100644 > --- a/hw/virtio/vhost-user-rng.c > +++ b/hw/virtio/vhost-user-rng.c > @@ -90,7 +90,7 @@ static void vu_rng_stop(VirtIODevice *vdev) > static void vu_rng_set_status(VirtIODevice *vdev, uint8_t status) > { > VHostUserRNG *rng =3D VHOST_USER_RNG(vdev); > - bool should_start =3D virtio_device_started(vdev, status); > + bool should_start =3D virtio_device_should_start(vdev, status); > =20 > if (vhost_dev_is_started(&rng->vhost_dev) =3D=3D should_start) { > return; > diff --git a/hw/virtio/vhost-user-vsock.c b/hw/virtio/vhost-user-vsock.c > index 7b67e29d83..9431b9792c 100644 > --- a/hw/virtio/vhost-user-vsock.c > +++ b/hw/virtio/vhost-user-vsock.c > @@ -55,7 +55,7 @@ const VhostDevConfigOps vsock_ops =3D { > static void vuv_set_status(VirtIODevice *vdev, uint8_t status) > { > VHostVSockCommon *vvc =3D VHOST_VSOCK_COMMON(vdev); > - bool should_start =3D virtio_device_started(vdev, status); > + bool should_start =3D virtio_device_should_start(vdev, status); > =20 > if (vhost_dev_is_started(&vvc->vhost_dev) =3D=3D should_start) { > return; > diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c > index 7dc3c73931..aa16d584ee 100644 > --- a/hw/virtio/vhost-vsock.c > +++ b/hw/virtio/vhost-vsock.c > @@ -70,7 +70,7 @@ static int vhost_vsock_set_running(VirtIODevice *vdev, = int start) > static void vhost_vsock_set_status(VirtIODevice *vdev, uint8_t status) > { > VHostVSockCommon *vvc =3D VHOST_VSOCK_COMMON(vdev); > - bool should_start =3D virtio_device_started(vdev, status); > + bool should_start =3D virtio_device_should_start(vdev, status); > int ret; > =20 > if (vhost_dev_is_started(&vvc->vhost_dev) =3D=3D should_start) { > --=20 > 2.34.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 589D0C4332F for ; Mon, 7 Nov 2022 12:18:28 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1os14Y-0006fG-68; Mon, 07 Nov 2022 07:17:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1os142-0006Y5-M4 for qemu-devel@nongnu.org; Mon, 07 Nov 2022 07:17:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1os13t-0004zW-Bg for qemu-devel@nongnu.org; Mon, 07 Nov 2022 07:17:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667823427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P3PYeiCqv8wCHA3q3ErlcU42ag89cxBOYkG/hh6iY38=; b=B+paaK0GR4P5afZojsqWsLrZ0jVPslHrg1plNQRqmQj8K3SHFOMtXFGi8RpD50d7pYWu8C 0L2HIwY0z7jc8LtMP++9AYHIhAqoY5YU2AmX3CeQMOwOtNU4EINMbvGEBxOAhzN4gs2eNu eBAXFnAvkjh0yIoT0gbX8u5zCtgp/J0= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-375-YenOBvRjMua40MuS-cCK0g-1; Mon, 07 Nov 2022 07:17:06 -0500 X-MC-Unique: YenOBvRjMua40MuS-cCK0g-1 Received: by mail-wm1-f70.google.com with SMTP id r187-20020a1c44c4000000b003c41e9ae97dso8367546wma.6 for ; Mon, 07 Nov 2022 04:17:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=P3PYeiCqv8wCHA3q3ErlcU42ag89cxBOYkG/hh6iY38=; b=fJJMgbzmGGMlvqeVdN7JnS7gwkF6ddc3PBTCX1AY2l2w/qBnNtTuvcGZvSrg/HtmNO TMuc4/E5i8V8Gahpwao/laZ/MtKPUirpbv7LPvp6OcLWAJK0pmza43VXRyeZWeVA7dBU R/3EdFyVsB8Wk7ukRwUn8n7I2M4IaYkZprbNVHCnkN2v+IcPxHwmPXWF7N3EXZJmoys7 kRxZ+M9c78xHLWPJeqZwsHyP2auH9IMVjlfVujyhGvlVQG6zX0ljFW9LS2ENA9tf9y35 COhIqlqcQ0pmR0EoY1eG5KmnzUurC8Q9Hp1Bq0ndtW1ZhLAmMVxef3hChDwjcL7Df8IH ek+w== X-Gm-Message-State: ACrzQf0tHRgNfKxHmCDqyCN5iSwxNTMUvBwbsK3IgdcjiBsshDiRgSyJ mEG5MnBZQeVXdYTM/o0BEvdn7dKlUYgwBRFID+p/yxMfXAF1l62dWUxjCvxxTwjPlQhCIdzPkd0 qJOQQl6q37ePqqgY= X-Received: by 2002:adf:e385:0:b0:236:91a6:bd1b with SMTP id e5-20020adfe385000000b0023691a6bd1bmr31456562wrm.278.1667823423490; Mon, 07 Nov 2022 04:17:03 -0800 (PST) X-Google-Smtp-Source: AMsMyM4VeOiq0Atg/BIKWc4IS6k91lhXV4EPlQByvS/Bdf0MGBl6xzu5EUMKK7vZa4uly6MYH98xYA== X-Received: by 2002:adf:e385:0:b0:236:91a6:bd1b with SMTP id e5-20020adfe385000000b0023691a6bd1bmr31456539wrm.278.1667823423136; Mon, 07 Nov 2022 04:17:03 -0800 (PST) Received: from redhat.com ([169.150.226.212]) by smtp.gmail.com with ESMTPSA id l12-20020a05600c2ccc00b003b47ff307e1sm8441285wmc.31.2022.11.07.04.17.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 04:17:02 -0800 (PST) Date: Mon, 7 Nov 2022 07:16:58 -0500 From: "Michael S. Tsirkin" To: Alex =?iso-8859-1?Q?Benn=E9e?= Cc: qemu-devel@nongnu.org, Raphael Norwitz , Kevin Wolf , Hanna Reitz , "Dr. David Alan Gilbert" , Stefan Hajnoczi , Viresh Kumar , Mathieu Poirier , "open list:Block layer core" , "open list:virtiofs" Subject: Re: [RFC PATCH] hw/virtio: introduce virtio_device_should_start Message-ID: <20221107071516-mutt-send-email-mst@kernel.org> References: <20221107121407.1010913-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20221107121407.1010913-1-alex.bennee@linaro.org> Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Mon, Nov 07, 2022 at 12:14:07PM +0000, Alex Bennée wrote: > The previous fix to virtio_device_started revealed a problem in its > use by both the core and the device code. The core code should be able > to handle the device "starting" while the VM isn't running to handle > the restoration of migration state. To solve this duel use introduce a > new helper for use by the vhost-user backends who all use it to feed a > should_start variable. > > We can also pick up a change vhost_user_blk_set_status while we are at > it which follows the same pattern. > > Fixes: 9f6bcfd99f (hw/virtio: move vm_running check to virtio_device_started) > Signed-off-by: Alex Bennée > Cc: "Michael S. Tsirkin" Hi Alex, did you actually check this under gitlab CI? > --- > include/hw/virtio/virtio.h | 18 ++++++++++++++++++ > hw/block/vhost-user-blk.c | 6 +----- > hw/virtio/vhost-user-fs.c | 2 +- > hw/virtio/vhost-user-gpio.c | 2 +- > hw/virtio/vhost-user-i2c.c | 2 +- > hw/virtio/vhost-user-rng.c | 2 +- > hw/virtio/vhost-user-vsock.c | 2 +- > hw/virtio/vhost-vsock.c | 2 +- > 8 files changed, 25 insertions(+), 11 deletions(-) > > diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h > index f41b4a7e64..3191c618f3 100644 > --- a/include/hw/virtio/virtio.h > +++ b/include/hw/virtio/virtio.h > @@ -389,6 +389,24 @@ static inline bool virtio_device_started(VirtIODevice *vdev, uint8_t status) > return vdev->started; > } > > + return status & VIRTIO_CONFIG_S_DRIVER_OK; > +} > + > +/** > + * virtio_device_should_start() - check if device startable > + * @vdev - the VirtIO device > + * @status - the devices status bits > + * > + * This is similar to virtio_device_started() but also encapsulates a > + * check on the VM status which would prevent a device starting > + * anyway. > + */ > +static inline bool virtio_device_should_start(VirtIODevice *vdev, uint8_t status) > +{ > + if (vdev->use_started) { > + return vdev->started; > + } > + > if (!vdev->vm_running) { > return false; > } > diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c > index 13bf5cc47a..8feaf12e4e 100644 > --- a/hw/block/vhost-user-blk.c > +++ b/hw/block/vhost-user-blk.c > @@ -222,14 +222,10 @@ static void vhost_user_blk_stop(VirtIODevice *vdev) > static void vhost_user_blk_set_status(VirtIODevice *vdev, uint8_t status) > { > VHostUserBlk *s = VHOST_USER_BLK(vdev); > - bool should_start = virtio_device_started(vdev, status); > + bool should_start = virtio_device_should_start(vdev, status); > Error *local_err = NULL; > int ret; > > - if (!vdev->vm_running) { > - should_start = false; > - } > - > if (!s->connected) { > return; > } > diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c > index ad0f91c607..1c40f42045 100644 > --- a/hw/virtio/vhost-user-fs.c > +++ b/hw/virtio/vhost-user-fs.c > @@ -123,7 +123,7 @@ static void vuf_stop(VirtIODevice *vdev) > static void vuf_set_status(VirtIODevice *vdev, uint8_t status) > { > VHostUserFS *fs = VHOST_USER_FS(vdev); > - bool should_start = virtio_device_started(vdev, status); > + bool should_start = virtio_device_should_start(vdev, status); > > if (vhost_dev_is_started(&fs->vhost_dev) == should_start) { > return; > diff --git a/hw/virtio/vhost-user-gpio.c b/hw/virtio/vhost-user-gpio.c > index 8b40fe450c..677d1c7730 100644 > --- a/hw/virtio/vhost-user-gpio.c > +++ b/hw/virtio/vhost-user-gpio.c > @@ -152,7 +152,7 @@ static void vu_gpio_stop(VirtIODevice *vdev) > static void vu_gpio_set_status(VirtIODevice *vdev, uint8_t status) > { > VHostUserGPIO *gpio = VHOST_USER_GPIO(vdev); > - bool should_start = virtio_device_started(vdev, status); > + bool should_start = virtio_device_should_start(vdev, status); > > trace_virtio_gpio_set_status(status); > > diff --git a/hw/virtio/vhost-user-i2c.c b/hw/virtio/vhost-user-i2c.c > index bc58b6c0d1..864eba695e 100644 > --- a/hw/virtio/vhost-user-i2c.c > +++ b/hw/virtio/vhost-user-i2c.c > @@ -93,7 +93,7 @@ static void vu_i2c_stop(VirtIODevice *vdev) > static void vu_i2c_set_status(VirtIODevice *vdev, uint8_t status) > { > VHostUserI2C *i2c = VHOST_USER_I2C(vdev); > - bool should_start = virtio_device_started(vdev, status); > + bool should_start = virtio_device_should_start(vdev, status); > > if (vhost_dev_is_started(&i2c->vhost_dev) == should_start) { > return; > diff --git a/hw/virtio/vhost-user-rng.c b/hw/virtio/vhost-user-rng.c > index bc1f36c5ac..8b47287875 100644 > --- a/hw/virtio/vhost-user-rng.c > +++ b/hw/virtio/vhost-user-rng.c > @@ -90,7 +90,7 @@ static void vu_rng_stop(VirtIODevice *vdev) > static void vu_rng_set_status(VirtIODevice *vdev, uint8_t status) > { > VHostUserRNG *rng = VHOST_USER_RNG(vdev); > - bool should_start = virtio_device_started(vdev, status); > + bool should_start = virtio_device_should_start(vdev, status); > > if (vhost_dev_is_started(&rng->vhost_dev) == should_start) { > return; > diff --git a/hw/virtio/vhost-user-vsock.c b/hw/virtio/vhost-user-vsock.c > index 7b67e29d83..9431b9792c 100644 > --- a/hw/virtio/vhost-user-vsock.c > +++ b/hw/virtio/vhost-user-vsock.c > @@ -55,7 +55,7 @@ const VhostDevConfigOps vsock_ops = { > static void vuv_set_status(VirtIODevice *vdev, uint8_t status) > { > VHostVSockCommon *vvc = VHOST_VSOCK_COMMON(vdev); > - bool should_start = virtio_device_started(vdev, status); > + bool should_start = virtio_device_should_start(vdev, status); > > if (vhost_dev_is_started(&vvc->vhost_dev) == should_start) { > return; > diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c > index 7dc3c73931..aa16d584ee 100644 > --- a/hw/virtio/vhost-vsock.c > +++ b/hw/virtio/vhost-vsock.c > @@ -70,7 +70,7 @@ static int vhost_vsock_set_running(VirtIODevice *vdev, int start) > static void vhost_vsock_set_status(VirtIODevice *vdev, uint8_t status) > { > VHostVSockCommon *vvc = VHOST_VSOCK_COMMON(vdev); > - bool should_start = virtio_device_started(vdev, status); > + bool should_start = virtio_device_should_start(vdev, status); > int ret; > > if (vhost_dev_is_started(&vvc->vhost_dev) == should_start) { > -- > 2.34.1