From patchwork Mon Apr 24 05:55:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 86865 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2529682vqo; Sun, 23 Apr 2023 23:04:54 -0700 (PDT) X-Google-Smtp-Source: AKy350bAYEInWzxkXfL1yv+A7ntX2O61BBM5LpC0Ysy0RtqHlozMNkSl22GqzCB/EMuVS87Tkj9q X-Received: by 2002:a05:6a20:4288:b0:ef:95ee:895a with SMTP id o8-20020a056a20428800b000ef95ee895amr17059200pzj.30.1682316294222; Sun, 23 Apr 2023 23:04:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682316294; cv=none; d=google.com; s=arc-20160816; b=gqgAPgCT9qQ1uxlLDO9C3ENqCwlq7JR+wQp9pLXiLNNOzc9kc9rYFLSPGXx5xn99Ao 2w9YIT2MwPC/cPAy7H1AlRFtM15QlUw7hTsFI9nuPTnycwCtKT8AET/9Ntk4VfknehCk bO8FwlqLHXX+WK3Om3zSD/XnTH2fj4wtZJB757Ju3Cj9KFko8+dovw2x6JVsf5a0Agry BWWBpa1u3MWPkG51KSJ7IKgFWsGwjMYS5xP5CiWzndTvY85839w0pYXiPUL1Zt+cs2aY Y21sbFkGDiEgjdhDgUEBjYOCLGhsft3D6So0HM00Cl3jF0mJFw7epkLUsqqZfewIDGLf H23g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:message-id:date; bh=06bhzh+hjaO5MyCp+g4M4PmfFxtnY/Cwb5f7eawiXgk=; b=VoP1orkVdGJTNpuve12FNVTfzyYn12NjMMb6mXCspcbpsJTVxoo4zukqbk2o97XNFE tcx7lbZGhjnZ3CJSmf+5oan0liWJR4pHJu++X7tr9xBBSdWqvjPt0B9NDUdlAMey7FDb KTuRDWOhtfJEhGff9tC5q1H2q0QNJgfB8uPeSfIqiiN9IvhL//bj+C5yCd95Ygp/OW2l UWuuMfGWeUnIE7rM1CxZNBLzjVrITYUenhujrmfRWbBLHcYQB+eHDLGp33v+d73+uMIv qsOiOE0qXnhWae9/GX60ZuOLTuIOxcYczbog0bTz+bGaJpnHZZL+g9t/OpB7JJ6VcxdB FIYQ== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h70-20020a638349000000b0052525c3451bsi3420077pge.825.2023.04.23.23.04.41; Sun, 23 Apr 2023 23:04:54 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230298AbjDXF5Q (ORCPT + 99 others); Mon, 24 Apr 2023 01:57:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231344AbjDXF5K (ORCPT ); Mon, 24 Apr 2023 01:57:10 -0400 Received: from mxct.zte.com.cn (mxct.zte.com.cn [183.62.165.209]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC49B3599; Sun, 23 Apr 2023 22:56:35 -0700 (PDT) Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxct.zte.com.cn (FangMail) with ESMTPS id 4Q4ZB038G5z4y3PL; Mon, 24 Apr 2023 13:55:52 +0800 (CST) Received: from szxlzmapp03.zte.com.cn ([10.5.231.207]) by mse-fl1.zte.com.cn with SMTP id 33O5tib1097567; Mon, 24 Apr 2023 13:55:44 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp01[null]) by mapi (Zmail) with MAPI id mid14; Mon, 24 Apr 2023 13:55:46 +0800 (CST) Date: Mon, 24 Apr 2023 13:55:46 +0800 (CST) X-Zmail-TransId: 2b03644619e25da-ae8a1 X-Mailer: Zmail v1.0 Message-ID: <202304241355464262541@zte.com.cn> Mime-Version: 1.0 From: To: , Cc: , , , , , , , , , Subject: =?utf-8?q?=5BPATCH_linux-next_v3=5D_selftests=3A_net=3A_udpgso=5Fbe?= =?utf-8?q?nch=5Frx=3A_Fix_verifty_exceptions?= X-MAIL: mse-fl1.zte.com.cn 33O5tib1097567 X-Fangmail-Gw-Spam-Type: 0 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 644619E8.002/4Q4ZB038G5z4y3PL X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764036490604680295?= X-GMAIL-MSGID: =?utf-8?q?1764036490604680295?= From: Zhang Yunkai (CGEL ZTE) The verification function of this test case is likely to encounter the following error, which may confuse users. The problem is easily reproducible in the latest kernel. Environment A, the sender: bash# udpgso_bench_tx -l 4 -4 -D "$IP_B" udpgso_bench_tx: write: Connection refused Environment B, the receiver: bash# udpgso_bench_rx -4 -G -S 1472 -v udpgso_bench_rx: data[1472]: len 17664, a(97) != q(113) If the packet is captured, you will see: Environment A, the sender: bash# tcpdump -i eth0 host "$IP_B" & IP $IP_A.41025 > $IP_B.8000: UDP, length 1472 IP $IP_A.41025 > $IP_B.8000: UDP, length 1472 IP $IP_B > $IP_A: ICMP $IP_B udp port 8000 unreachable, length 556 Environment B, the receiver: bash# tcpdump -i eth0 host "$IP_B" & IP $IP_A.41025 > $IP_B.8000: UDP, length 7360 IP $IP_A.41025 > $IP_B.8000: UDP, length 14720 IP $IP_B > $IP_A: ICMP $IP_B udp port 8000 unreachable, length 556 In one test, the verification data is printed as follows: abcd...xyz | 1... .. | abcd...xyz | abcd...opabcd...xyz | ...1472... Not xyzabcd, messages are merged .. | The issue is that the test on receive for expected payload pattern {AB..Z}+ fail for GRO packets if segment payload does not end on a Z. The issue still exists when using the GRO with -G, but not using the -S to obtain gsosize. Therefore, a print has been added to remind users. Changes in v3: - Simplify description and adjust judgment order. Changes in v2: - Fix confusing descriptions. Signed-off-by: Zhang Yunkai (CGEL ZTE) Reviewed-by: Xu Xin (CGEL ZTE) Reviewed-by: Yang Yang (CGEL ZTE) Cc: Xuexin Jiang (CGEL ZTE) --- tools/testing/selftests/net/udpgso_bench_rx.c | 34 +++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/udpgso_bench_rx.c b/tools/testing/selftests/net/udpgso_bench_rx.c index f35a924d4a30..3ad18cbc570d 100644 --- a/tools/testing/selftests/net/udpgso_bench_rx.c +++ b/tools/testing/selftests/net/udpgso_bench_rx.c @@ -189,26 +189,45 @@ static char sanitized_char(char val) return (val >= 'a' && val <= 'z') ? val : '.'; } -static void do_verify_udp(const char *data, int len) +static void do_verify_udp(const char *data, int start, int len) { - char cur = data[0]; + char cur = data[start]; int i; /* verify contents */ if (cur < 'a' || cur > 'z') error(1, 0, "data initial byte out of range"); - for (i = 1; i < len; i++) { + for (i = start + 1; i < start + len; i++) { if (cur == 'z') cur = 'a'; else cur++; - if (data[i] != cur) + if (data[i] != cur) { + if (cfg_gro_segment && !cfg_expected_gso_size) + error(0, 0, "Use -S to obtain gsosize to guide " + "splitting and verification."); + error(1, 0, "data[%d]: len %d, %c(%hhu) != %c(%hhu)\n", i, len, sanitized_char(data[i]), data[i], sanitized_char(cur), cur); + } + } +} + +static void do_verify_udp_gro(const char *data, int len, int segment_size) +{ + int start = 0; + + while (len - start > 0) { + if (len - start > segment_size) + do_verify_udp(data, start, segment_size); + else + do_verify_udp(data, start, len - start); + + start += segment_size; } } @@ -268,7 +287,12 @@ static void do_flush_udp(int fd) if (ret == 0) error(1, errno, "recv: 0 byte datagram\n"); - do_verify_udp(rbuf, ret); + if (!cfg_gro_segment) + do_verify_udp(rbuf, 0, ret); + else if (gso_size > 0) + do_verify_udp_gro(rbuf, ret, gso_size); + else + do_verify_udp_gro(rbuf, ret, ret); } if (cfg_expected_gso_size && cfg_expected_gso_size != gso_size) error(1, 0, "recv: bad gso size, got %d, expected %d "