From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 E168A382283 for ; Tue, 8 Sep 2026 05:39:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788845995; cv=none; b=MQ3ba9Bpw8nIr/bmHfSG0bE7g138ApykC+SR1jKWuZPNB9IHX2zir9W07SZZYO8E0nBiwvvSkSN2PYDjFvlI+EyR7HhPDRiyKcpO4kxOE7BSLZdqmu5pRBGUbU366q6P8Rz5ZbT0N6rjo3UQp54op6HjoPZrF8w+2Kwes/3/OkM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788845995; c=relaxed/simple; bh=Z1mqy3qNtdRxgKwEWqMkljOG1k4ekHUKiS2/6Ca17Yo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XgpkxQPUvHR6wcxbYY4OXWUIe5yEum27tzaWBDUQI9LCT+rdaWvj05UOB6yHp1/UEKe352NIWWRIhZN6O08aRhIELkT9+KCM/U4hF8IWj7g49a+oppgeT5w6AMwdt9D0q5weuzpz0OlUr2mvFmVEwLkuNIv4iDt4lfmgEN+cv8I= 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=UmjpCI8s; arc=none smtp.client-ip=209.85.128.47 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="UmjpCI8s" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-49a97714f5dso40940855e9.0 for ; Mon, 07 Sep 2026 22:39:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788845988; x=1789450788; 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=l0UrpxibHZnDBNXE1bN5qrJqc7sTw2Bd+aGpZLtd0Ug=; b=UmjpCI8s7t3E+4yRhKMceIDOKBrqYNOKBZjVaryoL+Wx8/5meM4sQ9XpZurZfH3zlS fm9dPFfnx8NWhVMpEnO10cGpwzMYuIbKyGY2YuHQfXYqFDhg6uepkDSAbaDSU9HEDtlu MwjTnuF26Niwb9CNviqGtmx4WwjStW+BJ1nPjnxMHE5c1ZoVPpi7WYhT0dm2ReieAxbi CEV1OpQOMg3cbWpcFghWbSrBG5sOmvQMxBpbpHBVK0haUEZzsGRlCb+OqTdIr9oBGio4 6sDz2wkoyVcw+4UAETBV79kQRFAvgWv6+QUPewowi4qDn3CuhbBW78rMGb81BCHJCwo1 IlvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788845988; x=1789450788; 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=l0UrpxibHZnDBNXE1bN5qrJqc7sTw2Bd+aGpZLtd0Ug=; b=hO0T86qGoLZAPzInMvhXZRK23eJtKHO94KgJypWgzbyzd6KnGElJzfeoO9DUFdpI1R B/3mW70mFjMcOy15AC+968PR3ToE+u1+rvlD7A1xM3w/fei2XOlgPNok6HiqdEKXxNHe WB2ZWyVF1Fb1O3CrHkNnrN3qM+cAtCvTpjNSW291+wsOKDLpsG4Vi2ksUWg1+tD6mf59 +3xJx/MnZWZNjS5GgdhICf425z6ff5QQsLHLxiUZEBTMvr0ug4VLUteoZzNSGwtKv3Lz IsYpm/+oc92bXNt/jfsF32mzdqR4A2hrP4tEsPIWEOjCW8n3PKpLPKGuk/8Y+U6S+vv+ ytwg== X-Forwarded-Encrypted: i=1; AKwUvBxvHGFmMGeuX4UlQwiLYm68CVJRGa05r+unwBIext+3MEGjgv93XDdsaPgeGWQgRArgQQW9mKuz2law@vger.kernel.org X-Gm-Message-State: AFuF++nlORDNuiTg6KRMJUz2CoPF85o50j8vmer/AB06GaPDrZ5/GjXh Kr0awK+Nih7WAEZNhm0KYqSTRrVrRjFsErdbSjG5WeI08wEgHlOuBND2 X-Gm-Gg: AYBFou0TER/wxe08iOlGY7Cx48Nx/IF9/F/At7E94zKDuetbg/7l/EbK8WViK0RrgKl WqR/2IPLcDanCHKdKyrUAxLyRK39ZhODHarSevEdnq6r62YqTlhC+cCZKBB+tyFBUs90+U+Lj76 fIkhp6vQ1LhKj+cS8xNMUwX0/CXSGNP7T9Oqyo2Lsy4Q21e6kpfYd49+w6Kr4kEQ8hnNFyhoENa 5I+wYdKwliLkbWBkxuPp3IH/hafPqnfkfDoxp5Kcn4KqkRXn6wZfTcCAklbpjLRKn6vwDM4qazi BMcPLHg4sNCcjhsMDEEHz5olBjHeKH1RZeq+NaPN1QQYV3vLxus/VR1jTuisMe5F2xJvghiP7Rl ywaX+kTf8HieDJZ6sQ63yhDR4zk2iEHroqyFlRklS7ueVkj9+bmKLvXDOJEaGW+loMmbMGD+GJz 2W8ObtpxYsEZsYXdqEH5WlzOVsyJwf0uOTGiWxInE1E6fsrJO//dzolyblz/5AUDxl/Z+Scw4gz ncBkZRZCM90GLoekLnxAGZBUQ2skNLGNKbauUFmmfsDSlUMQQRmuu16y9S6JITHCGvtbG3yxsYp yASJeiE37URQNTJXkAwIsROoVrAh53M= X-Received: by 2002:a05:600c:3587:b0:49d:17d8:abec with SMTP id 5b1f17b1804b1-49d17d8abf5mr31972855e9.21.1788845987998; Mon, 07 Sep 2026 22:39:47 -0700 (PDT) Received: from localhost.localdomain (dynamic-095-117-170-066.95.117.pool.telefonica.de. [95.117.170.66]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee7fec25sm523841335e9.13.2026.09.07.22.39.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 07 Sep 2026 22:39:47 -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, Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle Subject: [PATCH v3 6/6] virtio_vdpa: implement synchronize_cbs() Date: Tue, 8 Sep 2026 07:38:17 +0200 Message-Id: <20260908053817.26065-7-kmehltretter@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20260908053817.26065-1-kmehltretter@gmail.com> References: <20260908053817.26065-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_vdpa relies on the core's synchronize_rcu() fallback for callback synchronization. That covers IRQ handlers and sections with interrupts, preemption or bottom halves disabled. virtio_vdpa does not enforce any of those contexts when a vDPA driver invokes a callback. Add an SRCU domain per device and enter it around the virtqueue and config callbacks. Implement synchronize_cbs() with synchronize_srcu() so it covers the callbacks regardless of the calling context. SRCU uses per-CPU reader accounting, avoiding a single callback lock shared by all queues. Cover the config callback too, as virtio-pci does for its config vector. Assisted-by: LLM Signed-off-by: Karl Mehltretter --- drivers/virtio/virtio_vdpa.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c index 6bcf4567a929..f9559b6b2e0b 100644 --- a/drivers/virtio/virtio_vdpa.c +++ b/drivers/virtio/virtio_vdpa.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -27,6 +28,7 @@ struct virtio_vdpa_device { struct virtio_device vdev; struct vdpa_device *vdpa; + struct srcu_struct cb_srcu; u64 features; }; @@ -114,8 +116,11 @@ static bool virtio_vdpa_notify_with_data(struct virtqueue *vq) static irqreturn_t virtio_vdpa_config_cb(void *private) { struct virtio_vdpa_device *vd_dev = private; + int idx; + idx = srcu_read_lock(&vd_dev->cb_srcu); virtio_config_changed(&vd_dev->vdev); + srcu_read_unlock(&vd_dev->cb_srcu, idx); return IRQ_HANDLED; } @@ -123,8 +128,22 @@ static irqreturn_t virtio_vdpa_config_cb(void *private) static irqreturn_t virtio_vdpa_virtqueue_cb(void *private) { struct virtqueue *vq = private; + struct virtio_vdpa_device *vd_dev = to_virtio_vdpa_device(vq->vdev); + irqreturn_t ret; + int idx; + + idx = srcu_read_lock(&vd_dev->cb_srcu); + ret = vring_interrupt(0, vq); + srcu_read_unlock(&vd_dev->cb_srcu, idx); + + return ret; +} + +static void virtio_vdpa_synchronize_cbs(struct virtio_device *vdev) +{ + struct virtio_vdpa_device *vd_dev = to_virtio_vdpa_device(vdev); - return vring_interrupt(0, vq); + synchronize_srcu(&vd_dev->cb_srcu); } static struct virtqueue * @@ -440,6 +459,7 @@ static const struct virtio_config_ops virtio_vdpa_config_ops = { .reset = virtio_vdpa_reset, .find_vqs = virtio_vdpa_find_vqs, .del_vqs = virtio_vdpa_del_vqs, + .synchronize_cbs = virtio_vdpa_synchronize_cbs, .get_features = virtio_vdpa_get_features, .finalize_features = virtio_vdpa_finalize_features, .bus_name = virtio_vdpa_bus_name, @@ -454,6 +474,7 @@ static void virtio_vdpa_release_dev(struct device *_d) struct virtio_vdpa_device *vd_dev = container_of(vdev, struct virtio_vdpa_device, vdev); + cleanup_srcu_struct(&vd_dev->cb_srcu); kfree(vd_dev); } @@ -467,6 +488,11 @@ static int virtio_vdpa_probe(struct vdpa_device *vdpa) if (!vd_dev) return -ENOMEM; + if (init_srcu_struct(&vd_dev->cb_srcu)) { + kfree(vd_dev); + return -ENOMEM; + } + vd_dev->vdev.dev.parent = vdpa->map ? &vdpa->dev : vdpa_get_map(vdpa).dma_dev; vd_dev->vdev.dev.release = virtio_vdpa_release_dev; @@ -489,10 +515,12 @@ static int virtio_vdpa_probe(struct vdpa_device *vdpa) return 0; err: - if (reg_dev) + if (reg_dev) { put_device(&vd_dev->vdev.dev); - else + } else { + cleanup_srcu_struct(&vd_dev->cb_srcu); kfree(vd_dev); + } return ret; } -- 2.39.5 (Apple Git-154)