From patchwork Sun Jul 4 08:08:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseny Krasnov X-Patchwork-Id: 470423 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3AD3C07E95 for ; Sun, 4 Jul 2021 08:09:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B7151613D0 for ; Sun, 4 Jul 2021 08:09:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229713AbhGDILo (ORCPT ); Sun, 4 Jul 2021 04:11:44 -0400 Received: from mx12.kaspersky-labs.com ([91.103.66.155]:53924 "EHLO mx12.kaspersky-labs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229540AbhGDILn (ORCPT ); Sun, 4 Jul 2021 04:11:43 -0400 Received: from relay12.kaspersky-labs.com (unknown [127.0.0.10]) by relay12.kaspersky-labs.com (Postfix) with ESMTP id 297E17708E; Sun, 4 Jul 2021 11:09:06 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kaspersky.com; s=mail202102; t=1625386146; bh=JYIbF3cn7cG5DXMCQsWqPRve66iFxAE1GbM8QRQj5Tw=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=5W4EBRPQXh7fjRI+lNZzvcvPqLwtgEUn90U2WWOk3mdllUUTj/OB6tDTFGcLDCziu wwOuQ4Ay5fq462iBe1D8Uw+UPPXp4v8cLZPqa7nV7fNBNzieChtmanppmB0t1e+Zd1 QP8sspZFbefTh2aimr2Vfh0yqArRTivRjqDefQGwkUdKCoGUc6wwOGdfW1MbiYiapG Vs757Ixk4kkGOEIfVnwH5/JTByLFwkH7o77Mvb9xI/Q+fDSiHSlPo6UJkXDDPLoesn BhlxZHnVtg3qYJpxGk0Tvq1sdFeVA/NlUEE+jiIAECCXF3osBqftxq/F4nMdcX2qSC ogqHIsfhP/a7g== 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 4B33C7708D; Sun, 4 Jul 2021 11:09:05 +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; Sun, 4 Jul 2021 11:09:04 +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: [RFC PATCH v2 0/6] Improve SOCK_SEQPACKET receive logic Date: Sun, 4 Jul 2021 11:08:13 +0300 Message-ID: <20210704080820.88746-1-arseny.krasnov@kaspersky.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.64.68.129] 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: 07/04/2021 07:43:44 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 164820 [Jul 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: 448 448 71fb1b37213ce9a885768d4012c46ac449c77b17 X-KSE-AntiSpam-Info: {Tracking_from_exist} X-KSE-AntiSpam-Info: {Tracking_from_domain_doesnt_match_to} X-KSE-AntiSpam-Info: arseniy-pc.avp.ru:7.1.1; kaspersky.com:7.1.1; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; 127.0.0.199:7.1.2 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: 07/04/2021 07:45: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: 04.07.2021 5:50: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/07/04 06:12:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2021/07/04 01:03:00 #16855183 X-KLMS-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patchset modifies receive logic for SOCK_SEQPACKET. Difference between current implementation and this version is that now reader is woken up when there is at least one RW packet in rx queue of socket and data is copied to user's buffer, while merged approach wake up user only when whole message is received and kept in queue. New implementation has several advantages: 1) There is no limit for message length. Merged approach requires that length must be smaller than 'peer_buf_alloc', otherwise transmission will stuck. 2) There is no need to keep whole message in queue, thus no 'kmalloc()' memory will be wasted until EOR is received. Also new approach has some feature: as fragments of message are copied until EOR is received, it is possible that part of message will be already in user's buffer, while rest of message still not received. And if user will be interrupted by signal or timeout with part of message in buffer, it will exit receive loop, leaving rest of message in queue. To solve this problem special callback was added to transport: it is called when user was forced to leave exit loop and tells transport to drop any packet until EOR met. When EOR is found, this mode is disabled and normal packet processing started. Note, that when 'drop until EOR' mode is on, incoming packets still inserted in queue, reader will be woken up, tries to copy data, but nothing will be copied until EOR found. It was possible to drain such unneeded packets it rx work without kicking user, but implemented way is simplest. Anyway, i think such cases are rare. New test also added - it tries to copy to invalid user's buffer. Arseny Krasnov (16): af_vsock/virtio/vsock: change seqpacket receive logic af_vsock/virtio/vsock: remove 'seqpacket_has_data' callback virtio/vsock: remove 'msg_count' based logic af_vsock/virtio/vsock: add 'seqpacket_drop()' callback virtio/vsock: remove record size limit for SEQPACKET vsock_test: SEQPACKET read to broken buffer drivers/vhost/vsock.c | 2 +- include/linux/virtio_vsock.h | 7 +- include/net/af_vsock.h | 4 +- net/vmw_vsock/af_vsock.c | 44 ++++---- net/vmw_vsock/virtio_transport.c | 2 +- net/vmw_vsock/virtio_transport_common.c | 103 ++++++++----------- net/vmw_vsock/vsock_loopback.c | 2 +- tools/testing/vsock/vsock_test.c | 120 ++++++++++++++++++++++ 8 files changed, 193 insertions(+), 91 deletions(-) v1 -> v2: Patches reordered and reorganized. Signed-off-by: Arseny Krasnov --- cv.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 cv.txt diff --git a/cv.txt b/cv.txt new file mode 100644 index 000000000000..e69de29bb2d1