Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1172480pxj; Sat, 8 May 2021 09:37:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwK1NDWrTA23/wxV1nCr+MFLQmlSKliPdXyKzW5widmso9m6Y4BsCr+WLBaARs/hKnyLEBE X-Received: by 2002:aa7:dc15:: with SMTP id b21mr19132653edu.350.1620491862378; Sat, 08 May 2021 09:37:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620491862; cv=none; d=google.com; s=arc-20160816; b=Mm2Yju5kFhXQg+jFrr4rbB2KFc92f50JfgEUvb/sFk821eOxZkVqCFIzgcNuXcUyMj 5NrVEPSq86FfaVKp306hfM/kzuGdidytQ1NLi1oy8+e6sNaQC9A1/UhxDiIYDi5BPaK0 3UD9l/7m29E7Y8+YacH3FUXJ/bkbk5f1xoNdtetPri+TnRdolZ1Ej3vEW6nqeYv3aLbh 1CoLDKcGoUhPiO9ykuPnkic/JZgXI7c4gNdVX1N/FcyXz/TBZfo5vfWmEU5Szhw2MrD0 r5GSdTtEyJTGTfi4+yKPqDRVMD9xJpPdLQooUyePm8R2jWA29nBzlu8/w+8MYpk3MbQb M4yA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mbaWdmYCGH667jLtIB/9AEsqdwcEXrPxiOJ+dizFI9A=; b=AyOossZ2F1PBlcR5bIRa8ZsJuuMxCw4okliXYpnGoMwJDlgiFoSrL46xb1B5pWowFj gT/08KBuImuud81wuta+V7ZpE3tTi2xSLWGR7yD5IXuaG39NDe12R7G31XQgFNKB7g2n GJmOJ93f5eUF/8ZfL24bS0INZ0Pr7XDhZsAtMBvws7H8P7OxtBQhf0n1kh6KGaLXYhfy /hVT3MOmXuaT7n4evX21Q+g2ZVJ2vkbYUNE5Ha8tv0RmuXWLWjV2mkEpEDU1REApiKAc rqKZiZaO14ADhJXMje6BHAvkPrlO5Ok81UAN/rJtHNdf+izB+CfWodGeOBtzZvn3TXzi mqIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kaspersky.com header.s=mail202102 header.b=ysL+ZZX6; 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 ox27si8259435ejb.309.2021.05.08.09.37.19; Sat, 08 May 2021 09:37:42 -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=ysL+ZZX6; 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 S230092AbhEHQhP (ORCPT + 99 others); Sat, 8 May 2021 12:37:15 -0400 Received: from mx12.kaspersky-labs.com ([91.103.66.155]:45180 "EHLO mx12.kaspersky-labs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230035AbhEHQhJ (ORCPT ); Sat, 8 May 2021 12:37:09 -0400 Received: from relay12.kaspersky-labs.com (unknown [127.0.0.10]) by relay12.kaspersky-labs.com (Postfix) with ESMTP id 0B85D76F01; Sat, 8 May 2021 19:36:04 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kaspersky.com; s=mail202102; t=1620491764; bh=mbaWdmYCGH667jLtIB/9AEsqdwcEXrPxiOJ+dizFI9A=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=ysL+ZZX68eGmwNxK+9qd8rjaih3em25pTWJ+N0ew1dDpfM9QoRubJRfvSyRWFHvra 5nMXbDZEqwC0sklzr9GbQv/06bSiine9WdBv1AZZfbMWNo4NG1A11hXg0Qj5Il286m Jd0hRez0GTa/SRDNsqQ2osZqfeFPw/UwXhD8F/B9CEg7jD1ZFn2KqY7oBPXx4aKY7o sCMEeXeJy48aIPqcIR311JPAIO8qjJijKNMpjmS3idsIy+aMnvkgeMmA8FUlv3IlPW PfqQKz68/v0z/KeHUFfPS+Nk/kBJcodEdMiksRNwxOz+hDJLmH6H8ALx+OXNnUDWlB NKhEvhyeWpnsQ== 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 mailhub12.kaspersky-labs.com (Postfix) with ESMTPS id BDEFF76F14; Sat, 8 May 2021 19:36:03 +0300 (MSK) Received: from arseniy-pc.avp.ru (10.64.64.121) 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.2; Sat, 8 May 2021 19:36:03 +0300 From: Arseny Krasnov To: Stefan Hajnoczi , Stefano Garzarella , "Michael S. Tsirkin" , Jason Wang , "David S. Miller" , Jakub Kicinski , Arseny Krasnov , Jorgen Hansen , Andra Paraschiv , Colin Ian King , Norbert Slusarek CC: , , , , , Subject: [RFC PATCH v9 13/19] virtio/vsock: rest of SOCK_SEQPACKET support Date: Sat, 8 May 2021 19:35:54 +0300 Message-ID: <20210508163558.3432246-1-arseny.krasnov@kaspersky.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210508163027.3430238-1-arseny.krasnov@kaspersky.com> References: <20210508163027.3430238-1-arseny.krasnov@kaspersky.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.64.64.121] X-ClientProxiedBy: hqmailmbx3.avp.ru (10.64.67.243) 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: 05/08/2021 16:27:11 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 10 X-KSE-AntiSpam-Info: Lua profiles 163552 [May 08 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: 445 445 d5f7ae5578b0f01c45f955a2a751ac25953290c9 X-KSE-AntiSpam-Info: {Prob_from_in_msgid} 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: 10 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: 05/08/2021 16:29: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: 08.05.2021 12:32: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/05/08 15:50:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2021/05/08 12:32:00 #16600610 X-KLMS-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This adds rest of logic for SEQPACKET: 1) Send SHUTDOWN on socket close for SEQPACKET type. 2) Set SEQPACKET packet type during send. 3) 'seqpacket_allow' flag to virtio transport. 4) Set 'VIRTIO_VSOCK_SEQ_EOR' bit in flags for last packet of message. Signed-off-by: Arseny Krasnov --- v8 -> v9: 1) Use cpu_to_le32() to set VIRTIO_VSOCK_SEQ_EOR. include/linux/virtio_vsock.h | 4 ++++ net/vmw_vsock/virtio_transport_common.c | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h index 02acf6e9ae04..7360ab7ea0af 100644 --- a/include/linux/virtio_vsock.h +++ b/include/linux/virtio_vsock.h @@ -80,6 +80,10 @@ virtio_transport_dgram_dequeue(struct vsock_sock *vsk, struct msghdr *msg, size_t len, int flags); +int +virtio_transport_seqpacket_enqueue(struct vsock_sock *vsk, + struct msghdr *msg, + size_t len); ssize_t virtio_transport_seqpacket_dequeue(struct vsock_sock *vsk, struct msghdr *msg, diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index 7fea0a2192f7..b6608b4ac7c2 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -74,6 +74,10 @@ virtio_transport_alloc_pkt(struct virtio_vsock_pkt_info *info, err = memcpy_from_msg(pkt->buf, info->msg, len); if (err) goto out; + + if (info->msg->msg_iter.count == 0) + pkt->hdr.flags = cpu_to_le32(info->flags | + VIRTIO_VSOCK_SEQ_EOR); } trace_virtio_transport_alloc_pkt(src_cid, src_port, @@ -187,7 +191,7 @@ static int virtio_transport_send_pkt_info(struct vsock_sock *vsk, struct virtio_vsock_pkt *pkt; u32 pkt_len = info->pkt_len; - info->type = VIRTIO_VSOCK_TYPE_STREAM; + info->type = virtio_transport_get_type(sk_vsock(vsk)); t_ops = virtio_transport_get_ops(vsk); if (unlikely(!t_ops)) @@ -477,6 +481,15 @@ virtio_transport_seqpacket_dequeue(struct vsock_sock *vsk, } EXPORT_SYMBOL_GPL(virtio_transport_seqpacket_dequeue); +int +virtio_transport_seqpacket_enqueue(struct vsock_sock *vsk, + struct msghdr *msg, + size_t len) +{ + return virtio_transport_stream_enqueue(vsk, msg, len); +} +EXPORT_SYMBOL_GPL(virtio_transport_seqpacket_enqueue); + int virtio_transport_dgram_dequeue(struct vsock_sock *vsk, struct msghdr *msg, @@ -911,7 +924,7 @@ void virtio_transport_release(struct vsock_sock *vsk) struct sock *sk = &vsk->sk; bool remove_sock = true; - if (sk->sk_type == SOCK_STREAM) + if (sk->sk_type == SOCK_STREAM || sk->sk_type == SOCK_SEQPACKET) remove_sock = virtio_transport_close(vsk); if (remove_sock) { -- 2.25.1