From patchwork Wed Jul 7 11:47:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po-Hsu Lin X-Patchwork-Id: 1501707 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GKdBv2M31z9t23; Wed, 7 Jul 2021 21:54:47 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1m168Z-00031d-Mh; Wed, 07 Jul 2021 11:54:43 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1m168W-0002zT-Lm for kernel-team@lists.ubuntu.com; Wed, 07 Jul 2021 11:54:40 +0000 Received: from mail-pj1-f71.google.com ([209.85.216.71]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1m168W-0007nO-D5 for kernel-team@lists.ubuntu.com; Wed, 07 Jul 2021 11:54:40 +0000 Received: by mail-pj1-f71.google.com with SMTP id u12-20020a17090abb0cb029016ee12ec9a1so378057pjr.3 for ; Wed, 07 Jul 2021 04:54:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=quXz7A1zuBFxKrf1FCtkTg611+BdHaDNkEJEVjDbRZw=; b=pZlaZg3zp0Am123o/Mz2CQHJ8oqyC1smt75FsCkZ9tQUjTEirh0rf+LoHH0KSmOLuO eoEeB9xvqhEFHjQpvRnCG4VhV6u/G7kKtL4xAjsfnyjYGIS3OCdntTBGjakitoC8nYmb dABjhlJQKuXyl+papzBsff06hQA8Zhyu5i3zNQiFAuY52+h3zIN8P70gk6b1yPhuOcon 9Pb+UiIHkBa/pZd+wpsLCTEU55Emyx0YbyNz7c7Y8sRDxOCXERdzIa0coTKPnK91BnAd Dv+Mibgoi+SyxMjCz6fNyZF0eh9EzuDimljoojLp/zG0LDqyOm1Eg3M06gJtr46gqPWb UfEQ== X-Gm-Message-State: AOAM531tHgLhjQBcNwmrweWneDN9Ayc7a+88Hqz4T0Gv4Ff79lJY8UM4 0PnBn4e9Fl/psYdH5caIVkauGtxelnHUeBRXN/FmIBsPe2P45vzKK3vjieECn6E2wuNOzk5nQUS +wBZcRyNP/3kIH21oIOh0RDD8dKxsnrV9hUXtFldD X-Received: by 2002:a65:6248:: with SMTP id q8mr26304622pgv.279.1625658879149; Wed, 07 Jul 2021 04:54:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQzkPrfNS0ytfth97zx8pEjEgs0mOTVjRqynZORjdgrqtwCRw09SkI+aU4OBehc67xPZEYRw== X-Received: by 2002:a65:6248:: with SMTP id q8mr26304612pgv.279.1625658878901; Wed, 07 Jul 2021 04:54:38 -0700 (PDT) Received: from localhost.localdomain (223-137-239-238.emome-ip.hinet.net. [223.137.239.238]) by smtp.gmail.com with ESMTPSA id 20sm19881619pfi.170.2021.07.07.04.54.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jul 2021 04:54:38 -0700 (PDT) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [B][SRU][PATCH 3/4] selftests/net: enable msg_zerocopy test Date: Wed, 7 Jul 2021 19:47:29 +0800 Message-Id: <20210707114730.40375-4-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210707114730.40375-1-po-hsu.lin@canonical.com> References: <20210707114730.40375-1-po-hsu.lin@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Willem de Bruijn BugLink: https://bugs.launchpad.net/bugs/1934759 The existing msg_zerocopy test takes additional protocol arguments. Add a variant that takes no arguments and runs all supported variants. Call this from kselftest. Signed-off-by: Willem de Bruijn Signed-off-by: David S. Miller (backported from commit 830669e691464c005ff7262b74797fb2222da99a) [PHLin: ignore fib_tests.sh, pmtu.sh, udpgso.sh, udpgso_bench.sh and fib_rule_tests.sh] Signed-off-by: Po-Hsu Lin --- tools/testing/selftests/net/Makefile | 1 + tools/testing/selftests/net/msg_zerocopy.sh | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile index 66e48dd..10dfd35 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -6,6 +6,7 @@ CFLAGS += -I../../../../usr/include/ TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh rtnetlink.sh TEST_PROGS += fib-onlink-tests.sh +TEST_PROGS += msg_zerocopy.sh TEST_PROGS_EXTENDED := in_netns.sh TEST_GEN_FILES = socket TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy diff --git a/tools/testing/selftests/net/msg_zerocopy.sh b/tools/testing/selftests/net/msg_zerocopy.sh index d571d21..c43c6de 100755 --- a/tools/testing/selftests/net/msg_zerocopy.sh +++ b/tools/testing/selftests/net/msg_zerocopy.sh @@ -21,6 +21,14 @@ readonly DADDR6='fd::2' readonly path_sysctl_mem="net.core.optmem_max" +# No arguments: automated test +if [[ "$#" -eq "0" ]]; then + $0 4 tcp -t 1 + $0 6 tcp -t 1 + echo "OK. All tests passed" + exit 0 +fi + # Argument parsing if [[ "$#" -lt "2" ]]; then echo "Usage: $0 [4|6] [tcp|udp|raw|raw_hdrincl|packet|packet_dgram] "