From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC2DC7DA66 for ; Sun, 6 Sep 2026 06:49:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788677395; cv=none; b=SPiCPPhckNV1j9VEKUkCA2QF4cQ0fX4a7laMJ7a5uJFaLzVnbazImx6ZPpWGDQDO1lMiPhCdmw/xhic+GN426JtQOCoLlP77V8G8zYG4Irwq6LHYq/2FZcLMUC3ityj4lpgfWN8hHu5wiK4Kg6WgSJUI6VstASNzagGqPPvXF4s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788677395; c=relaxed/simple; bh=dj38t1fGfgwRkmHhPJzLsp5lj0Rjo6qLLi+LSOdmRUg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=MypZ3Fdg3YI/ToY2yyDEJgiHlwT6yfneYnqoJKLx9ntB/2yIsK6wj0dWdHFcx5g+d1JfeVG7Bl5iF7HH3SAB1yMpQmnjSN8Os/gBv1efm4hkx6Z60H+t+lGewf4K9uHSVPbTunUKGtYtMrwnehBERBDCKxQNKs1YArq1WwQ1jiY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=G15MmRcs; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=T2LG/4qW; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="G15MmRcs"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="T2LG/4qW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1788677391; 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: in-reply-to:in-reply-to:references:references; bh=FxBlOQKm+7hXSGCdUjsbD2NtO6PNO8MI4ARMWfWmlJ4=; b=G15MmRcsdJt4R9oxsARtpp3PxYOl3fIo1Vg3x8FEOJQzgVrW0FEUwONSJAOxTo/DmCSNf7 FoQ+fh+jk/40FB8ZlARiPpy4wsF+nnv3Wh1/NDt0qCl+/+hEp1+VZ/cLzPqQi0FHbRO5d4 EGM8bLYVadGu7BrvkCtnqHcc2AZw9ow= 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_256_GCM_SHA384) id us-mta-486-S_VzongKOaeUoPxy1YfkqA-1; Sun, 06 Sep 2026 02:49:50 -0400 X-MC-Unique: S_VzongKOaeUoPxy1YfkqA-1 X-Mimecast-MFC-AGG-ID: S_VzongKOaeUoPxy1YfkqA_1788677390 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-496bbcf7d1eso22128425e9.0 for ; Sat, 05 Sep 2026 23:49:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1788677389; x=1789282189; darn=vger.kernel.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=FxBlOQKm+7hXSGCdUjsbD2NtO6PNO8MI4ARMWfWmlJ4=; b=T2LG/4qW1DwsxpVYw/RsqLWcY75Ivhz+6AqEx1AQqVadEZVAl9fo9cEXABWnsk79e7 tfjbFMp2mCSGcMpdIOMqPE2K3go4f5X8kh7lqouyt33ABRczHGuQvOx1ijBDGRRgjJh9 JnAuWNgS4pceEMsKtT+cMpEHabOQLhpg33vWlMKgzfqybqO0O7h1Rr+vRq7B41MMXTHG vCCq5VtlM5tT84TX56nSrnfkpiJVEzic2HiOOZYW7ZcUrhR+nAvKEPEVWDBQszy4BQaJ guHDv4EgjREZ1JTRSPa44WgfLx9XfjIM5MqETyfdkPWme3ahsbonTLxcYdLYzxsufgtA 3lzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788677389; x=1789282189; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=FxBlOQKm+7hXSGCdUjsbD2NtO6PNO8MI4ARMWfWmlJ4=; b=Jq+I/xP5SAMp/m0zuBLsLlAis5gvrgD4uBqZ9aQwuvVpc+ZeXJzL2G4Lcbnu1EAzrH 3V9v6bBjl4Zcy8as+zjq1Euc4nKjqysPfMdDs4lz7T0JDPrb25SbUIUoHEAzZPd1sE8Z IITlSNH5+MdpO1hqY0FHqpef85T9/pq/IxnXvIsiz/rS5G8D9ED4VWHy36tknjW18B4p MQ+xozVFhEVBmRwv7tFRUg/bXlrt7aKXdPN6fFbMzngN5GBVuMBVci1PFiio4BKtK5pw /WNAd9jZIxcI2jCOtolCnRKPtp/u2T1T2wVwOHWs6bMmO+567Q8xpx5aypYQa6/VgMEK Tdpg== X-Forwarded-Encrypted: i=1; AKwUvBwXyBnbnZA36L7JAzltDSdytoX3iF6gh35Y+k8lyU+oaQRJ4giS0vLUy1kfQQBTCJSaEY4=@vger.kernel.org X-Gm-Message-State: AFuF++lu2yyIFlifJMFMF2pyGgqQFXsM1I+7J0VL7pxOBWQjkscPshbv KZQQsDG187omlZdLzArAIlLmsW1hftFkh3MptdpndFfki3PrSGJNqbiUc4eWzyMBK/h2Vmt1Tut Bbx7dOAtgiHLbL/9yYVzpx7vdvmVmwUhm/HGu0l7RTwV1L1oGe3agUg== X-Gm-Gg: AYBFou1Ovl5aVpWKG2VEv6kpR5sY/KOuUXVlH5B8FOe2DX1Br0SO43RCAuVx+KmUP9w jazi0YWFRXdQ4nJLTaAlYB0fWKoVbbrOzfTSFhTlmhaZLtTqREiJLmZexf/Py88WsDuSgxaCnOw qlgcWW2d9o2FT0o0J+UPohxgWiWACctUfieHf782P05E3OEuBLXJ9Ld6WJflnRhmyPaPB7euxwj EdLJXSpCc+QxKl5STLLzl/wRYtaH2d09P0gppnE7TtqOP/BrH8JdIsd8KmKG9vYluu70b2xP1g0 tXCw22Wlpe6TKi0Mv/hQGhmRD2zoOsoaex9oY5k9iT4BBtzU6n3wey/t+M/EAPX7LlDtnebEceG 2FCvfVUuoYhMPHmqIFTDXttk= X-Received: by 2002:a05:600c:1da8:b0:49c:cf18:494e with SMTP id 5b1f17b1804b1-49cf825a530mr183997825e9.12.1788677389123; Sat, 05 Sep 2026 23:49:49 -0700 (PDT) X-Received: by 2002:a05:600c:1da8:b0:49c:cf18:494e with SMTP id 5b1f17b1804b1-49cf825a530mr183997325e9.12.1788677388522; Sat, 05 Sep 2026 23:49:48 -0700 (PDT) Received: from redhat.com (IGLD-80-230-79-236.inter.net.il. [80.230.79.236]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cf772692dsm252344165e9.10.2026.09.05.23.49.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Sep 2026 23:49:48 -0700 (PDT) Date: Sun, 6 Sep 2026 02:49:43 -0400 From: "Michael S. Tsirkin" To: Karl Mehltretter Cc: Jason Wang , Gerd Hoffmann , Xuan Zhuo , Eugenio =?iso-8859-1?Q?P=E9rez?= , Dmitry Torokhov , Rusty Russell , Pawel Moll , Cornelia Huck , Halil Pasic , Eric Farman , Richard Weinberger , Anton Ivanov , Johannes Berg , Hans de Goede , Ilpo =?iso-8859-1?Q?J=E4rvinen?= , Vadim Pasternak , Bjorn Andersson , Mathieu Poirier , virtualization@lists.linux.dev, linux-input@vger.kernel.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org, linux-um@lists.infradead.org, platform-driver-x86@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 1/3] virtio: synchronize callbacks during device reset Message-ID: <20260906024354-mutt-send-email-mst@kernel.org> References: <20260905152059.89560-1-kmehltretter@gmail.com> <20260905152059.89560-2-kmehltretter@gmail.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260905152059.89560-2-kmehltretter@gmail.com> On Sat, Sep 05, 2026 at 05:20:57PM +0200, Karl Mehltretter wrote: > virtio_reset_device() promises that vq callbacks have finished when it > returns. virtio-pci waits it does not wait. it synchronizes. > in vp_reset(), but other transports can return > with a callback still running. > > Call virtio_synchronize_cbs() after config->reset() and drop the duplicate > waits from both PCI reset methods. Add the wait to virtio_device_shutdown() > too, since it calls config->reset() directly. so what, if it calls reset directly? what does it have to do with virtio_reset_device? is there a bug around shutdown? if yes it's a separate issue. > Keep the pre-reset call under > CONFIG_VIRTIO_HARDEN_NOTIFICATION so callbacks see vq->broken. This kind of slop is what LLMs write. u do not need to document all the things you did not change. > > Always take irq_lock in the classic virtio-ccw interrupt handler so it > pairs with synchronize_cbs even without notification hardening. Use > is_thinint to choose the lock: airq_info can stay allocated after a > fallback to classic interrupts. I can't even read this, half sentences out of context. Can you pls write the commit log yourself? I suspect what this is trying to say is that synchronize_cbs is buggy on ccw and this is trying to fix it? A separate patch then. > > The transport reset must still stop new callbacks before this wait. > > Fixes: d9679d0013a6 ("virtio: wrap config->reset calls") > Suggested-by: Michael S. Tsirkin > Assisted-by: LLM codex likes putting this in but it is the wrong format. > Signed-off-by: Karl Mehltretter > --- > drivers/s390/virtio/virtio_ccw.c | 6 +----- > drivers/virtio/virtio.c | 2 ++ > drivers/virtio/virtio_pci_legacy.c | 2 -- > drivers/virtio/virtio_pci_modern.c | 3 --- > include/linux/virtio_config.h | 6 +++--- > 5 files changed, 6 insertions(+), 13 deletions(-) > > diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c > index bab6cad3fd5c..552d77998012 100644 > --- a/drivers/s390/virtio/virtio_ccw.c > +++ b/drivers/s390/virtio/virtio_ccw.c > @@ -1062,7 +1062,7 @@ static void virtio_ccw_synchronize_cbs(struct virtio_device *vdev) > struct virtio_ccw_device *vcdev = to_vc_device(vdev); > struct airq_info *info = vcdev->airq_info; > > - if (info) { > + if (vcdev->is_thinint && info) { > /* > * This device uses adapter interrupts: synchronize with > * vring_interrupt() called by virtio_airq_handler() > @@ -1204,13 +1204,11 @@ static void virtio_ccw_int_handler(struct ccw_device *cdev, > vcdev->err = -EIO; > } > virtio_ccw_check_activity(vcdev, activity); > -#ifdef CONFIG_VIRTIO_HARDEN_NOTIFICATION > /* > * Paired with virtio_ccw_synchronize_cbs() and interrupts are > * disabled here. > */ > read_lock(&vcdev->irq_lock); > -#endif > for_each_set_bit(i, indicators(vcdev), > sizeof(*indicators(vcdev)) * BITS_PER_BYTE) { > /* The bit clear must happen before the vring kick. */ > @@ -1219,9 +1217,7 @@ static void virtio_ccw_int_handler(struct ccw_device *cdev, > vq = virtio_ccw_vq_by_ind(vcdev, i); > vring_interrupt(0, vq); > } > -#ifdef CONFIG_VIRTIO_HARDEN_NOTIFICATION > read_unlock(&vcdev->irq_lock); > -#endif > if (test_bit(0, indicators2(vcdev))) { > virtio_config_changed(&vcdev->vdev); > clear_bit(0, indicators2(vcdev)); > diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c > index 75bb4ffe3b87..ad1c50b8a94e 100644 > --- a/drivers/virtio/virtio.c > +++ b/drivers/virtio/virtio.c > @@ -264,6 +264,7 @@ void virtio_reset_device(struct virtio_device *dev) > #endif > > dev->config->reset(dev); > + virtio_synchronize_cbs(dev); > } > EXPORT_SYMBOL_GPL(virtio_reset_device); > > @@ -424,6 +425,7 @@ void virtio_device_shutdown(struct virtio_device *dev) > * Some devices get wedged if this happens, so reset to make sure it does not. > */ > dev->config->reset(dev); > + virtio_synchronize_cbs(dev); > } > EXPORT_SYMBOL_GPL(virtio_device_shutdown); > > diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c > index d9cbb02b35a1..8115aa39e01e 100644 > --- a/drivers/virtio/virtio_pci_legacy.c > +++ b/drivers/virtio/virtio_pci_legacy.c > @@ -98,8 +98,6 @@ static void vp_reset(struct virtio_device *vdev) > /* Flush out the status write, and flush in device writes, > * including MSi-X interrupts, if any. */ > vp_legacy_get_status(&vp_dev->ldev); > - /* Flush pending VQ/configuration callbacks. */ > - vp_synchronize_vectors(vdev); > } > > static u16 vp_config_vector(struct virtio_pci_device *vp_dev, u16 vector) > diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c > index 6d8ae2a6a8ca..c9e21317c51a 100644 > --- a/drivers/virtio/virtio_pci_modern.c > +++ b/drivers/virtio/virtio_pci_modern.c > @@ -559,9 +559,6 @@ static void vp_reset(struct virtio_device *vdev) > msleep(1); > > vp_modern_avq_cleanup(vdev); > - > - /* Flush pending VQ/configuration callbacks. */ > - vp_synchronize_vectors(vdev); > } > > static int vp_active_vq(struct virtqueue *vq, u16 msix_vec) > diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h > index 69f84ea85d71..8684a1e268ee 100644 > --- a/include/linux/virtio_config.h > +++ b/include/linux/virtio_config.h > @@ -71,9 +71,9 @@ struct virtqueue_info { > * Returns 0 on success or error status > * @del_vqs: free virtqueues found by find_vqs(). > * @synchronize_cbs: synchronize with the virtqueue callbacks (optional) > - * The function guarantees that all memory operations on the > - * queue before it are visible to the vring_interrupt() that is > - * called after it. > + * Wait for running callbacks to complete. Memory operations on the > + * queue before this call must be visible to vring_interrupt() calls > + * that follow it. > * vdev: the virtio_device > * @get_features: get the array of feature bits for this device. > * vdev: the virtio_device > -- > 2.39.5 (Apple Git-154)