Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1173287pxj; Sat, 8 May 2021 09:39:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSadW3DrVOzlXPibBQWLSmqLUwGCsgNUiknRzIMV5LVa2SQvXD7ETElQ7sVm3oyg6fjRTD X-Received: by 2002:a17:906:414d:: with SMTP id l13mr16226736ejk.527.1620491955719; Sat, 08 May 2021 09:39:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620491955; cv=none; d=google.com; s=arc-20160816; b=KkOZ9b9CIFZPSbVq0LcJMyrZfWDDCIwUU/zfdLRZwf/sIadABiHGAtlD2DZ76BnGjo lRvx1ZobDeOf4AJMl7skwtmu5YkNYcQ7Z/CtQ14PLefNlRlWW+320MKw6MGMG22VL2dM 3SjR2QUkX0bjN0D6seW4SHidKcdTcMxAnt7nMmkBrdkiXlLJlUfUNsdmkBmeCv/YR9V1 WCG6H1WI8JFgQNTxHznQ8RiNp0tuHQyIFZShse2qNxItGmNqBI8Oef0A8TSJDp08noJY Pp60pYhqxJYWk5banuVHLBXqUq3caBzjz3Igm6Pk/ziCihrdFD7BWZmDYBTPdAloLamy 4nMg== 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=0xRrQkLUuTnmIvbasOTYwMrEM1e94WzyJrYlJOwNYcI=; b=KX+XTPYZtFZEG+u+BLZ7NYlNiwf5MSX3mKFFxvEpOfKm7FNI1bqToCL3V+n8nE2Te8 rfhalPJy8yCmBig7luu/3fsHmlnEhlnuWPtZiuynsOdmcZbLy+U4bBqlpL9CuHCTHU6o FJXLKscVHSFV8KBs9RzRBc9KpxaTHZhuyBRicMCEOiqstC04DwWYQNS957zFoKm1O2v4 J12U0IMRVuxKrDKZX0ByKHeCLlANlIetF5hzA1qAJRBVMyxzYsf8AW/1K8K01pwueZcs 6WuKRWIEENZbCax6O4fyqIpv5Riyw76MbRXN228HMP6m2PDL/Trex0H2tZEIxTU6CFma 2xlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kaspersky.com header.s=mail202102 header.b=PYSKMXqt; 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 ky26si8631053ejc.683.2021.05.08.09.38.52; Sat, 08 May 2021 09:39:15 -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=PYSKMXqt; 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 S229879AbhEHQhe (ORCPT + 99 others); Sat, 8 May 2021 12:37:34 -0400 Received: from mx13.kaspersky-labs.com ([91.103.66.164]:63766 "EHLO mx13.kaspersky-labs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229649AbhEHQh2 (ORCPT ); Sat, 8 May 2021 12:37:28 -0400 Received: from relay13.kaspersky-labs.com (unknown [127.0.0.10]) by relay13.kaspersky-labs.com (Postfix) with ESMTP id 3664F521445; Sat, 8 May 2021 19:36:25 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kaspersky.com; s=mail202102; t=1620491785; bh=0xRrQkLUuTnmIvbasOTYwMrEM1e94WzyJrYlJOwNYcI=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=PYSKMXqtyASOiB22Ckd+460mC85qybK1LE2Fljm5zlPqXz5YyES61LQGJE7H7lnhB HnUIWSGEq/XJUNtXJYkDZcE1h/rr7eZLUCGtsK5KzUrObo9+xZlGVmf9j5gR3Jm8f7 Sm5y4FHt9W6PE0Vsyn1pVYXonclZUKLasSAUsPZEDLvi7TKWAdNDVptBj5vZMHNM8c t175YXNoxSw8+UXNuy2FduRuAoCuwbfY3sTbYNAGybkBSBXqzaWVW2c9H5BSUD6fOi J2WyBXkoweIgY8gQMAiBMDMuLPZgoD8d08SyXqm6C2aABIO/zAodf1Aw96XLqhuJjZ HPpE7EMT+uZcw== 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 F2C63521430; Sat, 8 May 2021 19:36:24 +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:24 +0300 From: Arseny Krasnov To: Stefan Hajnoczi , Stefano Garzarella , "Michael S. Tsirkin" , Jason Wang , "David S. Miller" , Jakub Kicinski , Arseny Krasnov , Jorgen Hansen , Norbert Slusarek , Andra Paraschiv , Colin Ian King CC: , , , , , Subject: [RFC PATCH v9 14/19] virtio/vsock: enable SEQPACKET for transport Date: Sat, 8 May 2021 19:36:14 +0300 Message-ID: <20210508163617.3432380-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: hqmailmbx2.avp.ru (10.64.67.242) 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 1) SEQPACKET ops for virtio transport and 'seqpacket_allow()' callback. 2) Handling of SEQPACKET bit: guest tries to negotiate it with vhost. Signed-off-by: Arseny Krasnov --- v8 -> v9: 1) Move 'seqpacket_allow' to 'struct virtio_vsock'. net/vmw_vsock/virtio_transport.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c index 2700a63ab095..f714c16af65d 100644 --- a/net/vmw_vsock/virtio_transport.c +++ b/net/vmw_vsock/virtio_transport.c @@ -62,6 +62,7 @@ struct virtio_vsock { struct virtio_vsock_event event_list[8]; u32 guest_cid; + bool seqpacket_allow; }; static u32 virtio_transport_get_local_cid(void) @@ -443,6 +444,8 @@ static void virtio_vsock_rx_done(struct virtqueue *vq) queue_work(virtio_vsock_workqueue, &vsock->rx_work); } +static bool virtio_transport_seqpacket_allow(u32 remote_cid); + static struct virtio_transport virtio_transport = { .transport = { .module = THIS_MODULE, @@ -469,6 +472,10 @@ static struct virtio_transport virtio_transport = { .stream_is_active = virtio_transport_stream_is_active, .stream_allow = virtio_transport_stream_allow, + .seqpacket_dequeue = virtio_transport_seqpacket_dequeue, + .seqpacket_enqueue = virtio_transport_seqpacket_enqueue, + .seqpacket_allow = virtio_transport_seqpacket_allow, + .notify_poll_in = virtio_transport_notify_poll_in, .notify_poll_out = virtio_transport_notify_poll_out, .notify_recv_init = virtio_transport_notify_recv_init, @@ -485,6 +492,19 @@ static struct virtio_transport virtio_transport = { .send_pkt = virtio_transport_send_pkt, }; +static bool virtio_transport_seqpacket_allow(u32 remote_cid) +{ + struct virtio_vsock *vsock; + bool seqpacket_allow; + + rcu_read_lock(); + vsock = rcu_dereference(the_virtio_vsock); + seqpacket_allow = vsock->seqpacket_allow; + rcu_read_unlock(); + + return seqpacket_allow; +} + static void virtio_transport_rx_work(struct work_struct *work) { struct virtio_vsock *vsock = @@ -612,6 +632,10 @@ static int virtio_vsock_probe(struct virtio_device *vdev) rcu_assign_pointer(the_virtio_vsock, vsock); mutex_unlock(&the_virtio_vsock_mutex); + + if (vdev->features & (1ULL << VIRTIO_VSOCK_F_SEQPACKET)) + vsock->seqpacket_allow = true; + return 0; out: @@ -695,6 +719,7 @@ static struct virtio_device_id id_table[] = { }; static unsigned int features[] = { + VIRTIO_VSOCK_F_SEQPACKET }; static struct virtio_driver virtio_vsock_driver = { -- 2.25.1