Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
From:   Alexandru Matei <alexandru.matei@uipath.com>
To:     Stefan Hajnoczi <stefanha@redhat.com>,
        Stefano Garzarella <sgarzare@redhat.com>,
        "David S . Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>
Cc:     kvm@vger.kernel.org, virtualization@lists.linux-foundation.org,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        Alexandru Matei <alexandru.matei@uipath.com>,
        Mihai Petrisor <mihai.petrisor@uipath.com>,
        Viorel Canja <viorel.canja@uipath.com>
Subject: [PATCH v3] vsock/virtio: initialize the_virtio_vsock before using VQs
Date:   Mon, 23 Oct 2023 22:22:07 +0300
Message-Id: <20231023192207.1804-1-alexandru.matei@uipath.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cG4QM/yF8eNJkXZMOojXq1sRz8WpORw/x42Qe4fuqtYuXLU/KU5KdKokKS1G?=
 =?us-ascii?Q?vSBSYMtw1RuO0vUg50ruolQ42g8qV5AmgiAMhELATomjWpwpodLbUsVElYzn?=
 =?us-ascii?Q?y9yYVQYrva+GkobLU9obCoNFsfnqPzMwXbXQAqVPKw1EQz5l4Anho3HJjhnZ?=
 =?us-ascii?Q?+22/LxAsxccSSY36I6y5ycltLL9ilv0EdV9K1nHjhk7xN5YBauqDy463NaUc?=
 =?us-ascii?Q?OQ2flaR4rMOp7tgxx/8kRy736RjWpb/kcC2tTB7Hi7EwbE5T+SBwymcVHV6G?=
 =?us-ascii?Q?GivMXfqed9Rd2SSfV2uEci6cAsg5N9puOcPrkBIY8h0EAxSlN2o5/3FJiAmu?=
 =?us-ascii?Q?bQysXs9hU9WUg6JxAjjaSb8NKLvsVF7Dh6wAdnxhgk1wRaEcQcn3jfVVxqSx?=
 =?us-ascii?Q?86ntZ6SD1Bd7CjRrp2+f8CbSct/qqa7I16NGaPkp218gIA351WCJMp4PV1ca?=
 =?us-ascii?Q?+bQvAyTHrrs+0uu7eLredRnvpw34Pdh2AnyKKo3EZwj+FJqi0C0r94s4SrIh?=
 =?us-ascii?Q?U+NLpIrXygc2mc8ocb7jL7dscHObTj8smwG+Z7bEQlblahSBl4/osDkjlPix?=
 =?us-ascii?Q?RYG62ixYJRQPf+CKeAdwjjUW4m9OiAmqN+Hje9vzrOATVH6gsz/ztxKUkOLn?=
 =?us-ascii?Q?+hYqU4ROJLo5xhpGxBazbCqjWeBNSBKbgRFbgJ/EPjQOgfkWurzIk77o7VpA?=
 =?us-ascii?Q?dJQDWKiTM0RCK9qBM5qbshzE9nLlbSbQhH7+58dK0C9Pj1idNdoXUqQmwZKx?=
 =?us-ascii?Q?H0k8mY/oFx6lY33BU8qU6AKjU6698xajppD7uQxNdndqRWUUZrzS+L4arl17?=
 =?us-ascii?Q?/HQmV6ybVRF9wxciINH0RSGJyO1JRlLCQSOMzQ+J1X3UEqF22lDZEcXXCSLK?=
 =?us-ascii?Q?Qua7fzASBxSpOyajiqeHTlg3DxBK8aOOaz7l1M7cJux2ETi6aobQW/mix/Zk?=
 =?us-ascii?Q?/oE2sbq25+xfPVzftTU9trczeI4kJWmoi5PxrSOPjMz/kvBBXeKbvQiUEyyn?=
 =?us-ascii?Q?vebbgdr0Sil7mnoD6D54d99Mafg8epSt7LfLnS6Z5DPpHpenxlkEwTHSyNvm?=
 =?us-ascii?Q?qrUdsHRAIkYgJOn6jV4J7rWQTKclv0f3JfXnMjJ19CyYE9RB8wGHwKBQxV4+?=
 =?us-ascii?Q?iGKKzuGXXWd+pFmJBEpcGfprGJ5P9C1S9PAjUdezilFfW/aXNYP1og/RDw0G?=
 =?us-ascii?Q?lt+eycW56Si0fW2otBUpC4Y72FWbs1/GTm9tUb3zam1GERG0BIvbLPnk/kw+?=
 =?us-ascii?Q?akXHoLTxeiTaJ90E6MgTxlMUAigi/5ZXj1nf7jSu/oW6vbxp3VJwB3G+0H+e?=
 =?us-ascii?Q?DYyy/DrN+5oA5q46r2xlUL0lMGmdUtm5dPM67LPIVx9OyCuAqiFvQxFP1+hj?=
 =?us-ascii?Q?QOa0ZONDNI+tcjePGb0k/8mNnuC8hs+/6esWiBhb7sxmPilzBJBa7yP/uvO1?=
 =?us-ascii?Q?EuTPzq9WXebdwwfD+lyjLSrG/6N+q1yVbTyFDJA3kLl7IugsupyrwxlMq7jy?=
 =?us-ascii?Q?l2RbAPMNqc1CCvtPqyybW01R/8ip5zrqw1JORHKZzoNS1KciAUTrieZm6APl?=
 =?us-ascii?Q?aOOKjzRyYgKDJV8SuN9pJ69TyS20MDYjYdXYh3n2qlRqXFONKgL+EsuVOHcQ?=
 =?us-ascii?Q?3Q=3D=3D?=
X-OriginatorOrg: uipath.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f7dffa99-34dc-45f0-436f-08dbd3fd701a
X-MS-Exchange-CrossTenant-AuthSource: VI1PR02MB4527.eurprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Oct 2023 19:22:46.5870
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: d8353d2a-b153-4d17-8827-902c51f72357
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: lqwxDNakmtCHWeOv9C7rC+vGfhOwfScjSfuj+K1JSX3fD+5PZHFuuXamQ77VkUFSRFVwvFqMZpABHIZGttqk+IYaJAOu67u1zubZUFJDL7A=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR02MB5947
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE
        autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 23 Oct 2023 12:23:31 -0700 (PDT)

Once VQs are filled with empty buffers and we kick the host, it can send
connection requests. If the_virtio_vsock is not initialized before,
replies are silently dropped and do not reach the host.

virtio_transport_send_pkt() can queue packets once the_virtio_vsock is
set, but they won't be processed until vsock->tx_run is set to true. We
queue vsock->send_pkt_work when initialization finishes to send those
packets queued earlier.

Fixes: 0deab087b16a ("vsock/virtio: use RCU to avoid use-after-free on the_virtio_vsock")
Signed-off-by: Alexandru Matei <alexandru.matei@uipath.com>
---
v3:
- renamed vqs_fill to vqs_start and moved tx_run initialization to it
- queued send_pkt_work at the end of initialization to send packets queued earlier
v2: 
- split virtio_vsock_vqs_init in vqs_init and vqs_fill and moved 
  the_virtio_vsock initialization after vqs_init

 net/vmw_vsock/virtio_transport.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
index e95df847176b..c0333f9a8002 100644
--- a/net/vmw_vsock/virtio_transport.c
+++ b/net/vmw_vsock/virtio_transport.c
@@ -555,6 +555,11 @@ static int virtio_vsock_vqs_init(struct virtio_vsock *vsock)
 
 	virtio_device_ready(vdev);
 
+	return 0;
+}
+
+static void virtio_vsock_vqs_start(struct virtio_vsock *vsock)
+{
 	mutex_lock(&vsock->tx_lock);
 	vsock->tx_run = true;
 	mutex_unlock(&vsock->tx_lock);
@@ -568,8 +573,6 @@ static int virtio_vsock_vqs_init(struct virtio_vsock *vsock)
 	virtio_vsock_event_fill(vsock);
 	vsock->event_run = true;
 	mutex_unlock(&vsock->event_lock);
-
-	return 0;
 }
 
 static void virtio_vsock_vqs_del(struct virtio_vsock *vsock)
@@ -664,6 +667,9 @@ static int virtio_vsock_probe(struct virtio_device *vdev)
 		goto out;
 
 	rcu_assign_pointer(the_virtio_vsock, vsock);
+	virtio_vsock_vqs_start(vsock);
+
+	queue_work(virtio_vsock_workqueue, &vsock->send_pkt_work);
 
 	mutex_unlock(&the_virtio_vsock_mutex);
 
@@ -736,6 +742,9 @@ static int virtio_vsock_restore(struct virtio_device *vdev)
 		goto out;
 
 	rcu_assign_pointer(the_virtio_vsock, vsock);
+	virtio_vsock_vqs_start(vsock);
+
+	queue_work(virtio_vsock_workqueue, &vsock->send_pkt_work);
 
 out:
 	mutex_unlock(&the_virtio_vsock_mutex);
-- 
2.25.1