From nobody Fri Sep 25 12:37:26 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 314F43C9ED6 for ; Sat, 12 Sep 2026 10:30:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789209024; cv=none; b=CHCpWTeEYmoY/kcTm0fd0AXf1FfZQtj1MwDICnpqH6WOzUj/jHkpsD4rpSd1hFSih/IeRrinsyI8xhgooi4fBc6qZKK00VtxItKVyIVPF3xypvFljQUz4WIiD4IEMATpgH5nRywwoDVUJcyAbetkMWtJGeOJT9fa5sQdKE7JwjU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789209024; c=relaxed/simple; bh=3CK3xCUajGrp7pvQnfknL5Fj9ZEZS2Pv8v/un+O/o8Q=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=VkmTkpjnjp9vUk4Pz5wC4TTDHys3EWh7MopNqKpQTnFDjwhkA5EKm+hkgYhFxr6XXlVoZlpJG0X61FvqRX9C1w2m2uOOz8JiwnuLahSQbf1PpkVXc9ytpy/4fhiUYDE60Ge9x56bLnhc0sZ4W7HWcMRolwhi1u1cQ/aB2gEQ1zg= 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=Dqvt1Dt8; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=kAXdTql4; arc=none smtp.client-ip=170.10.129.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="Dqvt1Dt8"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="kAXdTql4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789209022; 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=Vv/+pDbq3xCxMWCwYrvbxXYMa9928ghppZcRWXUY5gE=; b=Dqvt1Dt8fdXefJdkkFuqAhy8e3TASVv5QvRJfIRApN6NaptkXMR94foH4b1OfDcvRZvvLO rhEFc/Cdbcqnk5xcnQjJrhgeQAnc0xqC5HRpe/L9VZqOo0v+Fi7nrXNhUVqhvCQKUh0KRB QE+zbKWVdxQ/4YBa7a9jC0ql3RVIOdk= 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-417-3f5uDkoyPm6L0AxrK5Wx3w-1; Sat, 12 Sep 2026 06:30:20 -0400 X-MC-Unique: 3f5uDkoyPm6L0AxrK5Wx3w-1 X-Mimecast-MFC-AGG-ID: 3f5uDkoyPm6L0AxrK5Wx3w_1789209019 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-49e6422198fso11163025e9.1 for ; Sat, 12 Sep 2026 03:30:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1789209019; x=1789813819; 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=Vv/+pDbq3xCxMWCwYrvbxXYMa9928ghppZcRWXUY5gE=; b=kAXdTql4gEtdP6/oUeUHvnqUUY3eWCdBo8i0wCnaSJ4lSxinFLAkA52u74Qz5aMl2J JTdXmqeWMQZDMcSj9jSGFeqWkg1RB8l5FRP+16Jtzt2f6NM6ZSMoQzuUelGmBhMIucQf yoXXASij6tZkl6La8OzN5qcEYzNn3XC+4v9Ps3DevXe2Ahddr2f+HJh0hW+qxv3/Ha6W Eo3BFmQ4AenvMfvf1QUZPUsIpLoqYGo8DAOdf2RVXeCxqvBHfYfJrBJVfCTcx9w5uzwR cfSKIRDiuQjhQvfDSlohJWiNO5Pb/1ef2A6dQ2GmTrCA1Tqz5sb9tyHZTmzXWjeSvAQP LVNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789209019; x=1789813819; 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=Vv/+pDbq3xCxMWCwYrvbxXYMa9928ghppZcRWXUY5gE=; b=EJYlnU41qnw8ogGt39gPfhKdEnDgTzRP5JMjwn08FQMwORlF2ktFQP1G3LgPoOSZbv /1trn4RMfgmbTPiTWi86zGg443wwRzRqNzfefWBRY75+Yh2yIW7QIktM81r4HRgfXzjO S+uaaO5P9hNRxzAhBqRXNsxsghy9lbhnpINfwwTjSTyyoIs4+rEx+tr/+D+72aSEFes2 Mhw8WHfMZ9sy6D0vs/UP4AsnhScOgBa/T7HltZetlsKHEvQbQ8OTvMAFr0X4sraWd9D1 Krb5FXJz/BvNIbyd+r/zwaY1VtM87JOOkOHjeQXZ9NsVEc0oxVmknyc5TfMpNKEJvHVX 2yVg== X-Forwarded-Encrypted: i=1; AKwUvBzNWzVvQvkcT8xKxIWA52gdHjzz//WKua80rVoZ1b1w5XFZfgn9+x1IPADvv7agKcn6QhFYBo/ajaxcBwc=@vger.kernel.org X-Gm-Message-State: AFuF++nevOgNw/Jl0mTERPu3W86v9uP7QV5juAOhhPxpH/ca8Xh+3flI DXdrmNa8Q5OA3YIj0Oxlhwu/mqe6ldgBTekBm6tkad8kB9rExNRVnHdxaD0ERbc77FjfyROEQiX LSOrH4kuuKJ4j0fU8w61XdAzAKIjqlOXywqTw1SzEyd1JniU/X4FRLDJteHzk5+kfAg== X-Gm-Gg: AYBFou0kvpnVJT7zPJlLM/4Yrp4x1eEe4hhbr7fb3T61ZMnjZ45QfLJvt3NEYmTkojP JpjYN/d7KR6e5Jog2N2do5YdxPpPZY5U3RasxJnQG9GaiZcINCOX2ov82p2S3r5S28I+mXP9UH0 2nOC8Jam1TPYzwsgZV/Y202ydHL1gLpSNLnL3oeXUHZkEQm1lRDyPE5Ic0NLms/kjo1M7jI+05R JNvxrHsTijeuqc+BE/qTOurHTrSRvAgzxq4ziK+3UULhgWJqeyToVtGZwE3Sk7m7uxm//eiZhYr 0uNuNJzMHFl+3KOfHFEXeSQq30jnmAeOOHVrVbrWQ4Ls6shbEPAYnnQf4MYqN1PnUjI= X-Received: by 2002:a05:600c:470a:b0:49c:ee20:e787 with SMTP id 5b1f17b1804b1-49e61878adamr168329715e9.1.1789209019234; Sat, 12 Sep 2026 03:30:19 -0700 (PDT) X-Received: by 2002:a05:600c:470a:b0:49c:ee20:e787 with SMTP id 5b1f17b1804b1-49e61878adamr168329105e9.1.1789209018770; Sat, 12 Sep 2026 03:30:18 -0700 (PDT) Received: from redhat.com ([147.235.223.59]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e6fe9d3e3sm21582255e9.0.2026.09.12.03.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2026 03:30:15 -0700 (PDT) Date: Sat, 12 Sep 2026 06:30:14 -0400 From: "Michael S. Tsirkin" To: virtualization@lists.linux.dev Cc: jasowangio@gmail.com, eperezma@redhat.com, xuanzhuo@linux.alibaba.com, jiri@resnulli.us, kmehltretter@gmail.com, sashiko-bot@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 1/3] virtio: synchronize callbacks after device reset Message-ID: <8ae2995ee649adcfe1398f7f1c4fc9f7028c3db1.1789204858.git.mst@redhat.com> References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.51.2.2891.g4157995a80.dirty X-Mutt-Fcc: =sent Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" virtio_reset_device says: Note: this guarantees that vq callbacks are not in progress but in practice, only virtio pci correctly synchronizes the cbs. On other transports, a callback that is already executing, keeps running while the driver tears down the state it uses. Add virtio_synchronize_cbs to virtio_reset_device fixing this for all transports that correctly implement synchronize_cbs(). Reported-by: Karl Mehltretter Link: https://lore.kernel.org/all/20260818040433.66986-1-kmehltretter@gmail= .com/ Fixes: c46eccdaadab ("virtio: document virtio_reset_device") Tested-by: Karl Mehltretter Acked-by: Karl Mehltretter Assisted-by: LLM Signed-off-by: Michael S. Tsirkin --- Notes (changelog): unchanged since v2 drivers/virtio/virtio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c index b6c9e927bef5..a8588d7ad109 100644 --- a/drivers/virtio/virtio.c +++ b/drivers/virtio/virtio.c @@ -264,6 +264,8 @@ void virtio_reset_device(struct virtio_device *dev) #endif =20 dev->config->reset(dev); + /* Flush pending VQ/configuration callbacks. */ + virtio_synchronize_cbs(dev); } EXPORT_SYMBOL_GPL(virtio_reset_device); =20 --=20 MST From nobody Fri Sep 25 12:37:26 2026 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 96C733C9ED6 for ; Sat, 12 Sep 2026 10:30:27 +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=1789209029; cv=none; b=Uu7bsrc0WTCcrW+8QeENr8m/u21l26TDmyq5Kc+lrksB+MrLSJt1J14pTxHYvu+ljbJqL5S/ZGvT6VO6rFZOqIOb3g1IBFAWLYbSCBEnf1Ng6jPw6KQqfeEHXkMPKc9Jd0gu8KavQurShYJsIiHm3bEBxKiBzND9d0l6QyLG5JA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789209029; c=relaxed/simple; bh=Ge1VSD4EhR+T+5baxH5LTs4UbrdDzHY/oZOBNhGf8WE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Wfh7R6Ghm/tafnzPvCjQeYZz1nWllpNU9ivCqGnPPZCbWNjqvd6YF6U9tZoz0ACqOo8bo2QSNGe8Xl1lZBrjXjZBCMMslnQYcWUk7JXcTZCj9fze83W25ecx89nkgGJSGOP/Ei6PdiCgZMZh54f4zpkVyaX7lQy11dGmGIB+k4s= 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=jNbLpBVS; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=PwJpAL4j; 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="jNbLpBVS"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="PwJpAL4j" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789209026; 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=lSEKt8b2T5ZUq53xnc5HGHRh5k/gLB6VjqYwxmbeHAA=; b=jNbLpBVSSDjz/7AYXSyYriFNbCay8wYrxmlaYcSTmoQLlKSyeTtrZUzX6JeS3YSUDesg3B W2R/1tjWLuthZcqFSZnJT2Fxq72yWxlWl8wTbkp/oqZVPWlKfN0dMwthIJMMJppUcZ/apP dwC6wr1svxGc35KYCtKGP1NXCWPaKmA= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-86-qhSxY8d0MP-WrL_Bi-uG7g-1; Sat, 12 Sep 2026 06:30:23 -0400 X-MC-Unique: qhSxY8d0MP-WrL_Bi-uG7g-1 X-Mimecast-MFC-AGG-ID: qhSxY8d0MP-WrL_Bi-uG7g_1789209022 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-486f94eb4easo85205f8f.0 for ; Sat, 12 Sep 2026 03:30:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1789209022; x=1789813822; 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=lSEKt8b2T5ZUq53xnc5HGHRh5k/gLB6VjqYwxmbeHAA=; b=PwJpAL4jX+fO0sc7B3OSqMYhnPTQAr3NGQa1r7kkkbIOGUPISmOGeq8jOqameUp8DK XDRdOzpOISCuQ3d0WB8A3lNfkao6TEehPtFtPJnrtyg+ws7F/qS6C4R2o46XMMCxEPJU pbFlIHtr88gDTll8Pftv2JZq3KRviXpn/vSBuc4hHizMcH6NvlNL8fIs2wjIiXK4kNZG 1MJHmRXSRGjHs7lkeQGkvnjR8bn+QwfOvBgx7YnoWUTe7Gamk7p/K/xGVvedh0sR5Dvt G61vQ+XVl3vOKfLjHXdNsgpFrx7CafCmYlBeJjem4XZQP8Nddkvu29l71ze8hb+ESj2g tNsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789209022; x=1789813822; 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=lSEKt8b2T5ZUq53xnc5HGHRh5k/gLB6VjqYwxmbeHAA=; b=SSO7kj/JztdKRMdfPM9qRwckzLd8S7EFv54vT44q92oYWn0OaBRGpglPTVygMG17zb ylOJIDn/FEenlIvV7V2u8DEvuSpx3DyCYpwL5rW1X//Rxmw57J5D8wyc9Id/CN92CIPB 4MS6hSPckOftxZo0ecu8jmdayXSdNC0/PVjFsf7J6+H5PeE+g1Aj8dKhm0NIVIFsiUsu ioyefTcaKsraN5aL80fBMr5oU8fa4ZVy0s/w+Py4XPqWylR19ZLLFkW8dkAPgPl9UCU5 3bfMjuc7X6ldcWVMu0A6lXnDXYeUj05i8duEeAFT4jriaVkS8BGMrdDbnyOwu2NCquUw 9plQ== X-Forwarded-Encrypted: i=1; AKwUvByLhqvJuiI2msOIPnYfP25VDVNjpA3kt1WzGcPf6YunqXONm/dlonwJX7GSmPogHDLNSl8bnRMXBSLstQc=@vger.kernel.org X-Gm-Message-State: AFuF++kIaH1qWWM8VdqX1deseBV15RiYHVKGZGTv++zanXVDx8wtxhl9 0HCkHA/m+cbpC/5KYeOzJ69ejwBuPrWELnyYUbLMJBYyfdcLINU5hCTEJT4WhGs5QejFWsQUpoi 5CumGgzluHbnbGY9vJecaXeXIxKCY/oXAO4UaBtS9tKE5Z8q22eXI8DEPOgbB3VM8Mw== X-Gm-Gg: AYBFou15FW0cvy4Lg7a+tfcyKLb1siA5wAimbGDnZmknfB4r/Dv5OrpNtIyGrB63u7F g3gqgqXNHryq8Me1raGCaIh0veK5DsA8jyl2K2mCAbEG5po35eM8mhT0DRxDO+ULUMEiNrZO8M8 AghH6txPt/e/qGAw2htp2xgJUCvdIoF6ojKLW19KB66UJlOiU2Bua3+fBrHYF7WpvLMXWb9G+LG 5Ul5o7ArfP2CnUhloK6R/MwPJrpC4ffYt0YN0jpRrWGO1TnyPIJMrbgIcSLzitrXih1Skdb4S/4 8pdZR9hf1Zp+N6BH29PgP21zmCgXgxmzRILthYuuFlSj2DYhA2OnGqX6uxvlygawPfM= X-Received: by 2002:a05:600c:4f88:b0:49c:fa21:e742 with SMTP id 5b1f17b1804b1-49e619ce757mr85771495e9.24.1789209021667; Sat, 12 Sep 2026 03:30:21 -0700 (PDT) X-Received: by 2002:a05:600c:4f88:b0:49c:fa21:e742 with SMTP id 5b1f17b1804b1-49e619ce757mr85771065e9.24.1789209021198; Sat, 12 Sep 2026 03:30:21 -0700 (PDT) Received: from redhat.com ([147.235.223.59]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49e71e300f3sm18291545e9.7.2026.09.12.03.30.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2026 03:30:20 -0700 (PDT) Date: Sat, 12 Sep 2026 06:30:18 -0400 From: "Michael S. Tsirkin" To: virtualization@lists.linux.dev Cc: jasowangio@gmail.com, eperezma@redhat.com, xuanzhuo@linux.alibaba.com, jiri@resnulli.us, kmehltretter@gmail.com, sashiko-bot@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/3] virtio_pci_modern: move avq cleanup from reset to del_vqs Message-ID: <21fe35ad7b66e2c30dbdba6fe4df4824d1c0db66.1789204858.git.mst@redhat.com> References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.51.2.2891.g4157995a80.dirty X-Mutt-Fcc: =sent Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" vp_modern_avq_cleanup() detaches unused buffers from the admin virtqueue. Calling it from vp_reset() is incorrect: virtqueue_get_buf in the avq interrupt handler can race with virtqueue_detach_unused_buf in cleanup, and get_buf after detach is not documented as valid. The root cause is that detaching buffers does not belong in reset at all - reset quiesces the device, while cleanup belongs where the virtqueue is about to be destroyed, from del_vqs. Reported-by: Sashiko Link: https://lore.kernel.org/virtualization/20260911125745.E0A2F1F00899@sm= tp.kernel.org/ Fixes: 4c3b54af907e ("virtio_pci_modern: use completion instead of busy loo= p to wait on admin cmd result") Cc: Jiri Pirko Assisted-by: LLM Signed-off-by: Michael S. Tsirkin --- Notes (changelog): v3->v4: split patch 3: avq cleanup move is now a separate patch from callback sync removal. Callback sync removal (previously modern-only in patch 3) merged with legacy removal into a single patch. =20 v2->v3: new in v3 drivers/virtio/virtio_pci_modern.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci= _modern.c index 6d8ae2a6a8ca..b4249afd7f58 100644 --- a/drivers/virtio/virtio_pci_modern.c +++ b/drivers/virtio/virtio_pci_modern.c @@ -364,6 +364,12 @@ static void vp_modern_avq_cleanup(struct virtio_device= *vdev) } } =20 +static void vp_modern_del_vqs(struct virtio_device *vdev) +{ + vp_modern_avq_cleanup(vdev); + vp_del_vqs(vdev); +} + static void vp_transport_features(struct virtio_device *vdev, u64 features) { struct virtio_pci_device *vp_dev =3D to_vp_device(vdev); @@ -558,8 +564,6 @@ static void vp_reset(struct virtio_device *vdev) while (vp_modern_get_status(mdev)) msleep(1); =20 - vp_modern_avq_cleanup(vdev); - /* Flush pending VQ/configuration callbacks. */ vp_synchronize_vectors(vdev); } @@ -1232,7 +1236,7 @@ static const struct virtio_config_ops virtio_pci_conf= ig_nodev_ops =3D { .set_status =3D vp_set_status, .reset =3D vp_reset, .find_vqs =3D vp_modern_find_vqs, - .del_vqs =3D vp_del_vqs, + .del_vqs =3D vp_modern_del_vqs, .synchronize_cbs =3D vp_synchronize_vectors, .get_extended_features =3D vp_get_features, .finalize_features =3D vp_finalize_features, @@ -1252,7 +1256,7 @@ static const struct virtio_config_ops virtio_pci_conf= ig_ops =3D { .set_status =3D vp_set_status, .reset =3D vp_reset, .find_vqs =3D vp_modern_find_vqs, - .del_vqs =3D vp_del_vqs, + .del_vqs =3D vp_modern_del_vqs, .synchronize_cbs =3D vp_synchronize_vectors, .get_extended_features =3D vp_get_features, .finalize_features =3D vp_finalize_features, --=20 MST From nobody Fri Sep 25 12:37:26 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 9DDEF427F9C for ; Sat, 12 Sep 2026 10:30:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789209029; cv=none; b=Eg+tupe2kzJga5vvifAPUwgN3VjZJ6uTLvv7yNb5FH9TekEvJvWaRaXNrD7HEkppGj1RnAUMGtn9w94ZvksOUlvHogKoRww7n+QN3B7m9kdf54qvuLDlM7Kndiy62E6UocPtBbbe51gD8dBQExW6cxz7P+RniGZ/WgSKMfQHFNs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789209029; c=relaxed/simple; bh=zhOWEamuPNzIa7ywZJbECDtA1y6/KiIZvm4TxhOofpw=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=meqsInZo31IkWLkNGcEJuilxF0ij6p7jVdyi1STKXj0JFK/XH5gUN83JmKOYs+K5rsK8/Q78qaLCGmVkxJ/UniLq5HF2xo3UrUTZ4NYjlGVB97GbhlwDijCepam/mBjbDRRWEfiOke0JGnFhRCjeFwLF37A6UdULN3mvMuLjl2M= 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=T0rf+KFv; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=TyxmqXeA; arc=none smtp.client-ip=170.10.129.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="T0rf+KFv"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="TyxmqXeA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789209026; 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=NnOxC74F2mkf00TAH+G2Hhd/RtqM8EKHsqZjkYjYcVU=; b=T0rf+KFv2M6HtoVZDKM4gVUZSAKwomaSt0pOySCYHRKVXMzsYFjlNikjoMLS9BLMOvHXfy 5TXfxmcjq0Q+D/IYP9Co5tCmaOK+fb+QqkbojvUqS6Fyma3Ghp4dDWe/S2e9tGDyKYGTd1 nsQlo5/eTCzYhrolFWDPEVrFs5YjMV4= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-549-E4VIw1iTOQOn4v5rWiSDpg-1; Sat, 12 Sep 2026 06:30:25 -0400 X-MC-Unique: E4VIw1iTOQOn4v5rWiSDpg-1 X-Mimecast-MFC-AGG-ID: E4VIw1iTOQOn4v5rWiSDpg_1789209024 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-49e635a6002so15614445e9.0 for ; Sat, 12 Sep 2026 03:30:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1789209024; x=1789813824; 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=NnOxC74F2mkf00TAH+G2Hhd/RtqM8EKHsqZjkYjYcVU=; b=TyxmqXeA6OrCWQovyGqWFv7xuhZv4Y4vnA2gEALjnFQg8eatzLN8angrjEjnHyFMWb yLK+swerpkpfucGhubytZCCGbRookaAmHXaG4L+dJnWiML0OJbZfLt0VEn9mR7wHcG5n QDi87WmpnZb2VXIEBLCAlrYh8/jRkBAlujDjog0Ig8KUT+VQQPS9ecZcFo5NvN4SG46X r5TE706KFclNu/SpdPmx8iuyfysRkoayNRESn1arAL6s4QyJquuMJBW3E6PRcDdlUk6k C3FWzbnHkXh8h3NLj49K+E7hZy/3rklfeMal7lRGaHCnBjV8EuLvAj2GhaqKKWz+/ktn jj1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789209024; x=1789813824; 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=NnOxC74F2mkf00TAH+G2Hhd/RtqM8EKHsqZjkYjYcVU=; b=qHrWIsSXaxGBUgYlDE6VUFSi1R9VHmSIZXkeKWeKYKbVc173dJftiFkB5AMYpxxg6M rCrutMxqMuKCBDkssjHi1HRG1lw8nbEncZRh4RNk9LhtEbzTsJzJ57Xp2w17NdcDZ7zq RrXBH+bFVjO2lz87mR6bLCdmcFXac7LNOGYV3GrACHmScbSzmWXew9zzKB1wRMKrH60W /noJ+xScRhdA/EdwtBzqtTGYriyVh5QiMtJvyGDfeqJ20if/ZGJoFuS8gD4MHeSjxgX4 6lIyZM01+sBPDx+wiTsIW1BH78r7r6/pr8LEI5KT+Hwgd3+j+hElBPgkVQ/02bXGBoYg Y7TQ== X-Forwarded-Encrypted: i=1; AKwUvBy48n92yD8RoTizGWLMNNV8hoD1iolxObKisvs4a8M1lXEgB5U/diVZFJh6zHMkh9mtccdBMSFPxS1OctQ=@vger.kernel.org X-Gm-Message-State: AFuF++nO+g4V+aX4ZKaeT8faOVnWPjqsMqTWDZGuPokBnxvOFGjNdZcD eo57wzVW232AmkApCUqgslzqXZKg9LKFtymJrRfEvvM9F1EV5v8Fyi0wDWHhcZUxNMsfU0tC8W6 qGuWA0zOMy4sY1NvLmaU2F9BQYGkHgHYGwekeOx+nRtjKD1i/4kLgu3k6fym1xHPz0Q== X-Gm-Gg: AYBFou1GTm/mcKPxcPoqziYNmQQSvLC7GbH76rxFmnmcwBffeEdDDPhjAECdrKZwFGv JBM4V3tG4opw8wyBZJPxAS1Q9nFCbzM1PXv7vnfFgKYYrNCThjGzB0U9E81FPbNWHt/hVJX5CPc FZHae9FDG2XP/iP3tZwB7ur5ijApUSqwzHdvjumwn06SGiPUPeqIptsB8Hux/hZvodKIFwwcRfr 7GXaBHAcosdfDjl3frPh0U1WPlSSptqtAc3q6dhMOqq4y0IuFQjV5TwHgvc3hHB5Fd7j2xADejO SU2hSp5uQl3LzTim2Cu3LnihnMe6MuUiuDl+UYv48BxzDGMNSNtu/afpBgJEnFTOv1E= X-Received: by 2002:a05:600c:a03:b0:49c:dada:f57f with SMTP id 5b1f17b1804b1-49e6197f78dmr95008635e9.7.1789209023940; Sat, 12 Sep 2026 03:30:23 -0700 (PDT) X-Received: by 2002:a05:600c:a03:b0:49c:dada:f57f with SMTP id 5b1f17b1804b1-49e6197f78dmr95008195e9.7.1789209023459; Sat, 12 Sep 2026 03:30:23 -0700 (PDT) Received: from redhat.com ([147.235.223.59]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49d26d4e3f3sm251334355e9.15.2026.09.12.03.30.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2026 03:30:22 -0700 (PDT) Date: Sat, 12 Sep 2026 06:30:21 -0400 From: "Michael S. Tsirkin" To: virtualization@lists.linux.dev Cc: jasowangio@gmail.com, eperezma@redhat.com, xuanzhuo@linux.alibaba.com, jiri@resnulli.us, kmehltretter@gmail.com, sashiko-bot@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 3/3] virtio_pci: drop callback sync on reset Message-ID: <64421afa76075c2e0b66ef5c2ea18948b861ab73.1789204858.git.mst@redhat.com> References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.51.2.2891.g4157995a80.dirty X-Mutt-Fcc: =sent Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The virtio core now synchronizes callbacks after reset, so the PCI transports no longer need to do it themselves. Assisted-by: LLM Signed-off-by: Michael S. Tsirkin --- Notes (changelog): v3->v4: now includes modern transport (previously only legacy in patch 2, modern was in patch 3) =20 v2->v3: split from v2 patch 2 - legacy part only drivers/virtio/virtio_pci_legacy.c | 2 -- drivers/virtio/virtio_pci_modern.c | 3 --- 2 files changed, 5 deletions(-) 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); } =20 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 b4249afd7f58..922e2df027de 100644 --- a/drivers/virtio/virtio_pci_modern.c +++ b/drivers/virtio/virtio_pci_modern.c @@ -563,9 +563,6 @@ static void vp_reset(struct virtio_device *vdev) */ while (vp_modern_get_status(mdev)) msleep(1); - - /* Flush pending VQ/configuration callbacks. */ - vp_synchronize_vectors(vdev); } =20 static int vp_active_vq(struct virtqueue *vq, u16 msix_vec) --=20 MST