Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp13377852pxu; Sun, 3 Jan 2021 12:24:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJyeytlpHXkbePJssohM4EQ9YRW7PNwYt//HAdKKgBuAlLKapUVO00d6z/WgE6VwRnmGQHD8 X-Received: by 2002:a17:906:c82c:: with SMTP id dd12mr65206375ejb.66.1609705443747; Sun, 03 Jan 2021 12:24:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609705443; cv=none; d=google.com; s=arc-20160816; b=rLOUTyWcRDgTpPoPfW9+rZe4waCCZOx9knEQjyF37UtRECO6T+gl9AByNGwvdD9VSJ b9MICzG/hGg2Z8TwIFTTIkLLc296rCsEUjl/vh/6CKc2QuExHZL+Dullb0UBOME1QU0R crmiIIR/6nUCcVUBWnf8N2MMBPs8zniEh9Jjdd6kH5RXYCvDMv5uhxgBtG5kdNuQ5y7L jVGzYYMUUQEJUpIJq1C2x8DYnASLSG0inYnbmgmacTMvi77dG4QqsFYT6gnODUaQdcbp GTFdEEpSuH+S9d4Cdn0Q4/qoUiliB/COuEFgFf7PS5Cn7V2oa42nmYTSFyiQ0CQAsVuH HD4g== 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=poe7PlyApOAx9eAEmQOzWlNmDLH0qL6gqeoSwtosnOc=; b=eqQ3gHlJTFltaSd0Wtsx1SHayhWrsWCmkFuwXKlXPeJNbCbeABRN4ds1p73lNwKM7p u5xYH18opM+jYg8WffLf8gnVvR/oxjCX/ItgMQMWEipRNqWozdCikDPufq53MG06ErSt DmTJvP1hlkYdMIX1Krtqz/yw8i2tUuPLw16WX5HBRrY2GWz7nxpqod4D2972OXUcAMti qCvXEV8khmErqGA2I7TQRcnwbUi1F6E1eQikJ/Xp9JJtiQ0Droj0mxI+4lKXNH9W3bpX RM6JUiwYZZrvv+pj3ApyndEBCGjoVDPhkYE8R3wXoL2hsolv180QsxiXm1kwRtTmFwON EHTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kaspersky.com header.s=mail header.b=W3hW+18n; 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 z23si29891964edx.444.2021.01.03.12.23.40; Sun, 03 Jan 2021 12:24:03 -0800 (PST) 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=mail header.b=W3hW+18n; 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 S1727302AbhACUEW (ORCPT + 99 others); Sun, 3 Jan 2021 15:04:22 -0500 Received: from mx13.kaspersky-labs.com ([91.103.66.164]:15286 "EHLO mx13.kaspersky-labs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725889AbhACUEW (ORCPT ); Sun, 3 Jan 2021 15:04:22 -0500 Received: from relay13.kaspersky-labs.com (unknown [127.0.0.10]) by relay13.kaspersky-labs.com (Postfix) with ESMTP id AD485521267; Sun, 3 Jan 2021 23:03:38 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kaspersky.com; s=mail; t=1609704218; bh=poe7PlyApOAx9eAEmQOzWlNmDLH0qL6gqeoSwtosnOc=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=W3hW+18ngdSpRi9zCdlGEraeYvId4TG6dRfp8ucK/VFhbu47PHVrbtYjBA6YzJAZ7 7azSY2thksA6ShfHNWqVOVaisBRLc/kcEf42HPBKG1vCnDKaT3QYqVF8n+ghZJuJTk BHazWUnQ6dbd9OmZzLBqH964WbIdTILhxO6jQ1Sg= 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 6753C5211FE; Sun, 3 Jan 2021 23:03:38 +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.2044.4; Sun, 3 Jan 2021 23:03:37 +0300 From: Arseny Krasnov To: Stefan Hajnoczi , Stefano Garzarella , "Michael S. Tsirkin" , Jason Wang , "David S. Miller" , Jakub Kicinski , Andra Paraschiv , Jorgen Hansen , Arseniy Krasnov , Colin Ian King , Jeff Vander Stoep CC: , , , , , Subject: [PATCH 2/5] vhost/vsock: support for SOCK_SEQPACKET socket. Date: Sun, 3 Jan 2021 23:03:16 +0300 Message-ID: <20210103200318.1956191-1-arseny.krasnov@kaspersky.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210103195454.1954169-1-arseny.krasnov@kaspersky.com> References: <20210103195454.1954169-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: 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.16, Database issued on: 01/03/2021 19:48:25 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 10 X-KSE-AntiSpam-Info: Lua profiles 160977 [Jan 03 2021] X-KSE-AntiSpam-Info: LuaCore: 419 419 70b0c720f8ddd656e5f4eb4a4449cf8ce400df94 X-KSE-AntiSpam-Info: Version: 5.9.16.0 X-KSE-AntiSpam-Info: Envelope from: arseny.krasnov@kaspersky.com X-KSE-AntiSpam-Info: {Prob_from_in_msgid} X-KSE-AntiSpam-Info: {Tracking_date, dbl_space} X-KSE-AntiSpam-Info: {Tracking_from_domain_doesnt_match_to} X-KSE-AntiSpam-Info: 127.0.0.199:7.1.2;kaspersky.com:7.1.1;arseniy-pc.avp.ru:7.1.1;d41d8cd98f00b204e9800998ecf8427e.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: 01/03/2021 19:51: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.01.2021 18:13: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/01/03 18:58:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2021/01/03 18:13:00 #16005632 X-KLMS-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch simply adds transport ops and removes ignore of non-stream type of packets. Signed-off-by: Arseny Krasnov --- drivers/vhost/vsock.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index a483cec31d5c..4a36ef1c52d0 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -346,8 +346,7 @@ vhost_vsock_alloc_pkt(struct vhost_virtqueue *vq, return NULL; } - if (le16_to_cpu(pkt->hdr.type) == VIRTIO_VSOCK_TYPE_STREAM) - pkt->len = le32_to_cpu(pkt->hdr.len); + pkt->len = le32_to_cpu(pkt->hdr.len); /* No payload */ if (!pkt->len) @@ -416,6 +415,9 @@ static struct virtio_transport vhost_transport = { .stream_is_active = virtio_transport_stream_is_active, .stream_allow = virtio_transport_stream_allow, + .seqpacket_seq_send_len = virtio_transport_seqpacket_seq_send_len, + .seqpacket_seq_get_len = virtio_transport_seqpacket_seq_get_len, + .notify_poll_in = virtio_transport_notify_poll_in, .notify_poll_out = virtio_transport_notify_poll_out, .notify_recv_init = virtio_transport_notify_recv_init, -- 2.25.1