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 1A141C433FE for ; Fri, 4 Nov 2022 07:38:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqrF8-0008I6-Od; Fri, 04 Nov 2022 03:35:58 -0400 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 1oqqyT-0008Q4-Rz for qemu-devel@nongnu.org; Fri, 04 Nov 2022 03:18:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqqyR-0001c0-Vz for qemu-devel@nongnu.org; Fri, 04 Nov 2022 03:18:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667546321; 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=sHOxG+KVp+HDbOCVmDzem7EKnMaOIzmgqHutk9bmBWg=; b=XCuUQMjx+rjrErAaoPd1qVTKVJTO4onuIFO+ndozSCTroSpaBv1uD601RpKLBAZAwvEdH7 1o58hXmOq8M93/RGX/rOMgID6iNDLLdOxZmmEJc5YBzzMYsGWKks9gmT7ZFQsgvZ+nFVM+ OUUdAwrZICsytVE2iK5DkWKEVXggGQ8= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-298-JJDsxdlZPrSJz5NE3rdXnQ-1; Fri, 04 Nov 2022 03:18:39 -0400 X-MC-Unique: JJDsxdlZPrSJz5NE3rdXnQ-1 Received: by mail-wr1-f71.google.com with SMTP id u13-20020adfa18d000000b00236566b5b40so952405wru.9 for ; Fri, 04 Nov 2022 00:18:39 -0700 (PDT) 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=sHOxG+KVp+HDbOCVmDzem7EKnMaOIzmgqHutk9bmBWg=; b=CQhGvi2gWpuHra6L1P1BwtCtIjectMARLjGpT/ZdzCDLIQ+SIckdrGghfJI6y2LkoR eMWBCs39WIOz+7Mid02vBNzrVAp2J2qFWjM7C8a0y5Jgwko6ljxtNe+iLXBZggawu1Hy 4MuOM+S6Wo1UwEh3xxJ9ovxuQ+fypBUKhlqbRnKJmDGIxNFnTk0rTeJGnGytxlE/f8ak UKKu9l3AH8UCUoyHug8HBajhIwVOA4ix7LB1RMzqmi3RubWYDWjBqLYlPWTzp3pB++Vm Pyk1tgqLd9/xZx2hEjS9Vsskfr7ee7hSqY0nKe0tTKVoYmXaOkt9N6iDNq3nLJoafqVW 9dgA== X-Gm-Message-State: ACrzQf114oMceYzLEsr0h4p7XoKocJAOqwInq3RQVevTxQbMoYzM0boP m+9iXMXE1m79ERZy72qMzHA80Q31R9cjFy0+fDkp4hDJtGd6QG7npJZ+tXJPVWzIpvLzQ4ebhZ8 EMWo2q4XuScvqyxA= X-Received: by 2002:a5d:6d86:0:b0:236:77fd:94f with SMTP id l6-20020a5d6d86000000b0023677fd094fmr21596142wrs.389.1667546318055; Fri, 04 Nov 2022 00:18:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4T+YtM5KerumUJe0aL9aPI0AoWyncott7wvvfsL4VNWKHyax5vaOV9gOibPIBJTMCSDNAzVg== X-Received: by 2002:a5d:6d86:0:b0:236:77fd:94f with SMTP id l6-20020a5d6d86000000b0023677fd094fmr21596119wrs.389.1667546317800; Fri, 04 Nov 2022 00:18:37 -0700 (PDT) Received: from redhat.com ([2.52.149.81]) by smtp.gmail.com with ESMTPSA id y19-20020a05600c365300b003cf75f56105sm2182757wmq.41.2022.11.04.00.18.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 00:18:37 -0700 (PDT) Date: Fri, 4 Nov 2022 03:18:34 -0400 From: "Michael S. Tsirkin" To: Alex =?iso-8859-1?Q?Benn=E9e?= Cc: qemu-devel@nongnu.org, slp@redhat.com, marcandre.lureau@redhat.com, stefanha@redhat.com, mathieu.poirier@linaro.org, viresh.kumar@linaro.org, "Dr. David Alan Gilbert" , "open list:virtiofs" Subject: Re: [PATCH v4 10/22] hw/virtio: move vm_running check to virtio_device_started Message-ID: <20221104031804-mutt-send-email-mst@kernel.org> References: <20220802095010.3330793-1-alex.bennee@linaro.org> <20220802095010.3330793-11-alex.bennee@linaro.org> <20221103123856-mutt-send-email-mst@kernel.org> <87o7tnkfqy.fsf@linaro.org> <20221103162957-mutt-send-email-mst@kernel.org> <20221103173542-mutt-send-email-mst@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20221103173542-mutt-send-email-mst@kernel.org> Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.047, 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, SPF_PASS=-0.001 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Thu, Nov 03, 2022 at 05:35:57PM -0400, Michael S. Tsirkin wrote: > On Thu, Nov 03, 2022 at 04:30:48PM -0400, Michael S. Tsirkin wrote: > > On Thu, Nov 03, 2022 at 07:18:30PM +0000, Alex Bennée wrote: > > > > > > "Michael S. Tsirkin" writes: > > > > > > > On Tue, Aug 02, 2022 at 10:49:58AM +0100, Alex Bennée wrote: > > > >> All the boilerplate virtio code does the same thing (or should at > > > >> least) of checking to see if the VM is running before attempting to > > > >> start VirtIO. Push the logic up to the common function to avoid > > > >> getting a copy and paste wrong. > > > >> > > > >> Signed-off-by: Alex Bennée > > > > > > > > How bad is it if we drop this? > > > > > > > > > I assume it will break gpio. Why do we want to drop this now? It has > > > been merged awhile. However there was a follow-up patch which tweaked > > > the order of checks in virtio_device_started. > > > > And that follow up patch trips up UBSAN: > > > > https://gitlab.com/mitsirkin/qemu/-/pipelines/684763327 > > > > > And more specifically this > > https://gitlab.com/mitsirkin/qemu/-/jobs/3269957848 I'm sorry, I misread the results. Triggers without this patch too so it's not to blame. Pls ignore. > > > > > > > > > > > >> --- > > > >> include/hw/virtio/virtio.h | 5 +++++ > > > >> hw/virtio/vhost-user-fs.c | 6 +----- > > > >> hw/virtio/vhost-user-i2c.c | 6 +----- > > > >> hw/virtio/vhost-user-rng.c | 6 +----- > > > >> hw/virtio/vhost-user-vsock.c | 6 +----- > > > >> hw/virtio/vhost-vsock.c | 6 +----- > > > >> 6 files changed, 10 insertions(+), 25 deletions(-) > > > >> > > > >> diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h > > > >> index 9bb2485415..74e7ad5a92 100644 > > > >> --- a/include/hw/virtio/virtio.h > > > >> +++ b/include/hw/virtio/virtio.h > > > >> @@ -100,6 +100,7 @@ struct VirtIODevice > > > >> VirtQueue *vq; > > > >> MemoryListener listener; > > > >> uint16_t device_id; > > > >> + /* @vm_running: current VM running state via virtio_vmstate_change() */ > > > >> bool vm_running; > > > >> bool broken; /* device in invalid state, needs reset */ > > > >> bool use_disabled_flag; /* allow use of 'disable' flag when needed */ > > > >> @@ -376,6 +377,10 @@ static inline bool virtio_device_started(VirtIODevice *vdev, uint8_t status) > > > >> return vdev->started; > > > >> } > > > >> > > > >> + if (!vdev->vm_running) { > > > >> + return false; > > > >> + } > > > >> + > > > >> return status & VIRTIO_CONFIG_S_DRIVER_OK; > > > >> } > > > >> > > > >> diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c > > > >> index e513e4fdda..d2bebba785 100644 > > > >> --- a/hw/virtio/vhost-user-fs.c > > > >> +++ b/hw/virtio/vhost-user-fs.c > > > >> @@ -122,11 +122,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 = status & VIRTIO_CONFIG_S_DRIVER_OK; > > > >> - > > > >> - if (!vdev->vm_running) { > > > >> - should_start = false; > > > >> - } > > > >> + bool should_start = virtio_device_started(vdev, status); > > > >> > > > >> if (fs->vhost_dev.started == should_start) { > > > >> return; > > > >> diff --git a/hw/virtio/vhost-user-i2c.c b/hw/virtio/vhost-user-i2c.c > > > >> index 6020eee093..b930cf6d5e 100644 > > > >> --- a/hw/virtio/vhost-user-i2c.c > > > >> +++ b/hw/virtio/vhost-user-i2c.c > > > >> @@ -93,11 +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 = status & VIRTIO_CONFIG_S_DRIVER_OK; > > > >> - > > > >> - if (!vdev->vm_running) { > > > >> - should_start = false; > > > >> - } > > > >> + bool should_start = virtio_device_started(vdev, status); > > > >> > > > >> if (i2c->vhost_dev.started == should_start) { > > > >> return; > > > >> diff --git a/hw/virtio/vhost-user-rng.c b/hw/virtio/vhost-user-rng.c > > > >> index 3a7bf8e32d..a9c1c4bc79 100644 > > > >> --- a/hw/virtio/vhost-user-rng.c > > > >> +++ b/hw/virtio/vhost-user-rng.c > > > >> @@ -90,11 +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 = status & VIRTIO_CONFIG_S_DRIVER_OK; > > > >> - > > > >> - if (!vdev->vm_running) { > > > >> - should_start = false; > > > >> - } > > > >> + bool should_start = virtio_device_started(vdev, status); > > > >> > > > >> if (rng->vhost_dev.started == should_start) { > > > >> return; > > > >> diff --git a/hw/virtio/vhost-user-vsock.c b/hw/virtio/vhost-user-vsock.c > > > >> index 0f8ff99f85..22c1616ebd 100644 > > > >> --- a/hw/virtio/vhost-user-vsock.c > > > >> +++ b/hw/virtio/vhost-user-vsock.c > > > >> @@ -55,11 +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 = status & VIRTIO_CONFIG_S_DRIVER_OK; > > > >> - > > > >> - if (!vdev->vm_running) { > > > >> - should_start = false; > > > >> - } > > > >> + bool should_start = virtio_device_started(vdev, status); > > > >> > > > >> if (vvc->vhost_dev.started == should_start) { > > > >> return; > > > >> diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c > > > >> index 0338de892f..8031c164a5 100644 > > > >> --- a/hw/virtio/vhost-vsock.c > > > >> +++ b/hw/virtio/vhost-vsock.c > > > >> @@ -70,13 +70,9 @@ 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 = status & VIRTIO_CONFIG_S_DRIVER_OK; > > > >> + bool should_start = virtio_device_started(vdev, status); > > > >> int ret; > > > >> > > > >> - if (!vdev->vm_running) { > > > >> - should_start = false; > > > >> - } > > > >> - > > > >> if (vvc->vhost_dev.started == should_start) { > > > >> return; > > > >> } > > > >> -- > > > >> 2.30.2 > > > > > > > > > -- > > > Alex Bennée