From nobody Mon Jun 22 13:25:10 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17A6AC433EF for ; Wed, 23 Mar 2022 17:36:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343681AbiCWRiY (ORCPT ); Wed, 23 Mar 2022 13:38:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343741AbiCWRiI (ORCPT ); Wed, 23 Mar 2022 13:38:08 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 790E97EA00 for ; Wed, 23 Mar 2022 10:36:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648056997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=B/auHUunRKmj44ZRhZ4Uljn8hCNOGxN6qXBgu6Qo8Sg=; b=QKHyfpuRSUuiZJtghqAfKumY87h4n23tRuTtMD6kWlm1KMgNuIscxae+pxJ05Vv/aAs6Mu MSMUOzUBCf0YJuorfzB6UMoINsDOCPxpG36Rddji/EyGNMoakqzvKt/7ZqVMlqSchW3Se4 uN9kzc9f7i+MwHc+d8fnZbFE0YEt+vA= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-454-9PCtHSzuPSalO9GqmRquQQ-1; Wed, 23 Mar 2022 13:36:36 -0400 X-MC-Unique: 9PCtHSzuPSalO9GqmRquQQ-1 Received: by mail-qk1-f197.google.com with SMTP id y140-20020a376492000000b0067b14129a63so1469856qkb.9 for ; Wed, 23 Mar 2022 10:36:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B/auHUunRKmj44ZRhZ4Uljn8hCNOGxN6qXBgu6Qo8Sg=; b=6YJ8J8Cmvp7pPB58o6XMMxYxfjZWM6/BrlL3uiLKGg6G4exA7pkB2xcJLde5QAnnvc NDMrPilN6mn5lSThe6Znk8d/JDTDGGc5fUlkcQOdkHM+XrIsydJav6EkCrs25UNrhbgi iCHtxisZJ/DdslWDNoJ8SEbRYWNF/cWItvvfeoS7SVo0LyWDI3x/gLM5sjaouWrOfZ+6 8D9xUm5WMy3yA/r3IyYZX/i8/mPOiWPnN6gxMjTeOL+Mflz/AdWQTxOeE4hgJ+QGTDsy qznV9L9r+7s6OODHtHCEdr4z7/bhGMHGvHSSGbsua5DCaaTUSVp7L56sgxNwDD9gAO7x Md5g== X-Gm-Message-State: AOAM5321JHr7SajVdXRPylUGX54Spp+NxQNSF9XTM97ptq3MlfJFXZYl 34rMTnoyhKIjaNzakYEkuTXeq3xEYCpnJ6Ijhmm+dXZPt6pqjle7pGgUgw49bytDmLwcq7w0euC 8Uqn7EfvNBFJC2Bc7D1mWTVpf X-Received: by 2002:a05:620a:15cf:b0:67d:f378:5cf8 with SMTP id o15-20020a05620a15cf00b0067df3785cf8mr745288qkm.354.1648056995707; Wed, 23 Mar 2022 10:36:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTUiRkn6eha8XU1o1IqDFFHEY3objSBoDDAqSNfC0KM2Zb1piJWjlVMzOTuJp+NKhZ0Bg0SA== X-Received: by 2002:a05:620a:15cf:b0:67d:f378:5cf8 with SMTP id o15-20020a05620a15cf00b0067df3785cf8mr745251qkm.354.1648056995111; Wed, 23 Mar 2022 10:36:35 -0700 (PDT) Received: from step1.redhat.com (host-87-12-25-114.business.telecomitalia.it. [87.12.25.114]) by smtp.gmail.com with ESMTPSA id h14-20020a05622a170e00b002e1a65754d8sm476127qtk.91.2022.03.23.10.36.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 10:36:34 -0700 (PDT) From: Stefano Garzarella To: netdev@vger.kernel.org Cc: Jakub Kicinski , "Michael S. Tsirkin" , Asias He , Arseny Krasnov , Stefan Hajnoczi , Paolo Abeni , linux-kernel@vger.kernel.org, Stefano Garzarella , virtualization@lists.linux-foundation.org, kvm@vger.kernel.org, "David S. Miller" Subject: [PATCH net v3 1/3] vsock/virtio: initialize vdev->priv before using VQs Date: Wed, 23 Mar 2022 18:36:23 +0100 Message-Id: <20220323173625.91119-2-sgarzare@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220323173625.91119-1-sgarzare@redhat.com> References: <20220323173625.91119-1-sgarzare@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When we fill VQs with empty buffers and kick the host, it may send an interrupt. `vdev->priv` must be initialized before this since it is used in the virtqueue callbacks. Fixes: 0deab087b16a ("vsock/virtio: use RCU to avoid use-after-free on the_= virtio_vsock") Suggested-by: Michael S. Tsirkin Signed-off-by: Stefano Garzarella Acked-by: Michael S. Tsirkin Reviewed-by: Stefan Hajnoczi --- net/vmw_vsock/virtio_transport.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transp= ort.c index 5afc194a58bb..3e5513934c9f 100644 --- a/net/vmw_vsock/virtio_transport.c +++ b/net/vmw_vsock/virtio_transport.c @@ -622,6 +622,8 @@ static int virtio_vsock_probe(struct virtio_device *vde= v) INIT_WORK(&vsock->event_work, virtio_transport_event_work); INIT_WORK(&vsock->send_pkt_work, virtio_transport_send_pkt_work); =20 + vdev->priv =3D vsock; + mutex_lock(&vsock->tx_lock); vsock->tx_run =3D true; mutex_unlock(&vsock->tx_lock); @@ -639,7 +641,6 @@ static int virtio_vsock_probe(struct virtio_device *vde= v) if (virtio_has_feature(vdev, VIRTIO_VSOCK_F_SEQPACKET)) vsock->seqpacket_allow =3D true; =20 - vdev->priv =3D vsock; rcu_assign_pointer(the_virtio_vsock, vsock); =20 mutex_unlock(&the_virtio_vsock_mutex); --=20 2.35.1 From nobody Mon Jun 22 13:25:10 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68EB9C43217 for ; Wed, 23 Mar 2022 17:36:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343647AbiCWRiO (ORCPT ); Wed, 23 Mar 2022 13:38:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343771AbiCWRiM (ORCPT ); Wed, 23 Mar 2022 13:38:12 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 007F77E0A7 for ; Wed, 23 Mar 2022 10:36:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648057001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=badQ4iNux1pPz/7wSA5tFhWc+QQEkhPUp5sQLckQMkQ=; b=YgCi3ETzvVxKO7J3Ij6LTWXsFJo8aOInV3YUPVz8C/1+JEhDwHKpHHbLFUbYIhul0eK1eP h3398XS2R5DFnn/JebuJ/IVtKubEhT6dwQ3hl5ZonhFxvv2DQ6F5xRv+v+BDX1P+MErPKS JzYmJuMGaR+R38XbZMG1wDgHylexshU= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-488-dKppQYoPMH6kFmEopX52Bw-1; Wed, 23 Mar 2022 13:36:39 -0400 X-MC-Unique: dKppQYoPMH6kFmEopX52Bw-1 Received: by mail-qk1-f198.google.com with SMTP id c19-20020a05620a0cf300b005f17891c015so1455708qkj.18 for ; Wed, 23 Mar 2022 10:36:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=badQ4iNux1pPz/7wSA5tFhWc+QQEkhPUp5sQLckQMkQ=; b=f+jWUVW/rJd2/jkI7Qi9NXo95VqUxJK3q1jWc5Bi7m1BmyBxZoKzzQSe6/P9I4ybdf CaMDsxRKn6pJZV1+UtgsUr7LBsiq6TqQ1WWsRCl2baC20P03/j3I7CqxN0CRzaoGV6TV BpYqTAKHw2xzfHsDMTavFqLfS3eArKj8dPh7iScj2LNQNCP2A9SdHWWwdxpcZqzT8Yfm OQ75Q9jhYqnCLGx8SUdvMy4HyBAUAGjhs8Qn+0n94PlNaW++dWHVQw7SWLmVxkzr6zi4 0RhVYIr+qUf1U2hbf+FMenlgaEPG+6qtOGFKbqyicjvuXqVIbHWbVLIsnsTrXqyIV4TZ fryQ== X-Gm-Message-State: AOAM533XveoiQYYvKUwg1QN8xkKhLJhtbcxXj+R0d5XpD6npgwEfcCm8 alhaD3MEiDAmTXOpx5RLAZFDAc/et9egS/kjfE0+Ee4zTJbUe20sIt7AstKlgz3dLw1muyqxwvp hCneD6G0GHa7n0hUgTsrjrXE1 X-Received: by 2002:ae9:ed96:0:b0:67e:c89e:480a with SMTP id c144-20020ae9ed96000000b0067ec89e480amr718878qkg.274.1648056999445; Wed, 23 Mar 2022 10:36:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJydhjsyMjk7m4UHfPJYXhDmCRpm61QiwyPkqiHwWTFXbdWyL3aM7kxuaIS4gs2HZKKewMIaMg== X-Received: by 2002:ae9:ed96:0:b0:67e:c89e:480a with SMTP id c144-20020ae9ed96000000b0067ec89e480amr718839qkg.274.1648056998815; Wed, 23 Mar 2022 10:36:38 -0700 (PDT) Received: from step1.redhat.com (host-87-12-25-114.business.telecomitalia.it. [87.12.25.114]) by smtp.gmail.com with ESMTPSA id h14-20020a05622a170e00b002e1a65754d8sm476127qtk.91.2022.03.23.10.36.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 10:36:38 -0700 (PDT) From: Stefano Garzarella To: netdev@vger.kernel.org Cc: Jakub Kicinski , "Michael S. Tsirkin" , Asias He , Arseny Krasnov , Stefan Hajnoczi , Paolo Abeni , linux-kernel@vger.kernel.org, Stefano Garzarella , virtualization@lists.linux-foundation.org, kvm@vger.kernel.org, "David S. Miller" Subject: [PATCH net v3 2/3] vsock/virtio: read the negotiated features before using VQs Date: Wed, 23 Mar 2022 18:36:24 +0100 Message-Id: <20220323173625.91119-3-sgarzare@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220323173625.91119-1-sgarzare@redhat.com> References: <20220323173625.91119-1-sgarzare@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Complete the driver configuration, reading the negotiated features, before using the VQs in the virtio_vsock_probe(). Fixes: 53efbba12cc7 ("virtio/vsock: enable SEQPACKET for transport") Suggested-by: Michael S. Tsirkin Reviewed-by: Stefan Hajnoczi Signed-off-by: Stefano Garzarella Acked-by: Michael S. Tsirkin --- net/vmw_vsock/virtio_transport.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transp= ort.c index 3e5513934c9f..3954d3be9083 100644 --- a/net/vmw_vsock/virtio_transport.c +++ b/net/vmw_vsock/virtio_transport.c @@ -622,6 +622,9 @@ static int virtio_vsock_probe(struct virtio_device *vde= v) INIT_WORK(&vsock->event_work, virtio_transport_event_work); INIT_WORK(&vsock->send_pkt_work, virtio_transport_send_pkt_work); =20 + if (virtio_has_feature(vdev, VIRTIO_VSOCK_F_SEQPACKET)) + vsock->seqpacket_allow =3D true; + vdev->priv =3D vsock; =20 mutex_lock(&vsock->tx_lock); @@ -638,9 +641,6 @@ static int virtio_vsock_probe(struct virtio_device *vde= v) vsock->event_run =3D true; mutex_unlock(&vsock->event_lock); =20 - if (virtio_has_feature(vdev, VIRTIO_VSOCK_F_SEQPACKET)) - vsock->seqpacket_allow =3D true; - rcu_assign_pointer(the_virtio_vsock, vsock); =20 mutex_unlock(&the_virtio_vsock_mutex); --=20 2.35.1 From nobody Mon Jun 22 13:25:10 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84417C433F5 for ; Wed, 23 Mar 2022 17:37:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229768AbiCWRio (ORCPT ); Wed, 23 Mar 2022 13:38:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343653AbiCWRiP (ORCPT ); Wed, 23 Mar 2022 13:38:15 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DA7A67EB23 for ; Wed, 23 Mar 2022 10:36:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648057005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xWGdi1UqdjNcgIoNh0luPYt8s0RItagontqZa8O7xH4=; b=DNWJKdZiCyrL5IIAvSeVGoH5AkolypKMjOjAedZiKbeaQuQXDZF7I6lZN4P5jMiMnup0C0 iYCDw3FrKxsfuCs9oFV8YgEy7G9z+cKJCwnfcsVJh5F4KW/wRL0lcKQNW0s+QzbiA3wKlF ynyht0H8sDHgikusV77QxtwxrHmxOJA= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-59-zPZlj1LOPeG6gSSM9jG44A-1; Wed, 23 Mar 2022 13:36:43 -0400 X-MC-Unique: zPZlj1LOPeG6gSSM9jG44A-1 Received: by mail-qv1-f72.google.com with SMTP id j8-20020ad454c8000000b0044111c17099so1811513qvx.0 for ; Wed, 23 Mar 2022 10:36:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xWGdi1UqdjNcgIoNh0luPYt8s0RItagontqZa8O7xH4=; b=Q6ieRAT4UqpHMpOYYAl3g62ETFGzIrD7Gkg/P33AaUVKmDC7DL6pCVgvMXtIJBj2Od bw3UWcOOOcTerklRTRzZIlY/v1LSn6ky1oyuqcTsZlp2I26GqBKnOz7n9CuNBM39PYM8 2Zz5bqJ4OBai/YPEqgC1rJ9FWbU6JWZeS7o7N8WN4zUMpn1vFv9XJTpULKYmp0N49W7o S2yx6GKHhPGw5inrAya8VyRW4FI1hqVkBj6bLIEaOa7Zrec9v+9vjsOIQHvDtHN3MSF7 9NUozOWdpvG4BQuc8+xR8C+9OnKo1YOe6wOBDrksI5uR6l+Q7d22+qDmbgE2JAxWo9YE GzoA== X-Gm-Message-State: AOAM532zYAbmT8mgmbpvUb/ZpLOMmJT+FbzagBbTDuijnUE9hPnKxl6o d88nbw06T5dgUBdpqAX8JFS129tXl92gZp3HBkAXcdgoSBdh2viMlFGgwXZzduAU48APvhbUXGP 2JfNXDP4TGlRoBq7DflWDG/c6 X-Received: by 2002:ac8:5dcf:0:b0:2e1:baf1:502d with SMTP id e15-20020ac85dcf000000b002e1baf1502dmr806270qtx.635.1648057003041; Wed, 23 Mar 2022 10:36:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTpPllZkLf2utvzNGXglhcnTlOLeIMc4F/54ZX4LmPDik4Rh6CKZ6+/p5IKQ52dEZjvQk8DA== X-Received: by 2002:ac8:5dcf:0:b0:2e1:baf1:502d with SMTP id e15-20020ac85dcf000000b002e1baf1502dmr806235qtx.635.1648057002476; Wed, 23 Mar 2022 10:36:42 -0700 (PDT) Received: from step1.redhat.com (host-87-12-25-114.business.telecomitalia.it. [87.12.25.114]) by smtp.gmail.com with ESMTPSA id h14-20020a05622a170e00b002e1a65754d8sm476127qtk.91.2022.03.23.10.36.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 10:36:41 -0700 (PDT) From: Stefano Garzarella To: netdev@vger.kernel.org Cc: Jakub Kicinski , "Michael S. Tsirkin" , Asias He , Arseny Krasnov , Stefan Hajnoczi , Paolo Abeni , linux-kernel@vger.kernel.org, Stefano Garzarella , virtualization@lists.linux-foundation.org, kvm@vger.kernel.org, "David S. Miller" Subject: [PATCH net v3 3/3] vsock/virtio: enable VQs early on probe Date: Wed, 23 Mar 2022 18:36:25 +0100 Message-Id: <20220323173625.91119-4-sgarzare@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220323173625.91119-1-sgarzare@redhat.com> References: <20220323173625.91119-1-sgarzare@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" virtio spec requires drivers to set DRIVER_OK before using VQs. This is set automatically after probe returns, but virtio-vsock driver uses VQs in the probe function to fill rx and event VQs with new buffers. Let's fix this, calling virtio_device_ready() before using VQs in the probe function. Fixes: 0ea9e1d3a9e3 ("VSOCK: Introduce virtio_transport.ko") Signed-off-by: Stefano Garzarella Acked-by: Michael S. Tsirkin Reviewed-by: Stefan Hajnoczi --- net/vmw_vsock/virtio_transport.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transp= ort.c index 3954d3be9083..ba1c8cc0c467 100644 --- a/net/vmw_vsock/virtio_transport.c +++ b/net/vmw_vsock/virtio_transport.c @@ -627,6 +627,8 @@ static int virtio_vsock_probe(struct virtio_device *vde= v) =20 vdev->priv =3D vsock; =20 + virtio_device_ready(vdev); + mutex_lock(&vsock->tx_lock); vsock->tx_run =3D true; mutex_unlock(&vsock->tx_lock); --=20 2.35.1