From patchwork Wed Nov 22 18:05:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 16950 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp1517411vqb; Wed, 22 Nov 2023 10:13:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IHbCIaFvmdJA/vk65+7GIiPsqB0GlntYtra3ngf36hZwcUKy9KpdnyeAkX25asHmbN3zZUp X-Received: by 2002:a05:6808:3388:b0:3a7:4509:ecc7 with SMTP id ce8-20020a056808338800b003a74509ecc7mr3915296oib.16.1700676818905; Wed, 22 Nov 2023 10:13:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700676818; cv=none; d=google.com; s=arc-20160816; b=kf7VZ0LMTxguIOHm1qVTt9jPzg5oQwAu0+prfLALvT/te6JLn4jrUv4pLrW2iWgXft V6JBh4aM9JA972X3y4IBD6+y9EFgHD3lbmfccqK6c/J7l58DCLOO64KKQyIeBO+T0fGq HKz+EC1qj+1DzHXUVknf7081TDLvH36wingJwqtRLkIjoZVUnnMSwJsOdmzHU+J7ZAAI mXYX4At+V9F0xZo+Uv20Wv7ks45+Mx8AKooocc8f9ujugFf3RgS0untyv3rX0czkwXDl K1+/z5OlGpQYkj7sTlHJiJfrKMiusep6ahgrHmxnn2w0jsKybvNvlZJTDMdPVS1FkXs4 Nk1A== 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=Wfscbi3n28k0DaUHI1H1o3BRIqMYiUsGUp1uuO0MbWg=; fh=wIHqZpOIuzcidDZ82yQbOZuyHJty7uvaWDEh/efoVzA=; b=r2KQk3w6QkrTS24FSdmo74Kdai86ql1rcVipPOfMeUu8u3n2oBOrYpM7S8j/HVxxU/ Wk7mzSNUH8mp+rAPTCJnZjM5TcroC8MxBF78udXTynsdq+6HKlcYDOpIKy8T3HUzeoBm WFMdNtV9UaBOA2jbmY2W93EU2wyOiMx9ehOYlagkkR5jxBKhtQFt/KZaZNFHDTX5fd9s MMqiE336gGs2A35vGMhC4BaEiKzOjw2B7bHpwxvepGa6XPqmQsVtiUwCiIPfe+modvOo st3CG77XriicgeZfmRYewVL/GfFyXnZbmoKxyK1SetyJld/kC5Oahzxh4hk2d53bLMVh IeRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=Iyp+Jk4h; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id 30-20020a630f5e000000b005c21936252csi11006632pgp.307.2023.11.22.10.13.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 10:13:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=Iyp+Jk4h; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id CF3CA826C0CB; Wed, 22 Nov 2023 10:13:24 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235081AbjKVSNV (ORCPT + 99 others); Wed, 22 Nov 2023 13:13:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231478AbjKVSNQ (ORCPT ); Wed, 22 Nov 2023 13:13:16 -0500 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55A189E; Wed, 22 Nov 2023 10:13:10 -0800 (PST) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 4D52210005F; Wed, 22 Nov 2023 21:13:05 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 4D52210005F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1700676785; bh=Wfscbi3n28k0DaUHI1H1o3BRIqMYiUsGUp1uuO0MbWg=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=Iyp+Jk4hXAS1Z9tpvSicSlDO/XQhPwahs4oltBt0UZu4a44nEmrMkf6FPCK2Yu3Jc SbCj2cTv03PQX2mxfgwLuT1iZL+dqbZej91faNc4Riwvhr7Ae0ZY1dqAlmxNYoBHQu fa1OQeHplBioYvDl9sjIU+MUi+yP2VKKp2KO4wDqFCpeBHEwjEF5K/0rX9Y7jFoPKU VU4xcshbez2j4JAXQyRsXxC/9Iu4UCY/vih6+r7tO0thQpdX49QDNzmqe9nlBSkso6 P6S2sh6e2jfpWb9ApnSP17u39RaWnAEkG9xdb6P5bqmS2u0VZAEjs2gzQ4H4Ubcw3e VABGOljRKe+AA== 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, 22 Nov 2023 21:13:05 +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.40; Wed, 22 Nov 2023 21:13:04 +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 v3 0/3] send credit update during setting SO_RCVLOWAT Date: Wed, 22 Nov 2023 21:05:07 +0300 Message-ID: <20231122180510.2297075-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-m01.sberdevices.ru (172.16.192.107) 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: 181545 [Nov 22 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: 3 0.3.3 e5c6a18a9a9bff0226d530c5b790210c0bd117c8, {Tracking_uf_ne_domains}, {Tracking_from_domain_doesnt_match_to}, p-i-exch-sc-m01.sberdevices.ru:7.1.1,5.0.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;git.kernel.org:7.1.1;127.0.0.199:7.1.2;salutedevices.com:7.1.1;100.64.160.123:7.1.2;lore.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/22 17:13:00 X-KSMG-LinksScanning: Clean, bases: 2023/11/22 17:13:00 X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/11/22 11:24:00 #22501433 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Wed, 22 Nov 2023 10:13:25 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783288895755660474 X-GMAIL-MSGID: 1783288895755660474 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=18de1e517ed37ebaf33e771e46faf052e966e163 Link to v1: https://lore.kernel.org/netdev/20231108072004.1045669-1-avkrasnov@salutedevices.com/ Link to v2: https://lore.kernel.org/netdev/20231119204922.2251912-1-avkrasnov@salutedevices.com/ Changelog: v1 -> v2: * Patchset rebased and tested on new HEAD of net-next (see hash above). * New patch is added as 0001 - it removes return from SO_RCVLOWAT set callback in 'af_vsock.c' when transport callback is set - with that we can set 'sk_rcvlowat' only once in 'af_vsock.c' and in future do not copy-paste it to every transport. It was discussed in v1. * See per-patch changelog after ---. v2 -> v3: * See changelog after --- in 0003 only (0001 and 0002 still same). Arseniy Krasnov (3): vsock: update SO_RCVLOWAT setting callback 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/af_vsock.c | 9 +- net/vmw_vsock/virtio_transport.c | 2 + net/vmw_vsock/virtio_transport_common.c | 28 +++++ net/vmw_vsock/vsock_loopback.c | 2 + tools/testing/vsock/vsock_test.c | 142 ++++++++++++++++++++++++ 7 files changed, 184 insertions(+), 2 deletions(-)