From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC06733D6F0 for ; Sat, 5 Sep 2026 15:21:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788621683; cv=none; b=lMUQwXOOzlbUWYE4cLiHzBYlyQS0H7wFwDVPidk4HbC5y1r8D67+Yq9XA4Hevy5mhNIXaogAKm51VvWyD4envrRk6cR/v/8jiy4Wr2YilHVhgaaMeXEAuOYhIeX+tolcsrralHGCnhQOsIzKueP2/7c3ZHAIjKxTrcdcfSU8eL4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788621683; c=relaxed/simple; bh=o5w8meMgR85hvsqu/UmribMxya6NB2BOgGgde6W9CO0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ap8jYtoWgbsj81/Js1d7WKhLJ/Dmd1LPuOPxvwMbUcgZSc0xdBYHy406iHD0Vo646A/XX5TJfExL/gcxJnaLDqpgrngLCaFUzYBAVAdRoWalQ2Fr7BSxQlD8A44/HwiuQ3rCooo5wjLJzXm+pkmWumMsY9R3zWkCdd23tBjz/uw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=NbvhTyH7; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NbvhTyH7" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-49b965570d7so23706355e9.0 for ; Sat, 05 Sep 2026 08:21:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788621677; x=1789226477; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=tpulPZddhuPwIKcjBWNAE6zpuXjOxSBLaTnXCz35ckk=; b=NbvhTyH7qp1LqFtym4BpLZ6lCm0AN4zXFSMecOiTNDnWkmNZyNxgt+rx5TUMde4X/T ZBxh28b48bjrbBKTfbWwxcw9Mtkww//VhWq4IJ5N+3fwFhdUEtkdnMYm1OjGJwbrAqnS qqOMaKRsJdAYslhnqmMYUN1RIInA6xqpj5CZyvSTnS7B82xtYQoPfEQKEXB9I0uSMcWl SMHJLxWUataM6blAR9dXtKAP1VQPzlw9rsg2o8vF9aQ/8v/muU06wsYN7yOVmKJBOcLb 7i6GqX3xcQ09G+dO+J8QGocTEN+DX3gbNV1NUL7gxyev1Sglc+J3bRp4ZTbJki733GL+ Eeew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788621677; x=1789226477; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=tpulPZddhuPwIKcjBWNAE6zpuXjOxSBLaTnXCz35ckk=; b=rfRJnLWVVfy/u9diNEvXH617Fas8xWQmKGq3lkkRd48VywwlNoCL6Vg9xXouVZleTv AR4JfeJEmGecqfriCTQu8mg7MavHv0BJw1Wwg7pcRcv6l8MwuY+/GAMv0czb8FFwNZ9L NyhZx6B1QOjjLVYzsQ1jrl+7Rb9dFFEKARhSIumHmwDFTbdhoXsdK8kKZAtoaJd3NgRK 5azvxKjQ49F3K4eH5PPYA8Ngz6w+vVEOs3t7J/HKrPEzuYIVShk0s1WSfl2Vu8JjpkA3 xzqBX44xn1yw63nW70tMhxC1MVyJk9C9XV807wmFt67P2DJ41gR/XArrJI3P70hBGrNW eCZg== X-Forwarded-Encrypted: i=1; AKwUvByAx+SaXo8oI+o5WrTEVjUfvvR6lBbfzBmw0kv4iBEWzV8gve9FZbnJPGL/4aRh8s6BNhJw912sroJq@vger.kernel.org X-Gm-Message-State: AFuF++nefVLX2KgZZqdc7hcY0RjUYsde1MrPUVlhs8NTARA8E/Uh54iu KKnVHvcdKH2p8I4hRKqUV6GmTqMlAPnvkJLI2yPwrQ8RyykvwmDwEJzW X-Gm-Gg: AYBFou2FVvtuiO9tYHwnIb0cyfuFCatOdkaqLlvL3g6vhPbQOKM5xspuR+TCYecRtnN TJRJJOQFg7PFUj8rSMUd55tvsMpwF4M33JLsdQcMawHBvfDUtdgj2EYAbV5tuizFrOwG0PHAFlq OCwTGzJODbkK4FkZgjaC1Hh/VAdThdC1qvkr8Pk6bw5hTffv1GuLf7XGrklNtyVlCLUB3QahGh6 ujyNHxsLg7FYp9oinZ0PvuYEg7uIttYsxqvJ9jPnE0i446KWgpsdyKY4xadL2br8QXO/X7YaxFT V+BMWIeq5IRrjtn77tpvY6iKmIK97Pq4twpcwZfIj4+OcN0eFVO1PPapfFAiMLqCi7WSXePi1Z6 9Ydqt2Rcpg4bSNnAeXqwUfMixLFG0g8T3w0kC9wOA3K8EUAP0UmMviVlldunwAeT8dFUudVURyu sMW+dBMBomq3EbOP6bwEyns2iSh/38MzmAR5TLsne22dzOQIQdzbekgQJaUEDYmMbFO93P9QJab l59qjB/HR8JczwMJ5O1PtEdiqPW6QIAzMw/iDsQLt4nE2qa2nW3YrMI0ntimw5Q6B38IQFy9s5V Ppfe4CYnA6ZcQf8rKiVdctiR/OYy6bixc0+g7w9YS7C/BzgH9e7pZIq0CCfh+apq29E= X-Received: by 2002:a05:600c:6209:b0:49c:fed6:cd3f with SMTP id 5b1f17b1804b1-49cfed6cd4dmr81095545e9.23.1788621677280; Sat, 05 Sep 2026 08:21:17 -0700 (PDT) Received: from localhost.localdomain (dynamic-2a02-3100-a4eb-3001-c06d-af27-9fa2-ea53.310.pool.telefonica.de. [2a02:3100:a4eb:3001:c06d:af27:9fa2:ea53]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cf75ce49esm267779515e9.1.2026.09.05.08.21.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 05 Sep 2026 08:21:16 -0700 (PDT) From: Karl Mehltretter To: "Michael S . Tsirkin" , Jason Wang , Gerd Hoffmann Cc: Karl Mehltretter , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Dmitry Torokhov , Rusty Russell , Pawel Moll , Cornelia Huck , Halil Pasic , Eric Farman , Richard Weinberger , Anton Ivanov , Johannes Berg , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , 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: [PATCH v2 1/3] virtio: synchronize callbacks during device reset Date: Sat, 5 Sep 2026 17:20:57 +0200 Message-Id: <20260905152059.89560-2-kmehltretter@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20260905152059.89560-1-kmehltretter@gmail.com> References: <20260905152059.89560-1-kmehltretter@gmail.com> Precedence: bulk X-Mailing-List: linux-s390@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit virtio_reset_device() promises that vq callbacks have finished when it returns. virtio-pci waits 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. Keep the pre-reset call under CONFIG_VIRTIO_HARDEN_NOTIFICATION so callbacks see vq->broken. 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. 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 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)