From patchwork Fri Apr 14 15:47:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 83505 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp484364vqo; Fri, 14 Apr 2023 08:59:34 -0700 (PDT) X-Google-Smtp-Source: AKy350bGQuVZsDfFXvNkANm2yGdYPWf8pVuXCyGvyiqIEbsxPWLQnVTNoLG9p4KZZiowb919n/1F X-Received: by 2002:a05:6a20:8427:b0:ee:454f:11d8 with SMTP id c39-20020a056a20842700b000ee454f11d8mr3077033pzd.40.1681487974324; Fri, 14 Apr 2023 08:59:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681487974; cv=none; d=google.com; s=arc-20160816; b=IbK9SdMmJXjJL8qKmLyurfWc/caejU4lvYZNEIeAfsQwie5gayPW/ZJUYXUITKD4Q/ +iSDuvtqGN/TMK0gwXSdr3fChFsSx7896sOChsanpA79os14yZ2yFaSwSQwu29oaDnkF 32QzCUWI4X5npv0j0mOStzWo4jB4MGWUjtzajGIREvPjd06+d6zJ0NGZsDevBte/OSPi 9d1y4ejo9LYf1ji1Tmg4Swm7vS83099I1fKSrYwgLFhHCTLwWyKr8tzFErtwrMRaSmbs 3RGL3HcxJK/ZlDT5PghPeDIIAYE+mGoap0xXDUJssBIIGRj8q+GoP3PISsNfAhc6Ljer ZNQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=IWDTtECwsAjmhmHRuxNIr9S2DI1LKdsoQ3rswGr32ds=; b=VIZcVgn6EFY87PWL4HYkZEw4fVtmBjXb/5tEXL41L2k0o5g+Sc0vx6DRSpPEfXDPqn SExCsYEZG/RCQl1CWM06XmUV1EEyNaX0B0Hrin1fjx8qmDR1SKuxgqT4hyLlaFfi13Y5 OhTP1ezI1GYMicOdZA6dUXKPCn3jR7PsdDlhRUiMDSnNsCIVonAEsw85wKLlCrcgqLdo sduoAK0KQnVLB8/Uprr91evbJEK0QbzL1s9qqn+CKybaAVz0+HplHZp6SI4CyjZ0TIsB hk6uCJnTsBFTjLPNpMOnR3ow7G6mEExQfFqiPjVjBbvAB5G2iwzHps13VYORdlx06pOa 4uOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=T2DCjD57; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l11-20020a654c4b000000b0051802927ee1si3106864pgr.330.2023.04.14.08.59.19; Fri, 14 Apr 2023 08:59:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=T2DCjD57; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230460AbjDNPrp (ORCPT + 99 others); Fri, 14 Apr 2023 11:47:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230254AbjDNPr0 (ORCPT ); Fri, 14 Apr 2023 11:47:26 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C5903C33 for ; Fri, 14 Apr 2023 08:47:25 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id bi22-20020a05600c3d9600b003f0ad935166so2683802wmb.4 for ; Fri, 14 Apr 2023 08:47:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1681487243; x=1684079243; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=IWDTtECwsAjmhmHRuxNIr9S2DI1LKdsoQ3rswGr32ds=; b=T2DCjD57aRc+HD2UC5CMLxlwCrnIpr+ZgwwhHPf3yqK/ASgz6n8armT5rL08ozQSSf b9S4kPyCVEM5sHxPm7hs1US6/AKSuj5KaKgVSw7ZB4nYPIj/fGdm+TNV5hub2G8ooQgW mSe9BnrVn19slUkgQHPoExUNRCxP9UzBLstdgWWzYbSqv2hWpyymlFiFSXXMHX9H216o 0x/i3UDr8/1WpdgwjZBFe1tE80AYJMpMb2I0QrDdoYDSS3qZrQ2lvaTUIkI38i56GNfF OMQ/BeFiqZnR74OCv4HM+mCjpN0REhuGkExModyFzrBJz8d3cShGkgyAOnjRxADTa1Mq wehg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681487243; x=1684079243; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IWDTtECwsAjmhmHRuxNIr9S2DI1LKdsoQ3rswGr32ds=; b=QmFlESWV6Kwd6ZpIjAUxU8D3A+YmjztwaO/fiJ2YBCdCWZeaOYgA1O8sRirFHChgZL c89K7AgBZ+buj7MZSnORhzSRvrjIHNig8PjSbFtzVpA0pgQniYuxy3j4xOkHECLx0Bon nzOqYG9/h5+SfDwPnX11buKA6DkPKdHvGDrnNttXvRt0n7jRtcnmwQm5l6QzAh6BPKDd 9bq9R6eFox9655+rtyPQG7iOKCHZF8OK+0EPxGU99e/EHOK7hqbIE0pMLLC5n/aVENIu WR1bWCX2vI8E+6iLA9b8D4PmZmf9MYIEZ+nidnBst9ay2IxpDQTx9hSL+LaHXEAZNKek v0pw== X-Gm-Message-State: AAQBX9cEjWXancOlgw32XMm6lkL/EBcZL3Og8PzZJOBvoAMmJvXu7jez FzdeNfaNrCphdYe6IyQM6REfzw== X-Received: by 2002:a7b:c405:0:b0:3f1:4971:5cd0 with SMTP id k5-20020a7bc405000000b003f149715cd0mr1275134wmi.21.1681487243619; Fri, 14 Apr 2023 08:47:23 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id x2-20020a05600c21c200b003f149715cb6sm1034298wmj.10.2023.04.14.08.47.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 08:47:23 -0700 (PDT) From: Matthieu Baerts Date: Fri, 14 Apr 2023 17:47:09 +0200 Subject: [PATCH net-next 4/5] selftests: mptcp: remove duplicated entries in usage MIME-Version: 1.0 Message-Id: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-4-5aa4a2e05cf2@tessares.net> References: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-0-5aa4a2e05cf2@tessares.net> In-Reply-To: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-0-5aa4a2e05cf2@tessares.net> To: mptcp@lists.linux.dev, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2688; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=OMhBvjHspE9kilhYpui/Ahqh9sFYY67x1kU+MoI9vh8=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkOXWGxSGApNnBsDJeBmCH9n9JpmD9H01vkQ0zT Ma71ppMdhKJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDl1hgAKCRD2t4JPQmmg c7HcD/9kxoAJMsr/I/X47DPp8WsaXxFjLUx49XD5Bb7xI2I2i3JLR3FBVv27Yhsxs8r980pmrvB 1yP5rjDuYTatbmW743zPNUhM7sdIZ+l9l4nUsx1ahei2sMJiQdqNaNKeWP7obQPUYHUIdY7Wm1K WkyCeecW4EZ7QdZxIi9ZDvQ5zA9BZsVPT1rWGZWequ2zJEEB6xPjDk10CZtCFNA6jb01M/tM2qf otZWbcWTjbEbuhfT4uQwIROVhRf7C7MJdZ/TfzLa1LI/fXyEnYEHUU8jpcZX4XI+Mu0aCreEAAQ VIgfd3gJ7J7WjZLNHKSz1Nvv//srNIuwqJG1GkaahiGc46n3Pr03aL7KfuBYWGjNv/VPoVseIV5 8u2tfDIB6yxMr/AmdVEYlEfgpw21QNkeM5A2BoTjqS5fgXUu9O4/hcd8dAgVjYuq5D/SVseuWRW WhLjCM37GE6UfzOq4EpLIMlcEZxq8Gn4WpZL6dt2BAaH5kao0f01lrFzLAXfbOhNViTWLdjlVMs OQZnvai2OPd8gDPL1I3AbrWD6fWMHs9DU5eB2VhcLF5BZg/XNUPr44ChzlumQZDzrLwzgNnFcpc onjrf5hhJJdXpAutmSzLhlA3hcIsuGNPb7JNksxTuZR+1/QcsHZg8RZ72gUTRRVDKJIJm8Ju6rT w+rT1AZepwycxEw== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 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_NONE, 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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763167934102458184?= X-GMAIL-MSGID: =?utf-8?q?1763167934102458184?= mptcp_connect tool was printing some duplicated entries when showing how to use it: -j -l -r While at it, I also: - moved the very few entries that were not sorted, - added -R that was missing since commit 8a4b910d005d ("mptcp: selftests: add rcvbuf set option"), - removed the -u parameter that has been removed in commit f730b65c9d85 ("selftests: mptcp: try to set mptcp ulp mode in different sk states"). No need to backport this, it is just an internal tool used by our selftests. The help menu is mainly useful for MPTCP kernel devs. Acked-by: Paolo Abeni Signed-off-by: Matthieu Baerts --- tools/testing/selftests/net/mptcp/mptcp_connect.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c index b25a31445ded..c7f9ebeebc2c 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -106,8 +106,8 @@ static struct cfg_sockopt_types cfg_sockopt_types; static void die_usage(void) { fprintf(stderr, "Usage: mptcp_connect [-6] [-c cmsg] [-f offset] [-i file] [-I num] [-j] [-l] " - "[-m mode] [-M mark] [-o option] [-p port] [-P mode] [-j] [-l] [-r num] " - "[-s MPTCP|TCP] [-S num] [-r num] [-t num] [-T num] [-u] [-w sec] connect_address\n"); + "[-m mode] [-M mark] [-o option] [-p port] [-P mode] [-r num] [-R num] " + "[-s MPTCP|TCP] [-S num] [-t num] [-T num] [-w sec] connect_address\n"); fprintf(stderr, "\t-6 use ipv6\n"); fprintf(stderr, "\t-c cmsg -- test cmsg type \n"); fprintf(stderr, "\t-f offset -- stop the I/O after receiving and sending the specified amount " @@ -126,13 +126,13 @@ static void die_usage(void) fprintf(stderr, "\t-p num -- use port num\n"); fprintf(stderr, "\t-P [saveWithPeek|saveAfterPeek] -- save data with/after MSG_PEEK form tcp socket\n"); - fprintf(stderr, "\t-t num -- set poll timeout to num\n"); - fprintf(stderr, "\t-T num -- set expected runtime to num ms\n"); fprintf(stderr, "\t-r num -- enable slow mode, limiting each write to num bytes " "-- for remove addr tests\n"); fprintf(stderr, "\t-R num -- set SO_RCVBUF to num\n"); fprintf(stderr, "\t-s [MPTCP|TCP] -- use mptcp(default) or tcp sockets\n"); fprintf(stderr, "\t-S num -- set SO_SNDBUF to num\n"); + fprintf(stderr, "\t-t num -- set poll timeout to num\n"); + fprintf(stderr, "\t-T num -- set expected runtime to num ms\n"); fprintf(stderr, "\t-w num -- wait num sec before closing the socket\n"); exit(1); }