From patchwork Mon Apr 7 18:41:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Luczaj X-Patchwork-Id: 14041607 Received: from mailtransmit05.runbox.com (mailtransmit05.runbox.com [185.226.149.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D1D413CFB6 for ; Mon, 7 Apr 2025 19:04:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.226.149.38 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744052683; cv=none; b=Pq87+GTPwp4+WRjp6hsUGStrVt8USfauGa54X28AMqcP/yoo736Ost2mVfW423g0pt3SIkLy8YpctHrgyyjeA9A5DVB/4vNL7kwkSInpuw5dMA0/gxnhz98UvcOEWxe1COMWuVV7Fmb4roP2r+RNj6DLg5JT9MWeggcPz5Y+GDg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744052683; c=relaxed/simple; bh=QI7mQrvmuSrk43UPe6jrAoVYIEOYC5JWxOa895S1c6Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OXYZvxYpbGRchp2jsJTnMGap9/QnPR7IHmDp/shEBIvgBim1YUNs8yn9UtvP0ijWt/o63JNl6JF6L6DzjzxOCmZNlvijK6dbCtLwAw3OOZ5noBcYvs43MiT7JBUIVVgQjTm4mVMFoWn16ytsi8MdP22ySysM88trtzBA6w3LCCg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co; spf=pass smtp.mailfrom=rbox.co; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b=bi6yZ9M0; arc=none smtp.client-ip=185.226.149.38 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rbox.co Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b="bi6yZ9M0" Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1u1rQC-00CpZc-4S; Mon, 07 Apr 2025 20:42:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rbox.co; s=selector1; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From; bh=/nxvcDYdriK1YGN1nqBZmrt0621aSzHhg8YqEczI/e0=; b=bi6yZ9M0jYLtOAIMc19kCTzTFN 6BMX/eIyHlpR46ocNSrCoEFlXLolxs6hdZxrdKKnb5aJ0UwaxJkXXSONGGlXpRpJneWgigsOnwosJ 5xsVU7mTA4WkRZEDRXowxu3e1GIGeUafQWb1tdLRE+DzZI2CGE9xQY0/rW5pNo4D9tUmOi7/Isnwx k5VxIisttm5E1Zn6lUAiWDTVI8nEEL8AFbl9vwoOXUUKdNpMnfR2ZOXeN4e2f70g1NEhtSroyFqVR wyXmAPNcApBbWQi3JykclPHFai1wwj0SyB71cemFR18f4KEwVxp9cBSV16u47pzQxvx3g6BOoMlE5 vLF08Y2g==; Received: from [10.9.9.74] (helo=submission03.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1u1rQB-0007un-2M; Mon, 07 Apr 2025 20:42:11 +0200 Received: by submission03.runbox with esmtpsa [Authenticated ID (604044)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1u1rPz-008fhd-TY; Mon, 07 Apr 2025 20:41:59 +0200 From: Michal Luczaj Date: Mon, 07 Apr 2025 20:41:43 +0200 Subject: [PATCH net-next 1/2] vsock: Linger on unsent data Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250407-vsock-linger-v1-1-1458038e3492@rbox.co> References: <20250407-vsock-linger-v1-0-1458038e3492@rbox.co> In-Reply-To: <20250407-vsock-linger-v1-0-1458038e3492@rbox.co> To: Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Stefan Hajnoczi Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Michal Luczaj X-Mailer: b4 0.14.2 Change the behaviour of a lingering close(): instead of waiting for all data to be consumed, block until data is considered sent, i.e. until worker picks the packets and decrements virtio_vsock_sock::bytes_unsent down to 0. Do linger on shutdown() just as well. Signed-off-by: Michal Luczaj --- include/net/af_vsock.h | 1 + net/vmw_vsock/af_vsock.c | 25 +++++++++++++++++++++++++ net/vmw_vsock/virtio_transport_common.c | 25 +++---------------------- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h index 9e85424c834353d016a527070dd62e15ff3bfce1..bd8b88d70423051dd05fc445fe37971af631ba03 100644 --- a/include/net/af_vsock.h +++ b/include/net/af_vsock.h @@ -221,6 +221,7 @@ void vsock_for_each_connected_socket(struct vsock_transport *transport, void (*fn)(struct sock *sk)); int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk); bool vsock_find_cid(unsigned int cid); +void vsock_linger(struct sock *sk, long timeout); /**** TAP ****/ diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index fc6afbc8d6806a4d98c66abc3af4bd139c583b08..383c6644d047589035c0439c47d1440273e67ea9 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -1013,6 +1013,29 @@ static int vsock_getname(struct socket *sock, return err; } +void vsock_linger(struct sock *sk, long timeout) +{ + if (timeout) { + DEFINE_WAIT_FUNC(wait, woken_wake_function); + ssize_t (*unsent)(struct vsock_sock *vsk); + struct vsock_sock *vsk = vsock_sk(sk); + + unsent = vsk->transport->unsent_bytes; + if (!unsent) + return; + + add_wait_queue(sk_sleep(sk), &wait); + + do { + if (sk_wait_event(sk, &timeout, unsent(vsk) == 0, &wait)) + break; + } while (!signal_pending(current) && timeout); + + remove_wait_queue(sk_sleep(sk), &wait); + } +} +EXPORT_SYMBOL_GPL(vsock_linger); + static int vsock_shutdown(struct socket *sock, int mode) { int err; @@ -1056,6 +1079,8 @@ static int vsock_shutdown(struct socket *sock, int mode) if (sock_type_connectible(sk->sk_type)) { sock_reset_flag(sk, SOCK_DONE); vsock_send_shutdown(sk, mode); + if (sock_flag(sk, SOCK_LINGER)) + vsock_linger(sk, sk->sk_lingertime); } } diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index 7f7de6d8809655fe522749fbbc9025df71f071bd..66ff2e694e474ad16f70248cc1dc235f4e1ebaa1 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -1192,23 +1192,6 @@ static void virtio_transport_remove_sock(struct vsock_sock *vsk) vsock_remove_sock(vsk); } -static void virtio_transport_wait_close(struct sock *sk, long timeout) -{ - if (timeout) { - DEFINE_WAIT_FUNC(wait, woken_wake_function); - - add_wait_queue(sk_sleep(sk), &wait); - - do { - if (sk_wait_event(sk, &timeout, - sock_flag(sk, SOCK_DONE), &wait)) - break; - } while (!signal_pending(current) && timeout); - - remove_wait_queue(sk_sleep(sk), &wait); - } -} - static void virtio_transport_cancel_close_work(struct vsock_sock *vsk, bool cancel_timeout) { @@ -1279,15 +1262,13 @@ static bool virtio_transport_close(struct vsock_sock *vsk) (void)virtio_transport_shutdown(vsk, SHUTDOWN_MASK); if (sock_flag(sk, SOCK_LINGER) && !(current->flags & PF_EXITING)) - virtio_transport_wait_close(sk, sk->sk_lingertime); + vsock_linger(sk, sk->sk_lingertime); - if (sock_flag(sk, SOCK_DONE)) { + if (sock_flag(sk, SOCK_DONE)) return true; - } sock_hold(sk); - INIT_DELAYED_WORK(&vsk->close_work, - virtio_transport_close_timeout); + INIT_DELAYED_WORK(&vsk->close_work, virtio_transport_close_timeout); vsk->close_work_scheduled = true; schedule_delayed_work(&vsk->close_work, VSOCK_CLOSE_TIMEOUT); return false; From patchwork Mon Apr 7 18:41:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Luczaj X-Patchwork-Id: 14041542 Received: from mailtransmit04.runbox.com (mailtransmit04.runbox.com [185.226.149.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 82F902550AC; Mon, 7 Apr 2025 18:42:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.226.149.37 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744051345; cv=none; b=UMhQc+W+zdfbZyLbdDea8ts/UkdE1Dkqa4xvLfnXbaElIjBmOujE735i9S46kbADe9j0d7YBGYP2N+wngczVWh8mwSFieTluyamM3EjCivLhBbOmXvw3FarvrTaA76lKGZ+LBpivTSZAdAkOCwQ1oDb/a75eFWjA+f6MbsT5t0w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744051345; c=relaxed/simple; bh=66/2ZeAPmkg9fyE8w4hJm69H4r9Q5lXU+AnHbNWGddg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nJc9X9d/nPTiidfWJ6uFGFDZ6M7UScirsxL2bfxcFVR0Ao8RqB9oIjhaD1BHKVzH7omndGSZHE2uCCFoWuI+VsmJ8OL1u3z++HIKAKy0SMTXor14jKYWyfPWugcxnU6cF6xCdSxTSwBCxfuGBIGNbotgcsLRtWBCHUgFfmJXvMY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co; spf=pass smtp.mailfrom=rbox.co; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b=MkNl/SjG; arc=none smtp.client-ip=185.226.149.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rbox.co Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b="MkNl/SjG" Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit04.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1u1rQF-00Cjv4-0L; Mon, 07 Apr 2025 20:42:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rbox.co; s=selector1; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From; bh=xBudmVevJFsZ3uAgbV+lQgDpPPKHbTZb+0QykClR98Q=; b=MkNl/SjGGlHH/cWhJjha3cmo0q TXDBfQns2rj1o7sm3zUj9ZYtmshxjgAVSYe//uV0NnJYwddSP0pra6a9710OfIRl+wIfIj4CGpHVO ifKOlHB1bKTf2XJ7AxIL1IX0bLeTVZmXvI5KxTRToTiimeqL6nZ5OhcTSfbgAMxn2uklmiHJ/Vzdv /ANUykAt6P3gMW+gpvjpUlqPm9G0PMJMyvG4Xl9w0XmC+wEZRhnbb5gc/xwu7a0ziwG1/uHLqQvbX KqJaVYCVxzqCUfxmQ6nrUB3y22N5yO2zmGgX+EqQjkThDG97FlpwI+XdDT3Y13OJRRG72SQANa6ii kORyQohg==; Received: from [10.9.9.74] (helo=submission03.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1u1rQE-0007v8-Lu; Mon, 07 Apr 2025 20:42:14 +0200 Received: by submission03.runbox with esmtpsa [Authenticated ID (604044)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1u1rQ0-008fhd-Kz; Mon, 07 Apr 2025 20:42:00 +0200 From: Michal Luczaj Date: Mon, 07 Apr 2025 20:41:44 +0200 Subject: [PATCH net-next 2/2] vsock/test: Expand linger test to ensure close() does not misbehave Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250407-vsock-linger-v1-2-1458038e3492@rbox.co> References: <20250407-vsock-linger-v1-0-1458038e3492@rbox.co> In-Reply-To: <20250407-vsock-linger-v1-0-1458038e3492@rbox.co> To: Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Stefan Hajnoczi Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Michal Luczaj X-Mailer: b4 0.14.2 Add a check to alert on close() lingering when it should not. Signed-off-by: Michal Luczaj --- tools/testing/vsock/vsock_test.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c index d0f6d253ac72d08a957cb81a3c38fcc72bec5a53..82d0bc20dfa75041f04eada1b4310be2f7c3a0c1 100644 --- a/tools/testing/vsock/vsock_test.c +++ b/tools/testing/vsock/vsock_test.c @@ -1788,13 +1788,16 @@ static void test_stream_connect_retry_server(const struct test_opts *opts) close(fd); } +#define LINGER_TIMEOUT 1 /* seconds */ + static void test_stream_linger_client(const struct test_opts *opts) { struct linger optval = { .l_onoff = 1, - .l_linger = 1 + .l_linger = LINGER_TIMEOUT }; - int fd; + int bytes_unsent, fd; + time_t ts; fd = vsock_stream_connect(opts->peer_cid, opts->peer_port); if (fd < 0) { @@ -1807,7 +1810,28 @@ static void test_stream_linger_client(const struct test_opts *opts) exit(EXIT_FAILURE); } + /* Byte left unread to expose any incorrect behaviour. */ + send_byte(fd, 1, 0); + + /* Reuse LINGER_TIMEOUT to wait for bytes_unsent == 0. */ + timeout_begin(LINGER_TIMEOUT); + do { + if (ioctl(fd, SIOCOUTQ, &bytes_unsent) < 0) { + perror("ioctl(SIOCOUTQ)"); + exit(EXIT_FAILURE); + } + timeout_check("ioctl(SIOCOUTQ) == 0"); + } while (bytes_unsent != 0); + timeout_end(); + + ts = current_nsec(); close(fd); + if ((current_nsec() - ts) / NSEC_PER_SEC > 0) { + fprintf(stderr, "Unexpected lingering on close()\n"); + exit(EXIT_FAILURE); + } + + control_writeln("DONE"); } static void test_stream_linger_server(const struct test_opts *opts) @@ -1820,7 +1844,7 @@ static void test_stream_linger_server(const struct test_opts *opts) exit(EXIT_FAILURE); } - vsock_wait_remote_close(fd); + control_expectln("DONE"); close(fd); }