Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
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 v4] vsock/virtio: initialize the_virtio_vsock before using VQs
Date:   Tue, 24 Oct 2023 22:17:42 +0300
Message-Id: <20231024191742.14259-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?gzYBpIFozhgcP0etyJZHMGTJaJZ2YD4v0RTe8EiUh92U/YvaE/bA9Se6Z01E?=
 =?us-ascii?Q?7ooIvYIz0hMtmTakr1gFaAh5ZxAlPZVd4ueAzAUE7g90LLmaRkKmvTQQUbjh?=
 =?us-ascii?Q?nQP2I0eHAe/TiVShJKHJBflOX+5kbzHsPGXOgENKu4fR/BcLU6ZlyaIawcdu?=
 =?us-ascii?Q?ZqLUNJjvLIwOZfmKrkF0bI9PdFwDFF3E+AVKILLqH3gfX3ZWNT16qvj4L1tE?=
 =?us-ascii?Q?m57Wyn7EjzAZ/P0LcI7ddx9yL6n8QPyXg1groi+WexNNi7ShoHvAg31ZReoy?=
 =?us-ascii?Q?5nzIrDXYuBDu4D4dtVHmSJS8v+IYXdF4nk9BGHBjxt0Crky5aXYo88XEyFqJ?=
 =?us-ascii?Q?oPTeaGH+j2ZPF4/UWav+6U2dQZMBoEHxO1GUJVtWA8ZsJaT+L4fMMmrxxuhX?=
 =?us-ascii?Q?7pztTFB5wfOgQZoJHj53K1lEi3rstSlFJQ7ZdsdymG1OmEmkdIKeuPuSgM8H?=
 =?us-ascii?Q?yiUmS4/3vVBI7b6tZVhY81VbHHFzAMaHhTWEHeVPmpFdV+I9tgqmhywodhyG?=
 =?us-ascii?Q?qhaQLuGA9kiTpXwPIGVxArtw+LJRlUxSNp0hs4mhgk2cc5JXjOny+UyUE11Y?=
 =?us-ascii?Q?7D26sfilk0LqfKsfBbyXf0gVAmDoIdSFoU9OTViSzRw9mbnQD14jq6dn2iRg?=
 =?us-ascii?Q?WFj8y+IptPotbZXD3OZlAWWe6dCPvzRrAnOgl869VEzsrCWfw3Tnc/xn8jus?=
 =?us-ascii?Q?TVSvs1wy5dmQptagcSn890VSnon/gy0gOM4sMSdSgh5nHe5i5ZkEIQd6DW8O?=
 =?us-ascii?Q?cLN3xx6th3DnjJmhLmmMSP+ab2JnRaFTe6i+qFeMnnVOJ6wxr2HRhPYQEh4Z?=
 =?us-ascii?Q?GmGmyRw7x80fQH+dKgSE8PARWjCjembzKXw4AaCqJyOwyXg/drOPOLN9Nxvv?=
 =?us-ascii?Q?D00H6wRrV14nHM69GxI/pRHAN21Z7IK6M7qsJpgxkTxm4P2U+eGlGlwhT2S8?=
 =?us-ascii?Q?rRLbaXcePT63Y+jPkqGG1zfQzXJJmdYBuzaV61AM5H5pOwuWOaGjNw6vmVxk?=
 =?us-ascii?Q?dUbGEgIvHB7nh+ZbjG1VWz398QMo5M7V3VX6WrFYq9LFksMOPmNWUJ8EpWXR?=
 =?us-ascii?Q?J57wQXfM5gBLnGMEGBnfSwXZmgZ6uCTf03slwUnrRDDlq0U02+A9umMLn7Sz?=
 =?us-ascii?Q?PoysORM8WztjNCiyPUKbUNkNfkKyGPZMGPDE4L6k3DEQ9aRgqezfql+P7MMB?=
 =?us-ascii?Q?0DwmLkffc2VnAiApkiJQAw22gm2m0syqyLFXl9bLDsQz7ETsVWCu1uRP8eMA?=
 =?us-ascii?Q?qqbhBE8BPyM3yxxwEVL1YG0YVaCJtleytwLpPJXrnLjKJrkNm9Ie9Hvo2nQz?=
 =?us-ascii?Q?XdjRhfRABaq4GKaDXVUYBCnQXMvGza2QD3cRMMUhGkpgCsGDId4peWCpN9fa?=
 =?us-ascii?Q?XbUedKUTaleLq2wfx/Cs4R3U1l/xUkT1Qo453NLQ7pQ+7zYTFAnR0chfGQRK?=
 =?us-ascii?Q?4tGyLW/GLrMDYHr4mQ73sq2EY+QZ83PilRVKgFJiK60rELKN/OaQpO19LRRk?=
 =?us-ascii?Q?hffYJGg0xknGwFVAxVPR54rZqnjYp5WzeAGOKLlzpM9hCONBqJBl/4cRwWpy?=
 =?us-ascii?Q?h+o+solLBF5jjAFUjWkYF2vuXX1pbXIsDOPqgV8XLJTk0ojEj6Q/5RBNcBgt?=
 =?us-ascii?Q?+A=3D=3D?=
X-OriginatorOrg: uipath.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dd6b0258-1672-41fb-3360-08dbd4c5fdd4
X-MS-Exchange-CrossTenant-AuthSource: VI1PR02MB4527.eurprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2023 19:18:23.7100
 (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: wZCsUD2Zqyc9qniiCfko3zPZ2YAn9qFU1T28JEuhAmPyksGt30j4Bt3yH9muWc3nz9bylUq0E4pJTcyGuAaooFd2psBvhTxQ6MTDFuK+PlU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR02MB6168
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email
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 (pete.vger.email [0.0.0.0]); Tue, 24 Oct 2023 12:18:46 -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>
---
v4:
- moved queue_work for send_pkt_work in vqs_start and added comment explaining why
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 | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
index e95df847176b..b80bf681327b 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);
@@ -569,7 +574,16 @@ static int virtio_vsock_vqs_init(struct virtio_vsock *vsock)
 	vsock->event_run = true;
 	mutex_unlock(&vsock->event_lock);
 
-	return 0;
+	/* 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.
+	 * We don't need to queue the other workers (rx, event) because
+	 * as long as we don't fill the queues with empty buffers, the
+	 * host can't send us any notification.
+	 */
+	queue_work(virtio_vsock_workqueue, &vsock->send_pkt_work);
 }
 
 static void virtio_vsock_vqs_del(struct virtio_vsock *vsock)
@@ -664,6 +678,7 @@ static int virtio_vsock_probe(struct virtio_device *vdev)
 		goto out;
 
 	rcu_assign_pointer(the_virtio_vsock, vsock);
+	virtio_vsock_vqs_start(vsock);
 
 	mutex_unlock(&the_virtio_vsock_mutex);
 
@@ -736,6 +751,7 @@ static int virtio_vsock_restore(struct virtio_device *vdev)
 		goto out;
 
 	rcu_assign_pointer(the_virtio_vsock, vsock);
+	virtio_vsock_vqs_start(vsock);
 
 out:
 	mutex_unlock(&the_virtio_vsock_mutex);
-- 
2.25.1