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;