From nobody Mon Jun 22 13:25:49 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 3115BC4332F for ; Wed, 23 Mar 2022 08:50:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242934AbiCWIvk (ORCPT ); Wed, 23 Mar 2022 04:51:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242906AbiCWIvf (ORCPT ); Wed, 23 Mar 2022 04:51:35 -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 8E9F473066 for ; Wed, 23 Mar 2022 01:50:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648025405; 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=VkoZGCDazaob935cf0K6/xqwp1grV8y7vA1EUagsdw8=; b=E2BLsoaRp7bqL5g54mC9rJgYyG8Oreov6JgY9i+5FDTRrV+kHKiIcDKJ8ZJyPagL61l0D1 1xArt7LRazHcNe9GEXeMdblW98ye7B4P08ek/rNVNy0WmeShhXdbC573wSRc6MGJrPvdCE +9+j9S6w/mWpmmOn7rFPIum5tl+4ZYE= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-548-LWe4_xpFN_WCNeQbyvw0SA-1; Wed, 23 Mar 2022 04:50:04 -0400 X-MC-Unique: LWe4_xpFN_WCNeQbyvw0SA-1 Received: by mail-qk1-f199.google.com with SMTP id i2-20020a05620a248200b0067b51fa1269so544372qkn.19 for ; Wed, 23 Mar 2022 01:50:04 -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=VkoZGCDazaob935cf0K6/xqwp1grV8y7vA1EUagsdw8=; b=JjtMsfCIOhnD99HHUobP2ZaO1trtHLb0rfoBe///3Wow6LbkAVPtVkGZnYcghHNgs6 lVwLN5bOEaZ0o3wtuIcc/4gxZcSkvjQDEgd8wpYXGlP2H2lbx2+kz19cadGC6GN5F54u 2KRWM7enAbJn+pUc0CQWGd06ZUEJAU8CWJ0CgkAnWTW9s3T9yim7XhHK9ik5RomUqvnL fOQcEctaNexVzl/HK4gevpjYFwtPiO6SmfytqQcAqSBwMD8vV/CNjHQeJdSYNBhgLMzX mO9XZw8+PqsTmS+6QjKcELeV4Bm84vSmZyP6zio3uJI9VeiSEUSnoyGiNqaIIlUfgz+C M4Iw== X-Gm-Message-State: AOAM532pA9FWw9UVGbN9UvYjIkvDG/hKso+8+e2GR9cECAzSDbrZRLqP gexIynQ+9RuW5AHFLRP+Zd0NjqjYKPyr+O7GVnU6oZabwmWAntXiqcF2TZ1+yc/Zf4g8h3ZNEfz NoRs6BGTMiF7Gi+kYKLOqtIer X-Received: by 2002:a05:620a:1a92:b0:67d:b2c2:8311 with SMTP id bl18-20020a05620a1a9200b0067db2c28311mr17908330qkb.594.1648025404185; Wed, 23 Mar 2022 01:50:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJylURIbsHFC5CVM0PxCcg9Ie4RCz+seln0B3QhsU0NKbzEwgOSb1+E5im+z84ivzzgUFUDiHg== X-Received: by 2002:a05:620a:1a92:b0:67d:b2c2:8311 with SMTP id bl18-20020a05620a1a9200b0067db2c28311mr17908319qkb.594.1648025404003; Wed, 23 Mar 2022 01:50:04 -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 j188-20020a3755c5000000b0067d1c76a09fsm10640609qkb.74.2022.03.23.01.50.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 01:50:03 -0700 (PDT) From: Stefano Garzarella To: netdev@vger.kernel.org Cc: Stefan Hajnoczi , Paolo Abeni , Arseny Krasnov , "David S. Miller" , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Stefano Garzarella , "Michael S. Tsirkin" , Asias He , Jakub Kicinski Subject: [PATCH net v2 1/3] vsock/virtio: enable VQs early on probe Date: Wed, 23 Mar 2022 09:49:52 +0100 Message-Id: <20220323084954.11769-2-sgarzare@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220323084954.11769-1-sgarzare@redhat.com> References: <20220323084954.11769-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 --- 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 5afc194a58bb..b1962f8cd502 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 + virtio_device_ready(vdev); + mutex_lock(&vsock->tx_lock); vsock->tx_run =3D true; mutex_unlock(&vsock->tx_lock); --=20 2.35.1 From nobody Mon Jun 22 13:25:49 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 BE923C433FE for ; Wed, 23 Mar 2022 08:50:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242914AbiCWIvu (ORCPT ); Wed, 23 Mar 2022 04:51:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242926AbiCWIvj (ORCPT ); Wed, 23 Mar 2022 04:51:39 -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 83BC574602 for ; Wed, 23 Mar 2022 01:50:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648025409; 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=2tskzl0i4fBaGQ2SA9UFWp+uERMa68xRFlfoMwtqOtQ=; b=Zbp8kpDdjaNxqZi1Ay1Lkf9KDWQ2lHvcHPcpS6GqhaIlZEwXtjSZ+4NU3fhEq4MGkRi8m9 raZeFLG4GnImxL1ncqr3LgMkHSL1ilLtdx1laXTVql2mpLrZcgCIIYnGq1hhy8NSmwMTrT SCNWj8pMFLt0PdaSsh9tv8mKCd16oTE= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-196-KrkRSQDqOC2-CkpgY16PFQ-1; Wed, 23 Mar 2022 04:50:08 -0400 X-MC-Unique: KrkRSQDqOC2-CkpgY16PFQ-1 Received: by mail-qt1-f199.google.com with SMTP id h11-20020ac87d4b000000b002e1c9a3ae51so713809qtb.0 for ; Wed, 23 Mar 2022 01:50:08 -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=2tskzl0i4fBaGQ2SA9UFWp+uERMa68xRFlfoMwtqOtQ=; b=kD1TUEjKiUAmbJDxFyoWTBjTecPodV1MaTn9MVAFLrHtlgmbnbBBGviG1KKFZeIQSC +fyO1Pm7vc8DadHV3eO/DHEEKhviaBPlkfhDX3txyga4uSc8Tryb6OLGQSddumllGjE8 xMhvdINTVqUtEv/4Mv18wjDr2icRGoeFqB3j0UmHzK6kmIRERxc2HHM+1ddaOLpGUAAg MsCPGcKvWkhN1G8H0DphR9m7SQehT7SHMolbKcAbvnYzNBHXh9npbtqRqTnfT+NkcRG5 HN1UBsnLqMMAgfgZEaSqN7MwUOgZRlVGIfJSDEdDRZFEBVmocE6M+72qDPJVb/n7o6oW ahJQ== X-Gm-Message-State: AOAM533UN1Lp4BYGw+P8X6l/vB5Mm65H8ft2qiNZOPWFI7IzS/c4AKrd EvINw9D6aOk6IBZKw+HOYC5EWVgaASawO6G7+tg+w5FRAu4i5n1TfXVE0bddfpyZpiS08XSvuZK /EfPX3eeGHXeoSVo55gogdzBG X-Received: by 2002:a05:620a:24cd:b0:67d:5f50:ef41 with SMTP id m13-20020a05620a24cd00b0067d5f50ef41mr18012805qkn.568.1648025407750; Wed, 23 Mar 2022 01:50:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwwKKClidIuo6B0OT0d5+9jRGkHIXrwcI73KaPwBD6CWDKidHKCMTHM2A18yH6e8LMQdxDzAg== X-Received: by 2002:a05:620a:24cd:b0:67d:5f50:ef41 with SMTP id m13-20020a05620a24cd00b0067d5f50ef41mr18012795qkn.568.1648025407541; Wed, 23 Mar 2022 01:50:07 -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 j188-20020a3755c5000000b0067d1c76a09fsm10640609qkb.74.2022.03.23.01.50.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 01:50:06 -0700 (PDT) From: Stefano Garzarella To: netdev@vger.kernel.org Cc: Stefan Hajnoczi , Paolo Abeni , Arseny Krasnov , "David S. Miller" , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Stefano Garzarella , "Michael S. Tsirkin" , Asias He , Jakub Kicinski Subject: [PATCH net v2 2/3] vsock/virtio: initialize vdev->priv before using VQs Date: Wed, 23 Mar 2022 09:49:53 +0100 Message-Id: <20220323084954.11769-3-sgarzare@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220323084954.11769-1-sgarzare@redhat.com> References: <20220323084954.11769-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 callback. 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 --- net/vmw_vsock/virtio_transport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transp= ort.c index b1962f8cd502..fff67ad39087 100644 --- a/net/vmw_vsock/virtio_transport.c +++ b/net/vmw_vsock/virtio_transport.c @@ -622,6 +622,7 @@ 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; virtio_device_ready(vdev); =20 mutex_lock(&vsock->tx_lock); @@ -641,7 +642,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:49 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 0ED1EC43219 for ; Wed, 23 Mar 2022 08:50:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242956AbiCWIwD (ORCPT ); Wed, 23 Mar 2022 04:52:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242915AbiCWIvr (ORCPT ); Wed, 23 Mar 2022 04:51:47 -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 29A237461C for ; Wed, 23 Mar 2022 01:50:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648025413; 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=OgA1lCzF0b4XjouCMdWAekLZD2KK/T/B0hpIucmcAvY=; b=G5g9aOuf91AvVT5T+uTTLilDIoUbYLjkjJyV0aEyoY86InI8mu2COGfW6Lts7fodtXw1fw fAzaEEytZS1m/XFjHZgYYD+xfXn541bVsgzus1C0gz2NZWSf+mgCGla5SgWLOcbNdzKIXa nbHFNrkOclqwR9holmYgd2xNj/an2N4= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-518-KmcHkz8lNfubVpxz9fVxTw-1; Wed, 23 Mar 2022 04:50:12 -0400 X-MC-Unique: KmcHkz8lNfubVpxz9fVxTw-1 Received: by mail-qv1-f71.google.com with SMTP id o1-20020a0c9001000000b00440e415a3a2so751571qvo.13 for ; Wed, 23 Mar 2022 01:50:11 -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=OgA1lCzF0b4XjouCMdWAekLZD2KK/T/B0hpIucmcAvY=; b=fff1AtbXfyZm5RPzYl/QmOc91ecBOeAxAU1UoSLvtgcIB2utnQUwQuLUA/MZZ8eMzZ 8kP8gEgyYk6bH6OqNFTdog7Sf+6czRCog5Jo+Q1hUso8WTDK0HL/t1C+TPLmKEoosBhB JEj69TtmkltJyjE9nczipUCR7tMOoK/5klGM7U+Thjgwmp++mxpPI3aafUu1TRYSao8o oKheDVDFmpm6jU7B5tsW5oP18a4pOGAW+5XbD6VOF55nnZRNp4BI+O1skgOXcK7QXaok 8wEV/8CPYtkxhdqmB0igCDVpRO4gCzEqJK3NTBNHoyYtRRP8WFb8feCSds7rYYNELkYI b3TQ== X-Gm-Message-State: AOAM530PfvdOidEtDj3u5mn4+j0PSsGWJy+Prjv2+d1+YZaTjYYg0ckJ 2mYxG3PECm0T2Ors/wM2ge3ZkHysU3a48xxjJFJHYI3iIIkAMIhKLfX5/Oivjo4bZNe/7OLSLMy MYRWuQNnscOhjEfH5sxNE4ina X-Received: by 2002:a05:620a:370a:b0:67d:5f35:900f with SMTP id de10-20020a05620a370a00b0067d5f35900fmr17592012qkb.767.1648025411591; Wed, 23 Mar 2022 01:50:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzyPK4ZKA2MkSsVUsQecAaz7gloEHvd5w3N1Q/3d1hjdf5Wr4EaGY3ikaTT6b++I1clHGznQ== X-Received: by 2002:a05:620a:370a:b0:67d:5f35:900f with SMTP id de10-20020a05620a370a00b0067d5f35900fmr17591997qkb.767.1648025411363; Wed, 23 Mar 2022 01:50:11 -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 j188-20020a3755c5000000b0067d1c76a09fsm10640609qkb.74.2022.03.23.01.50.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 01:50:10 -0700 (PDT) From: Stefano Garzarella To: netdev@vger.kernel.org Cc: Stefan Hajnoczi , Paolo Abeni , Arseny Krasnov , "David S. Miller" , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Stefano Garzarella , "Michael S. Tsirkin" , Asias He , Jakub Kicinski Subject: [PATCH net v2 3/3] vsock/virtio: read the negotiated features before using VQs Date: Wed, 23 Mar 2022 09:49:54 +0100 Message-Id: <20220323084954.11769-4-sgarzare@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220323084954.11769-1-sgarzare@redhat.com> References: <20220323084954.11769-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 and tell the device that the driver is ready in the virtio_vsock_probe(). Fixes: 53efbba12cc7 ("virtio/vsock: enable SEQPACKET for transport") Suggested-by: Michael S. Tsirkin Signed-off-by: Stefano Garzarella Reviewed-by: Stefan Hajnoczi --- 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 fff67ad39087..1244e7cf585b 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; virtio_device_ready(vdev); =20 @@ -639,9 +642,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