Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp430078pxb; Fri, 3 Sep 2021 05:35:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPWpbuS/u95TnRTulkZmylAtA8fge8ePJBKtgtqHFd41uJxMiCONYpLnKhKY+vE27A7ZOn X-Received: by 2002:a6b:3b8c:: with SMTP id i134mr2814203ioa.29.1630672524308; Fri, 03 Sep 2021 05:35:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630672524; cv=none; d=google.com; s=arc-20160816; b=fGf8ZKKDqi4RQd3LSUIh+bGvQJpYEXU2t+DkyNXyTV/FhoX3gNcNQV5MDo1szwFq4M X7pnp4JFsYj4py9UXn2R1LvdfCy90NvWdX7fBMLl+qw7Kvudp/F5ezL/KX2Oxr5tdn/z Bm0jSPUD+rZ6wiqg3CR0KrqySUCql7/fZtkz/xYEvmmqFosrKplr7c+ygdgFcr0CIeRN 7VJE1+mOMTtvCHDgKCeDDZAZYsUyEemWzVlahQ8eK+Jmcqo4+TxdL/iCOjbrFaMojk7I 1ftVTOJkayjuPvEGZaITwEfFAHmoBDmOv7r+8sF4zGe/hI6gw+ZGxOHwN8vDBqA653KM nyog== 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=K9e95vKrX+vI3giEHBb/r5WlATln69n3y2C0yRMrXCE=; b=IeP20O5OMGzAVYj1Lg2JpouK22/WfkD+HokAXeMmkdmytE1GcgNf2tXcPDoiLDlV2i F52mBSnCfTxb9xpSJOWsUWcuYq7XKhn/fkMjn/p1rkKxGhVrvJugIBHbQTcdogYC0riK 6UpFBLQMMVNJCOlz6OO2FbfqqqjcItcEimOMRT75mu3j/COsUw19M0DHcxnG6VJmrgJa VrUIzPHMLmFkh+POrIihxexHOQv9O/MhVvqhCvKwPC2YX/mX3T0oWE5tPxy+eThUyI+y OQXC4hcPXTm8fBEJKXvUba8xUCdbatn4BleI74vGysGqrQD6mFON6SbigvN/YvXjgwTY 045Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kaspersky.com header.s=mail202102 header.b=5r78jYLW; 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 t22si5483694iom.43.2021.09.03.05.35.11; Fri, 03 Sep 2021 05:35:24 -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=5r78jYLW; 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 S1349422AbhICMd7 (ORCPT + 99 others); Fri, 3 Sep 2021 08:33:59 -0400 Received: from mx12.kaspersky-labs.com ([91.103.66.155]:60984 "EHLO mx12.kaspersky-labs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349406AbhICMd7 (ORCPT ); Fri, 3 Sep 2021 08:33:59 -0400 Received: from relay12.kaspersky-labs.com (unknown [127.0.0.10]) by relay12.kaspersky-labs.com (Postfix) with ESMTP id 9604F76360; Fri, 3 Sep 2021 15:32:57 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kaspersky.com; s=mail202102; t=1630672377; bh=K9e95vKrX+vI3giEHBb/r5WlATln69n3y2C0yRMrXCE=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=5r78jYLWpiTRVQJTHlw4tbocUR3Pg3KxD8xvbTk6UkrANB9EPOna9qnWK/RY5E/94 Ph4Qsz+OXkTJ23NV3PMeTR85VsaAlAjq6kF1fpulG5n8Uuris4Bh4hfrEfZKw18IOW 4HmiL9z9XJkk7lOSRpN1exCwFEHuKGibPmx54moHu688GkEXVL0w521TjiL01cyNBh V58Q12s/CrynrSFvKxvWL1g7h9V9GxXjbWy3rAfD5MuUH8KDR3dEAZkn6g4Y9Ohssk XDtocWzgr59+X/F+40T1CqzHANqCCpXhrPHk7QOkXpWiBKEQW+XGG8Z1IcE3fUYZzd WI5M7XMxEHUng== Received: from mail-hq2.kaspersky.com (unknown [91.103.66.206]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail-hq2.kaspersky.com", Issuer "Kaspersky MailRelays CA G3" (verified OK)) by mailhub12.kaspersky-labs.com (Postfix) with ESMTPS id 5DF447636A; Fri, 3 Sep 2021 15:32:57 +0300 (MSK) Received: from arseniy-pc.avp.ru (10.64.68.128) 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.2308.14; Fri, 3 Sep 2021 15:32:56 +0300 From: Arseny Krasnov To: Stefan Hajnoczi , Stefano Garzarella , "Michael S. Tsirkin" , Jason Wang , "David S. Miller" , Jakub Kicinski , Arseny Krasnov , Andra Paraschiv , Colin Ian King , Norbert Slusarek CC: , , , , , Subject: [PATCH net-next v5 4/6] virtio/vsock: support MSG_EOR bit processing Date: Fri, 3 Sep 2021 15:32:48 +0300 Message-ID: <20210903123251.3273639-1-arseny.krasnov@kaspersky.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210903123016.3272800-1-arseny.krasnov@kaspersky.com> References: <20210903123016.3272800-1-arseny.krasnov@kaspersky.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.64.68.128] 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: 09/03/2021 12:23:31 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 165956 [Sep 03 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: 461 461 c95454ca24f64484bdf56c7842a96dd24416624e X-KSE-AntiSpam-Info: {Tracking_from_domain_doesnt_match_to} X-KSE-AntiSpam-Info: arseniy-pc.avp.ru:7.1.1;127.0.0.199:7.1.2;kaspersky.com:7.1.1;d41d8cd98f00b204e9800998ecf8427e.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: 09/03/2021 12:25: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: 03.09.2021 6:49: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/09/03 11:02:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2021/09/03 06:49:00 #17152626 X-KLMS-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If packet has 'EOR' bit - set MSG_EOR in 'recvmsg()' flags. Signed-off-by: Arseny Krasnov Reviewed-by: Stefano Garzarella --- net/vmw_vsock/virtio_transport_common.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index 4d5a93beceb0..59ee1be5a6dd 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -76,8 +76,12 @@ virtio_transport_alloc_pkt(struct virtio_vsock_pkt_info *info, goto out; if (msg_data_left(info->msg) == 0 && - info->type == VIRTIO_VSOCK_TYPE_SEQPACKET) + info->type == VIRTIO_VSOCK_TYPE_SEQPACKET) { pkt->hdr.flags |= cpu_to_le32(VIRTIO_VSOCK_SEQ_EOM); + + if (info->msg->msg_flags & MSG_EOR) + pkt->hdr.flags |= cpu_to_le32(VIRTIO_VSOCK_SEQ_EOR); + } } trace_virtio_transport_alloc_pkt(src_cid, src_port, @@ -460,6 +464,9 @@ static int virtio_transport_seqpacket_do_dequeue(struct vsock_sock *vsk, if (le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOM) { msg_ready = true; vvs->msg_count--; + + if (le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOR) + msg->msg_flags |= MSG_EOR; } virtio_transport_dec_rx_pkt(vvs, pkt); -- 2.25.1