Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp482945pxj; Fri, 11 Jun 2021 04:12:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhY9EFfxacqjvaxRXhO++pdQVMkrPvaG8QfMoHLr8Pa0ya+4ZOq66ECsyG0STA/M8oZqtE X-Received: by 2002:aa7:ca50:: with SMTP id j16mr3099968edt.158.1623409979397; Fri, 11 Jun 2021 04:12:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623409979; cv=none; d=google.com; s=arc-20160816; b=kxqqaBj0bH+ZA1RjKNuLxCFxElNgvoepE+A35Z71RNlPYmrqxRNpIjpTSSNLXINWYp YtDOSAw16hPOsf4UlZMT6pYm+pOhNFt9LO9pTR6DK5BQTKDycGsiBFJNq3a+SZNZHJix ByYOCw2lTph6RAkfEu5oL8DRrraVRB8/hC4RSH7Txl4KtQhTKfaK7Momb4Moxux8cX7P KNWvB5gG6uST5EagGTRDyA2wCQqNdNthh+uyZdI8TxBQTaHoor7VoVorRR0FnZj7n9bR b+pCZt3zNauFJSr8cW8ITqGD4tFTw9SbaudKYArdyFqYmgPhWrH7fH5VsCttY8QLGFhK OsKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=UMplQEi+ZjAusWd5t608mC/WJRwVAtKSDWWvdwZrmbU=; b=0IGlyXgQyaIwZiBMe2SOEOoR9Ij8io4Vvp0KHhrenKpm/3pFCpGgaZZz0LtaoezdcW W9ZUSbKzTpQoUHFRkTDjkb17aswQldpS3M7pYSWd1bZ/+pzW6ZHl0TAeayA7n2lVZqSH 0dVeUZikIOo7NWHwsfmaSYRJnDe7luvBjnU1wS+1XoVsfAHQYJErZkJlyGXk02dEQcbK Vc6iN+xEfZvndu9AKqn1wjjKCG4H8LZvp8WpP3unlzcIWvzRvoz2ZCGpazuZbJQrriDg Eb8GUbystq8KIfa4C0aDN2zN6d2s0OsSraSw/4YVsneZ8BNi71RBnZ0r0W9YOHFxwgG3 yRuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kaspersky.com header.s=mail202102 header.b=rB3CzpeZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=kaspersky.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a16si4604218eds.411.2021.06.11.04.12.36; Fri, 11 Jun 2021 04:12:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kaspersky.com header.s=mail202102 header.b=rB3CzpeZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=kaspersky.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231396AbhFKLKk (ORCPT + 99 others); Fri, 11 Jun 2021 07:10:40 -0400 Received: from mx13.kaspersky-labs.com ([91.103.66.164]:13047 "EHLO mx13.kaspersky-labs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231287AbhFKLKk (ORCPT ); Fri, 11 Jun 2021 07:10:40 -0400 Received: from relay13.kaspersky-labs.com (unknown [127.0.0.10]) by relay13.kaspersky-labs.com (Postfix) with ESMTP id 016DF520E34; Fri, 11 Jun 2021 14:08:40 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kaspersky.com; s=mail202102; t=1623409720; bh=UMplQEi+ZjAusWd5t608mC/WJRwVAtKSDWWvdwZrmbU=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=rB3CzpeZ7hXaTFacHOXjX5ZZr9ySdpuAAViv95hNJeUd82cZZDnEImPLaHz9DcXkv 0LYciKTJUz6RCfG0QU3xXu8t3htVfqtzZ9+1URUMS1NLli0T0AZBL4gEshN80g7zvN zcQOjbpmrKyHbEYUiXCPxX6CrQaOr8rKVMvW/21uZ/ec+TMTOyNOJwSYKXT5A7kIXf wQaLpC9ObHsTzhG1QXdhFkBKqnEIhQ5wpc6XrRek3CXV0CfX1xKprG2FkmSmLlh0O+ ttgaog6CAMQG/9ezGDKlhWiJX+N0g9FOyFLey4SSNGu+gsYr7OJiaQc74W4fPAAUSH GISSYe5eBC4Ag== Received: from mail-hq2.kaspersky.com (unknown [91.103.66.206]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client CN "mail-hq2.kaspersky.com", Issuer "Kaspersky MailRelays CA G3" (verified OK)) by mailhub13.kaspersky-labs.com (Postfix) with ESMTPS id 5743F520E40; Fri, 11 Jun 2021 14:08:39 +0300 (MSK) Received: from arseniy-pc.avp.ru (10.64.68.129) by hqmailmbx3.avp.ru (10.64.67.243) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.14; Fri, 11 Jun 2021 14:08:38 +0300 From: Arseny Krasnov To: Stefan Hajnoczi , Stefano Garzarella , "Michael S. Tsirkin" , Jason Wang , "David S. Miller" , Jakub Kicinski , Arseny Krasnov , Andra Paraschiv , Norbert Slusarek , Colin Ian King CC: , , , , Subject: [PATCH v11 00/18] virtio/vsock: introduce SOCK_SEQPACKET support Date: Fri, 11 Jun 2021 14:07:40 +0300 Message-ID: <20210611110744.3650456-1-arseny.krasnov@kaspersky.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.64.68.129] X-ClientProxiedBy: hqmailmbx1.avp.ru (10.64.67.241) To hqmailmbx3.avp.ru (10.64.67.243) X-KSE-ServerInfo: hqmailmbx3.avp.ru, 9 X-KSE-AntiSpam-Interceptor-Info: scan successful X-KSE-AntiSpam-Version: 5.9.20, Database issued on: 06/11/2021 10:44:49 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 164266 [Jun 11 2021] X-KSE-AntiSpam-Info: Version: 5.9.20.0 X-KSE-AntiSpam-Info: Envelope from: arseny.krasnov@kaspersky.com X-KSE-AntiSpam-Info: LuaCore: 448 448 71fb1b37213ce9a885768d4012c46ac449c77b17 X-KSE-AntiSpam-Info: {Tracking_from_domain_doesnt_match_to} X-KSE-AntiSpam-Info: 127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;arseniy-pc.avp.ru:7.1.1;kaspersky.com:7.1.1 X-KSE-AntiSpam-Info: Rate: 0 X-KSE-AntiSpam-Info: Status: not_detected X-KSE-AntiSpam-Info: Method: none X-KSE-Antiphishing-Info: Clean X-KSE-Antiphishing-ScanningType: Deterministic X-KSE-Antiphishing-Method: None X-KSE-Antiphishing-Bases: 06/11/2021 10:48:00 X-KSE-AttachmentFiltering-Interceptor-Info: no applicable attachment filtering rules found X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 11.06.2021 5:31:00 X-KSE-BulkMessagesFiltering-Scan-Result: InTheLimit X-KSE-AttachmentFiltering-Interceptor-Info: no applicable attachment filtering rules found X-KSE-BulkMessagesFiltering-Scan-Result: InTheLimit X-KLMS-Rule-ID: 52 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Status: not scanned, disabled by settings X-KLMS-AntiSpam-Interceptor-Info: not scanned X-KLMS-AntiPhishing: Clean, bases: 2021/06/11 09:09:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2021/06/10 21:54:00 #16707142 X-KLMS-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patchset implements support of SOCK_SEQPACKET for virtio transport. As SOCK_SEQPACKET guarantees to save record boundaries, so to do it, new bit for field 'flags' was added: SEQ_EOR. This bit is set to 1 in last RW packet of message. Now as packets of one socket are not reordered neither on vsock nor on vhost transport layers, such bit allows to restore original message on receiver's side. If user's buffer is smaller than message length, when all out of size data is dropped. Maximum length of datagram is limited by 'peer_buf_alloc' value. Implementation also supports 'MSG_TRUNC' flags. Tests also implemented. Thanks to stsp2@yandex.ru for encouragements and initial design recommendations. Arseny Krasnov (18): af_vsock: update functions for connectible socket af_vsock: separate wait data loop af_vsock: separate receive data loop af_vsock: implement SEQPACKET receive loop af_vsock: implement send logic for SEQPACKET af_vsock: rest of SEQPACKET support af_vsock: update comments for stream sockets virtio/vsock: set packet's type in virtio_transport_send_pkt_info() virtio/vsock: simplify credit update function API virtio/vsock: defines and constants for SEQPACKET virtio/vsock: dequeue callback for SOCK_SEQPACKET virtio/vsock: add SEQPACKET receive logic virtio/vsock: rest of SOCK_SEQPACKET support virtio/vsock: enable SEQPACKET for transport vhost/vsock: enable SEQPACKET for transport vsock/loopback: enable SEQPACKET for transport vsock_test: add SOCK_SEQPACKET tests virtio/vsock: update trace event for SEQPACKET drivers/vhost/vsock.c | 56 ++- include/linux/virtio_vsock.h | 10 + include/net/af_vsock.h | 8 + .../trace/events/vsock_virtio_transport_common.h | 5 +- include/uapi/linux/virtio_vsock.h | 9 + net/vmw_vsock/af_vsock.c | 464 ++++++++++++------ net/vmw_vsock/virtio_transport.c | 26 ++ net/vmw_vsock/virtio_transport_common.c | 179 +++++++- net/vmw_vsock/vsock_loopback.c | 12 + tools/testing/vsock/util.c | 32 +- tools/testing/vsock/util.h | 3 + tools/testing/vsock/vsock_test.c | 116 ++++++ 12 files changed, 730 insertions(+), 190 deletions(-) v10 -> v11: General changelog: - now data is copied to user's buffer only when whole message is received. - reader is woken up when EOR packet is received. - if read syscall was interrupted by signal or timeout, error is returned(not 0). Per patch changelog: see every patch after '---' line. v9 -> v10: General changelog: - patch for write serialization removed from patchset. - commit messages rephrased Per patch changelog: see every patch after '---' line. v8 -> v9: General changelog: - see per patch change log. Per patch changelog: see every patch after '---' line. v7 -> v8: General changelog: - whole idea is simplified: channel now considered reliable, so SEQ_BEGIN, SEQ_END, 'msg_len' and 'msg_id' were removed. Only thing that is used to mark end of message is bit in 'flags' field of packet header: VIRTIO_VSOCK_SEQ_EOR. Packet with such bit set to 1 means, that this is last packet of message. - POSIX MSG_EOR support is removed, as there is no exact description how it works. - all changes to 'include/uapi/linux/virtio_vsock.h' moved to dedicated patch, as these changes linked with patch to spec. - patch 'virtio/vsock: SEQPACKET feature bit support' now merged to 'virtio/vsock: setup SEQPACKET ops for transport'. - patch 'vhost/vsock: SEQPACKET feature bit support' now merged to 'vhost/vsock: setup SEQPACKET ops for transport'. Per patch changelog: see every patch after '---' line. v6 -> v7: General changelog: - virtio transport callback for message length now removed from transport. Length of record is returned by dequeue callback. - function which tries to get message length now returns 0 when rx queue is empty. Also length of current message in progress is set to 0, when message processed or error happens. - patches for virtio feature bit moved after patches with transport ops. Per patch changelog: see every patch after '---' line. v5 -> v6: General changelog: - virtio transport specific callbacks which send SEQ_BEGIN or SEQ_END now hidden inside virtio transport. Only enqueue, dequeue and record length callbacks are provided by transport. - virtio feature bit for SEQPACKET socket support introduced: VIRTIO_VSOCK_F_SEQPACKET. - 'msg_cnt' field in 'struct virtio_vsock_seq_hdr' renamed to 'msg_id' and used as id. Per patch changelog: - 'af_vsock: separate wait data loop': 1) Commit message updated. 2) 'prepare_to_wait()' moved inside while loop(thanks to Jorgen Hansen). Marked 'Reviewed-by' with 1), but as 2) I removed R-b. - 'af_vsock: separate receive data loop': commit message updated. Marked 'Reviewed-by' with that fix. - 'af_vsock: implement SEQPACKET receive loop': style fixes. - 'af_vsock: rest of SEQPACKET support': 1) 'module_put()' added when transport callback check failed. 2) Now only 'seqpacket_allow()' callback called to check support of SEQPACKET by transport. - 'af_vsock: update comments for stream sockets': commit message updated. Marked 'Reviewed-by' with that fix. - 'virtio/vsock: set packet's type in send': 1) Commit message updated. 2) Parameter 'type' from 'virtio_transport_send_credit_update()' also removed in this patch instead of in next. - 'virtio/vsock: dequeue callback for SOCK_SEQPACKET': SEQPACKET related state wrapped to special struct. - 'virtio/vsock: update trace event for SEQPACKET': format strings now not broken by new lines. v4 -> v5: - patches reorganized: 1) Setting of packet's type in 'virtio_transport_send_pkt_info()' is moved to separate patch. 2) Simplifying of 'virtio_transport_send_credit_update()' is moved to separate patch and before main virtio/vsock patches. - style problem fixed - in 'af_vsock: separate receive data loop' extra 'release_sock()' removed - added trace event fields for SEQPACKET - in 'af_vsock: separate wait data loop': 1) 'vsock_wait_data()' removed 'goto out;' 2) Comment for invalid data amount is changed. - in 'af_vsock: rest of SEQPACKET support', 'new_transport' pointer check is moved after 'try_module_get()' - in 'af_vsock: update comments for stream sockets', 'connect-oriented' replaced with 'connection-oriented' - in 'loopback/vsock: setup SEQPACKET ops for transport', 'loopback/vsock' replaced with 'vsock/loopback' v3 -> v4: - SEQPACKET specific metadata moved from packet header to payload and called 'virtio_vsock_seq_hdr' - record integrity check: 1) SEQ_END operation was added, which marks end of record. 2) Both SEQ_BEGIN and SEQ_END carries counter which is incremented on every marker send. - af_vsock.c: socket operations for STREAM and SEQPACKET call same functions instead of having own "gates" differs only by names: 'vsock_seqpacket/stream_getsockopt()' now replaced with 'vsock_connectible_getsockopt()'. - af_vsock.c: 'seqpacket_dequeue' callback returns error and flag that record ready. There is no need to return number of copied bytes, because case when record received successfully is checked at virtio transport layer, when SEQ_END is processed. Also user doesn't need number of copied bytes, because 'recv()' from SEQPACKET could return error, length of users's buffer or length of whole record(both are known in af_vsock.c). - af_vsock.c: both wait loops in af_vsock.c(for data and space) moved to separate functions because now both called from several places. - af_vsock.c: 'vsock_assign_transport()' checks that 'new_transport' pointer is not NULL and returns 'ESOCKTNOSUPPORT' instead of 'ENODEV' if failed to use transport. - tools/testing/vsock/vsock_test.c: rename tests v2 -> v3: - patches reorganized: split for prepare and implementation patches - local variables are declared in "Reverse Christmas tree" manner - virtio_transport_common.c: valid leXX_to_cpu() for vsock header fields access - af_vsock.c: 'vsock_connectible_*sockopt()' added as shared code between stream and seqpacket sockets. - af_vsock.c: loops in '__vsock_*_recvmsg()' refactored. - af_vsock.c: 'vsock_wait_data()' refactored. v1 -> v2: - patches reordered: af_vsock.c related changes now before virtio vsock - patches reorganized: more small patches, where +/- are not mixed - tests for SOCK_SEQPACKET added - all commit messages updated - af_vsock.c: 'vsock_pre_recv_check()' inlined to 'vsock_connectible_recvmsg()' - af_vsock.c: 'vsock_assign_transport()' returns ENODEV if transport was not found - virtio_transport_common.c: transport callback for seqpacket dequeue - virtio_transport_common.c: simplified 'virtio_transport_recv_connected()' - virtio_transport_common.c: send reset on socket and packet type mismatch. Signed-off-by: Arseny Krasnov -- 2.25.1