From patchwork Mon Apr 17 12:24:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 84204 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2096693vqo; Mon, 17 Apr 2023 05:46:14 -0700 (PDT) X-Google-Smtp-Source: AKy350ZaqeF719wlGnh3WWgSJAIxwY+g5EqSLGwSnCqXQlnjnbkXoc0ax7NmrjazpL7+kh7aoz4Z X-Received: by 2002:a17:903:2451:b0:1a2:89eb:3d1a with SMTP id l17-20020a170903245100b001a289eb3d1amr13986690pls.6.1681735574374; Mon, 17 Apr 2023 05:46:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681735574; cv=none; d=google.com; s=arc-20160816; b=mPOxf96s5vpRhYKNbtX/0EhX6jzkD7K7zuHWfPPnWj3RapTI+P6H6LJQcTxxQLUxZ/ UkGQB/2UsfDBORnMUwu8k51ZhrqlDGn1OIbiFu33e/3Sv49zhhdldoegM9Kj4E5ipCVt ei5tYykFbhFzJNjg86Yhbrhk+Q82Porgfod7HJoSOOyFDVRQn4YPqTwaVre6Lnq+VRpk WSMrfpE53YIqc7MvQzLYHc7Wnk5w1WJRYniJRs9IRgivrSVaOZWhU+jnkA/sHZ2pKTUn vIWxJe38HQh7PGvynrGL8gMqX9qwHJiThZ/gh5kuBOvmGvBxH8y9OE8dYd32CsfNlAFw 1Zjw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=nh4pG0azkt0faOKpS6Fbc+QACSnWZHj8RIMzN45d6u4=; b=0qHDFGezslfm4/BgMoMdEBNrm8EaIDrVOfONHEajR+zKBv6RsmdH7tYTFlw/WitB9G MTcAubTSu4nzXqYpGr8WDBfQg9h+0DL7jKY0B6joezXSNwwfYyGm+yqHPPHGvkA56UpZ 0h85iak9PYW/J/H8RIKgUTEccL3xf6ZtMdpzLmr0ROcUlygDewAV0P8AzxrbiI+qdj2J pW8DMuszxuBSizhCGOxCvHh8qj+LPHkHtUwhvvd3AUjVlXC41hgb20yv039HuVgK7Uh4 OftCl7CZNZy4riPuJnxCvDsnDh7OLaCnt3EM/JWDDwq0C54Zm9liw9dJdH55czteabE9 SfoA== 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 d9-20020a170902cec900b001a1d987fe28si12593113plg.405.2023.04.17.05.45.59; Mon, 17 Apr 2023 05:46:14 -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 S231263AbjDQMkw (ORCPT + 99 others); Mon, 17 Apr 2023 08:40:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231203AbjDQMkb (ORCPT ); Mon, 17 Apr 2023 08:40:31 -0400 X-Greylist: delayed 607 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 17 Apr 2023 05:40:30 PDT Received: from ubuntu20 (unknown [193.203.214.57]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC48E59EB; Mon, 17 Apr 2023 05:40:29 -0700 (PDT) Received: by ubuntu20 (Postfix, from userid 1003) id BBF41E0C2F; Mon, 17 Apr 2023 12:24:25 +0000 (UTC) From: Yang Yang To: davem@davemloft.net, edumazet@google.com, willemdebruijn.kernel@gmail.com Cc: yang.yang29@zte.com.cn, kuba@kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, pabeni@redhat.com, shuah@kernel.org, zhang.yunkai@zte.com.cn, xu.xin16@zte.com.cn, Xuexin Jiang Subject: [PATCH linux-next 1/3] selftests: net: udpgso_bench_rx: Fix verifty exceptions Date: Mon, 17 Apr 2023 20:24:23 +0800 Message-Id: <20230417122423.193237-1-yang.yang29@zte.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <202304172017351308785@zte.com.cn> References: <202304172017351308785@zte.com.cn> MIME-Version: 1.0 X-Spam-Status: No, score=3.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,FSL_HELO_NON_FQDN_1, HEADER_FROM_DIFFERENT_DOMAINS,HELO_NO_DOMAIN,NO_DNS_FOR_FROM, RCVD_IN_PBL,RDNS_NONE,SPF_SOFTFAIL,SPOOFED_FREEMAIL_NO_RDNS, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: *** 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?1763427561413520059?= X-GMAIL-MSGID: =?utf-8?q?1763427561413520059?= From: Zhang Yunkai (CGEL ZTE) The verification function of this test case is likely to encounter the following error, which may confuse users. Executing the following command fails: bash# udpgso_bench_tx -l 4 -4 -D "$DST" bash# udpgso_bench_tx -l 4 -4 -D "$DST" -S 0 bash# udpgso_bench_rx -4 -G -S 1472 -v udpgso_bench_rx: data[1472]: len 2944, a(97) != q(113) This is because the sending buffers are not aligned by 26 bytes, and the GRO is not merged sequentially, and the receiver does not judge this situation. We do the validation after the data is split at the receiving end, just as the application actually uses this feature. 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 | 38 +++++++++++++++++++++------ 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/net/udpgso_bench_rx.c b/tools/testing/selftests/net/udpgso_bench_rx.c index f35a924d4a30..a5b7f30659a5 100644 --- a/tools/testing/selftests/net/udpgso_bench_rx.c +++ b/tools/testing/selftests/net/udpgso_bench_rx.c @@ -189,16 +189,16 @@ 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 @@ -212,6 +212,24 @@ static void do_verify_udp(const char *data, int len) } } +static void do_verify_udp_gro(const char *data, int len, int gso_size) +{ + int remaining = len; + int start = 0; + + while (remaining) { + if (remaining < 0) + break; + + if (remaining > gso_size) + do_verify_udp(data, start, gso_size); + else + do_verify_udp(data, start, remaining); + start += gso_size; + remaining -= gso_size; + } +} + static int recv_msg(int fd, char *buf, int len, int *gso_size) { char control[CMSG_SPACE(sizeof(int))] = {0}; @@ -264,16 +282,20 @@ static void do_flush_udp(int fd) if (cfg_expected_pkt_len && ret != cfg_expected_pkt_len) error(1, 0, "recv: bad packet len, got %d," " expected %d\n", ret, cfg_expected_pkt_len); + if (cfg_expected_gso_size && cfg_expected_gso_size != gso_size) + error(1, 0, "recv: bad gso size, got %d, expected %d %s", + gso_size, cfg_expected_gso_size, "(-1 == no gso cmsg))\n"); if (len && cfg_verify) { 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 " - "(-1 == no gso cmsg))\n", gso_size, - cfg_expected_gso_size); packets++; bytes += ret; From patchwork Mon Apr 17 12:24:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 84203 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2094893vqo; Mon, 17 Apr 2023 05:42:38 -0700 (PDT) X-Google-Smtp-Source: AKy350ZYmAhby3n9emLwebRCUy3sPCvVHvBmpgnJWyhl0qP4I79Ov3sGzaXKENVKIbJNeI53uDUx X-Received: by 2002:a05:6a00:15d4:b0:63b:6774:8f1d with SMTP id o20-20020a056a0015d400b0063b67748f1dmr16132840pfu.31.1681735357890; Mon, 17 Apr 2023 05:42:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681735357; cv=none; d=google.com; s=arc-20160816; b=slwvrjBUAbi5DxeJBisYVKqJOMqcc7hhWwBE6xKLnXAeBRANEYOhX/4bRIDT1Wa4WT GtF6ehFJ3Djt1++PH7MYmLhKjfnGlFXikUfqOkkUFRyrX+Xe45GjMk1GwbrD/9oz9zGd LSwbCdviSW8oUz/eVewKXiB8K3H8emK2pzTJLvMjjj8inyrFEAC+jlh3A82fVJPBZtGG 9r+oCWp5todNguQAEsoxg7wnGdVuxPpnLOe5WCrePadvLCK2ukv6r7dv2wKL6sZtjvDr kVkMqVZuVDbuufICcQuxV7b7Zl0NeIWtNuGiIQiRNAHO6Da1voLEO5u2XaUb55pEUKZG 3Ngw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=rJxPUjZW5zT+Bs9wnj1O7EeFIsk7aKOZDCODTU6FqUk=; b=lOabAGPASG0nwNRuZ3gCLvRssYGACtgeHzgV4+xl2WY0mnPRWsUFOz3kDcBX6DBg95 nPMzycJl3Zn5YohzeJcuyqDoBThW2LsbsmjxKCM691KM334qGdSu4Pzm8hqYgiGz7pEy JUZV48mBgB3ukMS52mlp/SrVdYwptBd80Int/c8e0YDE73rYfL9NROYHtOsa+bz4EtA8 B/tU3WOl7jMCDh/zVOQD03+jYfL00ou+ydzWU7oeN+Wg1EPN0+uFPRhCqYWZE8G43o4G CG9EoLoiq5SDyveNerpb5bWWhFD3f2oiBeeq/fEnP++A8CNPB9idumSfUU1BZTzXywUW /L6A== 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 b184-20020a62cfc1000000b0063b235abe2fsi2649463pfg.64.2023.04.17.05.42.23; Mon, 17 Apr 2023 05:42:37 -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 S231256AbjDQMkt (ORCPT + 99 others); Mon, 17 Apr 2023 08:40:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231205AbjDQMkb (ORCPT ); Mon, 17 Apr 2023 08:40:31 -0400 Received: from ubuntu20 (unknown [193.203.214.57]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC1C65584; Mon, 17 Apr 2023 05:40:29 -0700 (PDT) Received: by ubuntu20 (Postfix, from userid 1003) id 46D24E1A71; Mon, 17 Apr 2023 12:24:30 +0000 (UTC) From: Yang Yang To: davem@davemloft.net, edumazet@google.com, willemdebruijn.kernel@gmail.com Cc: yang.yang29@zte.com.cn, kuba@kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, pabeni@redhat.com, shuah@kernel.org, zhang.yunkai@zte.com.cn, xu.xin16@zte.com.cn, Xuexin Jiang Subject: [PATCH linux-next 2/3] selftests: net: udpgso_bench_rx: Fix gsosize exceptions Date: Mon, 17 Apr 2023 20:24:28 +0800 Message-Id: <20230417122428.193297-1-yang.yang29@zte.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <202304172017351308785@zte.com.cn> References: <202304172017351308785@zte.com.cn> MIME-Version: 1.0 X-Spam-Status: No, score=3.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,FSL_HELO_NON_FQDN_1, HEADER_FROM_DIFFERENT_DOMAINS,HELO_NO_DOMAIN,NO_DNS_FOR_FROM, RCVD_IN_PBL,RDNS_NONE,SPF_SOFTFAIL,SPOOFED_FREEMAIL_NO_RDNS, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: *** 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?1763427334314300221?= X-GMAIL-MSGID: =?utf-8?q?1763427334314300221?= From: Zhang Yunkai (CGEL ZTE) The -S parameter of the receiving terminal will most likely cause the following error. Executing the following command fails: bash# udpgso_bench_tx -l 4 -4 -D "$DST" bash# udpgso_bench_tx -l 4 -4 -D "$DST" -S 0 bash# udpgso_bench_rx -4 -G -S 1472 udp rx: 15 MB/s 256 calls/s udp rx: 30 MB/s 512 calls/s udpgso_bench_rx: recv: bad gso size, got -1, expected 1472 (-1 == no gso cmsg)) The actual message on the receiving end is as follows: IP 192.168.2.199.55238 > 192.168.2.203.8000: UDP, length 7360 IP 192.168.2.199.55238 > 192.168.2.203.8000: UDP, length 1472 IP 192.168.2.199.55238 > 192.168.2.203.8000: UDP, length 1472 IP 192.168.2.199.55238 > 192.168.2.203.8000: UDP, length 4416 IP 192.168.2.199.55238 > 192.168.2.203.8000: UDP, length 11776 IP 192.168.2.199.55238 > 192.168.2.203.8000: UDP, length 20608 recv: got one message len:1472, probably not an error. recv: got one message len:1472, probably not an error. This is due to network, NAPI, timer, etc., only one message being received. We believe that this situation should be normal. We add judgment to filter out packets that are less than gso_size and do not contain CMSG information. 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/udpgso_bench_rx.c b/tools/testing/selftests/net/udpgso_bench_rx.c index a5b7f30659a5..784e88b31f7d 100644 --- a/tools/testing/selftests/net/udpgso_bench_rx.c +++ b/tools/testing/selftests/net/udpgso_bench_rx.c @@ -282,7 +282,9 @@ static void do_flush_udp(int fd) if (cfg_expected_pkt_len && ret != cfg_expected_pkt_len) error(1, 0, "recv: bad packet len, got %d," " expected %d\n", ret, cfg_expected_pkt_len); - if (cfg_expected_gso_size && cfg_expected_gso_size != gso_size) + /* For some network reasons, ret less than gso_size is not an error */ + if (cfg_expected_gso_size && cfg_expected_gso_size != gso_size && + ret > cfg_expected_gso_size) error(1, 0, "recv: bad gso size, got %d, expected %d %s", gso_size, cfg_expected_gso_size, "(-1 == no gso cmsg))\n"); if (len && cfg_verify) { From patchwork Mon Apr 17 12:25:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 84209 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2101081vqo; Mon, 17 Apr 2023 05:53:59 -0700 (PDT) X-Google-Smtp-Source: AKy350alxj6nCHg4YgICaLbaZ8Jc8TSmF2c+g7PWKFBHa0/xU4myr361489Eib5hEThTSQIASRlB X-Received: by 2002:a05:6a00:1709:b0:63b:5496:7af1 with SMTP id h9-20020a056a00170900b0063b54967af1mr19396355pfc.33.1681736039412; Mon, 17 Apr 2023 05:53:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681736039; cv=none; d=google.com; s=arc-20160816; b=g/sQGt8g5QblypJEgbhnF0WqQvfWVwSkBprUoxv/A0PlRMGchwvwcfWgnaOJb/Mr/w /GNy5xc1fFdEJxdOvWl+yOk/5lXdMYDPm8DufbqoCRlKbL0hmdcc2BJE8GSZknEnlNm2 8DOJkGLC/nD2zQPKA1pwZoJN5L47xCuDh3x6nuylUXwoBeiF0jDKho40LFhqk1Ow7Hzr G5po8AVAARS6/9c8C1GWB282AvFKYI/KthqmypbTKcSqRv858DimaGVIMNSkeOnrxArp alAY10VByKk2klOsNwsngmXxGG9bWFdx/cmoX8AI4HxEA1zrhDXSuF42VUrTgdvfsy4A jqvA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Rxq4Yk/LgNkx+XnYXVz8UGjTQQyJ6Cw2OUnIbfmIBLE=; b=MFKBbRfw7RGuGbV9olz/7XOF3F3/2yNb6dI/Xy7vroOyDHAf9vjZfs80faIkoh1gcS UokxX/xaW+yeahqnZohQOEBVjQEt8oE7VRaJYuMvDVEf+NE9mQhkzCOfBhuqrNABpY0h abQWkI+BkbRdP4etjaazLCyYT18QOrg8PvNv2CSxVjgjXr+oPmkzapiUZzY7ni0YuPWv xifFVtSnZOChIcUyKHJ584JMUSpXNvKEF6bX305b7IoxkagPeRQtEZN0Q+BbgXvhwXio 91oeJyFzzU/hHFSgxR24U87Tpvik3F3l5YCEhr+4S1soi02HBDdg75ml2ECAOZJPmfcH MVSg== 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 z7-20020aa79587000000b0063b87539e44si4848730pfj.399.2023.04.17.05.53.46; Mon, 17 Apr 2023 05:53:59 -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 S231191AbjDQMkm (ORCPT + 99 others); Mon, 17 Apr 2023 08:40:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231200AbjDQMkb (ORCPT ); Mon, 17 Apr 2023 08:40:31 -0400 Received: from ubuntu20 (unknown [193.203.214.57]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC0AB5267; Mon, 17 Apr 2023 05:40:29 -0700 (PDT) Received: by ubuntu20 (Postfix, from userid 1003) id 21913E1A83; Mon, 17 Apr 2023 12:25:05 +0000 (UTC) From: Yang Yang To: davem@davemloft.net, edumazet@google.com, willemdebruijn.kernel@gmail.com Cc: yang.yang29@zte.com.cn, kuba@kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, pabeni@redhat.com, shuah@kernel.org, zhang.yunkai@zte.com.cn, xu.xin16@zte.com.cn, Xuexin Jiang Subject: [PATCH linux-next 3/3] selftests: net: udpgso_bench_rx: Fix packet number exceptions Date: Mon, 17 Apr 2023 20:25:04 +0800 Message-Id: <20230417122504.193350-1-yang.yang29@zte.com.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <202304172017351308785@zte.com.cn> References: <202304172017351308785@zte.com.cn> MIME-Version: 1.0 X-Spam-Status: No, score=3.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,FSL_HELO_NON_FQDN_1, HEADER_FROM_DIFFERENT_DOMAINS,HELO_NO_DOMAIN,NO_DNS_FOR_FROM, RCVD_IN_PBL,RDNS_NONE,SPF_SOFTFAIL,SPOOFED_FREEMAIL_NO_RDNS, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: *** 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?1763428049272271360?= X-GMAIL-MSGID: =?utf-8?q?1763428049272271360?= From: Zhang Yunkai (CGEL ZTE) The -n parameter is confusing and seems to only affect the frequency of determining whether the time reaches 1s. However, the final print of the program is the number of messages expected to be received, which is always 0. bash# udpgso_bench_rx -4 -n 100 bash# udpgso_bench_tx -l 1 -4 -D "$DST" udpgso_bench_rx: wrong packet number! got 0, expected 100 This is because the packets are always cleared after print. 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/udpgso_bench_rx.c b/tools/testing/selftests/net/udpgso_bench_rx.c index 784e88b31f7d..b66bb53af19f 100644 --- a/tools/testing/selftests/net/udpgso_bench_rx.c +++ b/tools/testing/selftests/net/udpgso_bench_rx.c @@ -50,7 +50,7 @@ static int cfg_rcv_timeout_ms; static struct sockaddr_storage cfg_bind_addr; static bool interrupted; -static unsigned long packets, bytes; +static unsigned long packets, total_packets, bytes; static void sigint_handler(int signum) { @@ -405,6 +405,7 @@ static void do_recv(void) "%s rx: %6lu MB/s %8lu calls/s\n", cfg_tcp ? "tcp" : "udp", bytes >> 20, packets); + total_packets += packets; bytes = packets = 0; treport = tnow + 1000; } @@ -415,7 +416,7 @@ static void do_recv(void) if (cfg_expected_pkt_nr && (packets != cfg_expected_pkt_nr)) error(1, 0, "wrong packet number! got %ld, expected %d\n", - packets, cfg_expected_pkt_nr); + total_packets + packets, cfg_expected_pkt_nr); if (close(fd)) error(1, errno, "close");