From patchwork Wed Nov 8 07:20:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 16367 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp750049vqo; Tue, 7 Nov 2023 23:28:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IHaIpT/y0qXhS0XdnqLJv4zhkuU85fzYt2nGLJgnm6X3MCiw5e75YNq/pm4bWTVBZRBlZaG X-Received: by 2002:a05:6358:60c9:b0:168:dc03:5b90 with SMTP id i9-20020a05635860c900b00168dc035b90mr869170rwi.23.1699428493256; Tue, 07 Nov 2023 23:28:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699428493; cv=none; d=google.com; s=arc-20160816; b=dpeij7c/IZpDevYqaMXWLQat9rFgJYGm23tGZvMHLtY+44DoP/wOuXlK+mz6fCP6+/ cjSbbOlTp6xRM7Hw2Y/XaIIXVkepXjQst86FeBk45ZfRlVbBut0ZmKIMSz7+TcGgIzWp gW+SnsD70XwJmmv18vAsf3TPHqRu8Qi2gCvzl94IppyPwcNcw/3UNmumAQgQcMt+N1Sn ie1dhSVYKbYsYa0aJo8b2Eo7oOWwwcQPT/yshjcwZe9ZptsB2sA4JiqWPnqelg1ogg3Q Fnzw0kQVMvY6J6PPOQ529AjW7MwefyXTEgzp/jwAy07+OmA3FhSfvB86h8crV/2JH5Ad +cig== 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 :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter; bh=GboU7QxQo+Iiecc7y5wDkeix0frYFM0ixS3MLnG4nCs=; fh=wIHqZpOIuzcidDZ82yQbOZuyHJty7uvaWDEh/efoVzA=; b=jr3cNTdfWwlPB+HC7ZIRW5C0M6AXpbI0XhHHURr/ocLGhLRzaoblUWVdvjiF7OflHK qRch/5TQqTgbLl6aMFxtzmmeQ7s6sYz901BFv+tqTCjoTKlyc4bFAJwbpqt8OD+UnFdE l04BJepQE2UEY+8EGwjRBw/KgOwgeWp7i4GiRvA23+MNSOrqVPqn/GUD9JHDCMcfuPwh OyY7enV5lygbA+hn9/ACZnW93ZR/sdxeY0cnpSiljGETp5PRCdRsSU3EVqOWjaUyyYO0 Sw2D4O5WlWheOn2nJvPp/dRmPvr2YlYkKVe5wBcUveZrewZTSRREpvrNCpRrjQTKSWIL +fZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=R9IREQxx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=salutedevices.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id o20-20020a63e354000000b00577475ee5f6si3577323pgj.618.2023.11.07.23.28.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 23:28:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=R9IREQxx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=salutedevices.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 9C28B8226F70; Tue, 7 Nov 2023 23:28:07 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235002AbjKHH1w (ORCPT + 32 others); Wed, 8 Nov 2023 02:27:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234935AbjKHH1v (ORCPT ); Wed, 8 Nov 2023 02:27:51 -0500 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05E21198; Tue, 7 Nov 2023 23:27:48 -0800 (PST) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 180C9100023; Wed, 8 Nov 2023 10:27:45 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 180C9100023 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1699428465; bh=GboU7QxQo+Iiecc7y5wDkeix0frYFM0ixS3MLnG4nCs=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=R9IREQxxLHd4Y72wNfKVkCCE5pKZPTBYiQK0xYhqp6UjoEUFzoWw2sT9hDS9p5iTG 29HL+TBcNTyXCQ31S+QqgP/wRjnQZ1bvIka/6L1GA/E0w9E/gkW4cUYXcuHR0X8K6T r5bjCLAviw4hgjUcUXfWhr6mqtCe6fyZMNPxTJp/aDX0xkqnfgxSfyyJgEwXT8q/dq aUh2FiwsxufHyUo8fxsO8RmWhrqLdWTQKL0QcWtywZNMsF5ZgFJJq2jbMQRiTTbiQn E+q++1tXcOVO6rh4GqFbuAOEVGJCsfs7EYUkMk0BIv4IxF8xQChyhA2yMoLRq4wV04 uHgchs8maZMrQ== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Wed, 8 Nov 2023 10:27:44 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Wed, 8 Nov 2023 10:27:44 +0300 From: Arseniy Krasnov To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , "Michael S. Tsirkin" , Jason Wang , Bobby Eshleman CC: , , , , , , Subject: [RFC PATCH v1 0/2] send credit update during setting SO_RCVLOWAT Date: Wed, 8 Nov 2023 10:20:02 +0300 Message-ID: <20231108072004.1045669-1-avkrasnov@salutedevices.com> X-Mailer: git-send-email 2.35.0 MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 181188 [Nov 08 2023] X-KSMG-AntiSpam-Version: 6.0.0.2 X-KSMG-AntiSpam-Envelope-From: avkrasnov@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 543 543 1e3516af5cdd92079dfeb0e292c8747a62cb1ee4, {Tracking_uf_ne_domains}, {Tracking_from_domain_doesnt_match_to}, 100.64.160.123:7.1.2;salutedevices.com:7.1.1;127.0.0.199:7.1.2;p-i-exch-sc-m01.sberdevices.ru:5.0.1,7.1.1;lore.kernel.org:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;git.kernel.org:7.1.1, FromAlignment: s, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean, bases: 2023/11/08 06:11:00 X-KSMG-LinksScanning: Clean, bases: 2023/11/08 06:10:00 X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/11/08 04:00:00 #22424297 X-KSMG-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 07 Nov 2023 23:28:07 -0800 (PST) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781979931404019884 X-GMAIL-MSGID: 1781979931404019884 Hello, DESCRIPTION This patchset fixes old problem with hungup of both rx/tx sides and adds test for it. This happens due to non-default SO_RCVLOWAT value and deferred credit update in virtio/vsock. Link to previous old patchset: https://lore.kernel.org/netdev/39b2e9fd-601b-189d-39a9-914e5574524c@sberdevices.ru/ Here is what happens step by step: TEST INITIAL CONDITIONS 1) Vsock buffer size is 128KB. 2) Maximum packet size is also 64KB as defined in header (yes it is hardcoded, just to remind about that value). 3) SO_RCVLOWAT is default, e.g. 1 byte. STEPS SENDER RECEIVER 1) sends 128KB + 1 byte in a single buffer. 128KB will be sent, but for 1 byte sender will wait for free space at peer. Sender goes to sleep. 2) reads 64KB, credit update not sent 3) sets SO_RCVLOWAT to 64KB + 1 4) poll() -> wait forever, there is only 64KB available to read. So in step 4) receiver also goes to sleep, waiting for enough data or connection shutdown message from the sender. Idea to fix it is that rx kicks tx side to continue transmission (and may be close connection) when rx changes number of bytes to be woken up (e.g. SO_RCVLOWAT) and this value is bigger than number of available bytes to read. I've added small test for this, but not sure as it uses hardcoded value for maximum packet length, this value is defined in kernel header and used to control deferred credit update. And as this is not available to userspace, I can't control test parameters correctly (if one day this define will be changed - test may become useless). Head for this patchset is: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=ff269e2cd5adce4ae14f883fc9c8803bc43ee1e9 Arseniy Krasnov (2): virtio/vsock: send credit update during setting SO_RCVLOWAT vsock/test: SO_RCVLOWAT + deferred credit update test drivers/vhost/vsock.c | 2 + include/linux/virtio_vsock.h | 1 + net/vmw_vsock/virtio_transport.c | 2 + net/vmw_vsock/virtio_transport_common.c | 31 ++++++ net/vmw_vsock/vsock_loopback.c | 2 + tools/testing/vsock/vsock_test.c | 131 ++++++++++++++++++++++++ 6 files changed, 169 insertions(+)