From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3FBFC0650F for ; Tue, 30 Jul 2019 16:33:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8EF63208E3 for ; Tue, 30 Jul 2019 16:33:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564504434; bh=PJ1nX39B/gMrVeFaf/k60PewgHYvs5KnBWkzjrZxHA8=; h=To:Cc:From:Subject:Date:List-ID:From; b=ar0GeMG6j5i1si4SzR3Ka18xCybSmt1b/nK2G2hHgPl9PchC33kFy6U6Lpjp9kZFv xNn9vGKDFsdN8ZAW+aZUiB18hwXZraVqedxGA6g74NEdOSoHFOwVJITX78zF0qq+U8 Trj+62/xXyq4pgJ0xJTrKJnwnCrTgBeVntAOwOig= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729631AbfG3Qdx (ORCPT ); Tue, 30 Jul 2019 12:33:53 -0400 Received: from mail-io1-f65.google.com ([209.85.166.65]:40532 "EHLO mail-io1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733060AbfG3Qdu (ORCPT ); Tue, 30 Jul 2019 12:33:50 -0400 Received: by mail-io1-f65.google.com with SMTP id h6so4371913iom.7 for ; Tue, 30 Jul 2019 09:33:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language; bh=KDoydqM/4PNQk1C3wiilLCzdxfZ2P2ofICXyjT/BiWg=; b=AFlQcULevo63D36h/Zb6unEW2gvSjI9MHiceRZdIS88Q+ngp+E+CsCyiMJ9KX0ZbRp N4NcU4yHLlwj0uB9BZGJ7QMHWzwdC+PLuku5yV+r11DDAwhkizHHLj3QdwLbf5A3iIO3 a6xO0MFHtRmXWO9RJ43RrLtmqyT3ByBAokmBw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language; bh=KDoydqM/4PNQk1C3wiilLCzdxfZ2P2ofICXyjT/BiWg=; b=NmeSURrcrRuiUNaAdUpx0TFq5jkHuszGx0a/HV5wDlQDMbZN0AR7L8tVDSOSB8Hn60 VtGylk56ms8YZefLVltl7I4wDd9ACBvs4vksNKOynH6CPHpjc7+EFrRKrFgdWqAdz9Yn OxSxbGsVsjAZ/qRwKpLAGwO8mmvluUDHOaX9F6QhQKufDGzZT1sZmKgbt5hsHwAibufh bftQ3Tj9F1QfPpekYEk++Fs2GIKsZ9kAEohFf+u84emeZF/wFllGPua/UuVTz+GXhSZ7 wawlIReHDqQ3//Z+1B1v43kjc1ORODvPlqiuLEJjD65u1Ax5u0Mm2XlqS4CuJGg88HX0 zEVA== X-Gm-Message-State: APjAAAXdX+06u3DbHMFoSkC71LuVQJYUVf/7GX6ZCGGbyddlfWfwae6P dAemgX/7Y8TRpzpJN9BbvczlTmZBLhM= X-Google-Smtp-Source: APXvYqySJCCDz9k+CCH4hXgB2ZZY0msNGZoC4JCZ2dYyOQnEbdov7u9e4hWkSnO3/U7n568ZJuzfjQ== X-Received: by 2002:a02:6616:: with SMTP id k22mr80748842jac.100.1564504429163; Tue, 30 Jul 2019 09:33:49 -0700 (PDT) Received: from [192.168.1.112] (c-24-9-64-241.hsd1.co.comcast.net. [24.9.64.241]) by smtp.gmail.com with ESMTPSA id u17sm59733545iob.57.2019.07.30.09.33.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jul 2019 09:33:48 -0700 (PDT) To: Linus Torvalds Cc: Shuah Khan , joe.lawrence@redhat.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org From: Shuah Khan Subject: [GIT PULL] Kselftest update for Linux 5.3-rc3 Message-ID: <9b7fa63d-7c3f-bb3a-663b-e5279a0a0086@linuxfoundation.org> Date: Tue, 30 Jul 2019 10:33:47 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------24AF2ECE419D14C7D78A028E" Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a multi-part message in MIME format. --------------24AF2ECE419D14C7D78A028E Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Hi Linus, Please pull the following Kselftest fixes update for Linux 5.3-rc3. This Kselftest update for Linux 5.3-rc3 consists of minor fixes to tests and one major fix to livepatch test to add skip handling to avoid false fail reports when livepatch is disabled. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 5f9e832c137075045d15cd6899ab0505cfb2ca4b: Linus 5.3-rc1 (2019-07-21 14:05:38 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-5.3-rc3 for you to fetch changes up to 527d37e9e575bc0e9024de9b499385e7bb31f1ad: selftests/livepatch: add test skip handling (2019-07-24 14:17:46 -0600) ---------------------------------------------------------------- linux-kselftest-5.3-rc3 This Kselftest update for Linux 5.3-rc3 consists of minor fixes to tests and one major fix to livepatch test to add skip handling to avoid false fail reports when livepatch is disabled. ---------------------------------------------------------------- Colin Ian King (1): selftests/x86: fix spelling mistake "FAILT" -> "FAIL" Joe Lawrence (1): selftests/livepatch: add test skip handling Masanari Iida (2): selftests: kmod: Fix typo in kmod.sh selftests: mlxsw: Fix typo in qos_mc_aware.sh .../selftests/drivers/net/mlxsw/qos_mc_aware.sh | 4 ++-- tools/testing/selftests/kmod/kmod.sh | 6 +++--- tools/testing/selftests/livepatch/functions.sh | 20 ++++++++++++++++++++ tools/testing/selftests/x86/test_vsyscall.c | 2 +- 4 files changed, 26 insertions(+), 6 deletions(-) ---------------------------------------------------------------- --------------24AF2ECE419D14C7D78A028E Content-Type: text/x-patch; name="linux-kselftest-5.3-rc3.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="linux-kselftest-5.3-rc3.diff" diff --git a/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh index 71231ad2dbfb..47315fe48d5a 100755 --- a/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh +++ b/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh @@ -262,7 +262,7 @@ test_mc_aware() stop_traffic - log_test "UC performace under MC overload" + log_test "UC performance under MC overload" echo "UC-only throughput $(humanize $ucth1)" echo "UC+MC throughput $(humanize $ucth2)" @@ -316,7 +316,7 @@ test_uc_aware() stop_traffic - log_test "MC performace under UC overload" + log_test "MC performance under UC overload" echo " ingress UC throughput $(humanize ${uc_ir})" echo " egress UC throughput $(humanize ${uc_er})" echo " sent $attempts BC ARPs, got $passes responses" diff --git a/tools/testing/selftests/kmod/kmod.sh b/tools/testing/selftests/kmod/kmod.sh index 0a76314b4414..8b944cf042f6 100755 --- a/tools/testing/selftests/kmod/kmod.sh +++ b/tools/testing/selftests/kmod/kmod.sh @@ -28,7 +28,7 @@ # override by exporting to your environment prior running this script. # For instance this script assumes you do not have xfs loaded upon boot. # If this is false, export DEFAULT_KMOD_FS="ext4" prior to running this -# script if the filesyste module you don't have loaded upon bootup +# script if the filesystem module you don't have loaded upon bootup # is ext4 instead. Refer to allow_user_defaults() for a list of user # override variables possible. # @@ -263,7 +263,7 @@ config_get_test_result() config_reset() { if ! echo -n "1" >"$DIR"/reset; then - echo "$0: reset shuld have worked" >&2 + echo "$0: reset should have worked" >&2 exit 1 fi } @@ -488,7 +488,7 @@ usage() echo Example uses: echo echo "${TEST_NAME}.sh -- executes all tests" - echo "${TEST_NAME}.sh -t 0008 -- Executes test ID 0008 number of times is recomended" + echo "${TEST_NAME}.sh -t 0008 -- Executes test ID 0008 number of times is recommended" echo "${TEST_NAME}.sh -w 0008 -- Watch test ID 0008 run until an error occurs" echo "${TEST_NAME}.sh -s 0008 -- Run test ID 0008 once" echo "${TEST_NAME}.sh -c 0008 3 -- Run test ID 0008 three times" diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh index 30195449c63c..edcfeace4655 100644 --- a/tools/testing/selftests/livepatch/functions.sh +++ b/tools/testing/selftests/livepatch/functions.sh @@ -13,6 +13,14 @@ function log() { echo "$1" > /dev/kmsg } +# skip(msg) - testing can't proceed +# msg - explanation +function skip() { + log "SKIP: $1" + echo "SKIP: $1" >&2 + exit 4 +} + # die(msg) - game over, man # msg - dying words function die() { @@ -43,6 +51,12 @@ function loop_until() { done } +function assert_mod() { + local mod="$1" + + modprobe --dry-run "$mod" &>/dev/null +} + function is_livepatch_mod() { local mod="$1" @@ -75,6 +89,9 @@ function __load_mod() { function load_mod() { local mod="$1"; shift + assert_mod "$mod" || + skip "unable to load module ${mod}, verify CONFIG_TEST_LIVEPATCH=m and run self-tests as root" + is_livepatch_mod "$mod" && die "use load_lp() to load the livepatch module $mod" @@ -88,6 +105,9 @@ function load_mod() { function load_lp_nowait() { local mod="$1"; shift + assert_mod "$mod" || + skip "unable to load module ${mod}, verify CONFIG_TEST_LIVEPATCH=m and run self-tests as root" + is_livepatch_mod "$mod" || die "module $mod is not a livepatch" diff --git a/tools/testing/selftests/x86/test_vsyscall.c b/tools/testing/selftests/x86/test_vsyscall.c index 4602326b8f5b..a4f4d4cf22c3 100644 --- a/tools/testing/selftests/x86/test_vsyscall.c +++ b/tools/testing/selftests/x86/test_vsyscall.c @@ -451,7 +451,7 @@ static int test_vsys_x(void) printf("[OK]\tExecuting the vsyscall page failed: #PF(0x%lx)\n", segv_err); } else { - printf("[FAILT]\tExecution failed with the wrong error: #PF(0x%lx)\n", + printf("[FAIL]\tExecution failed with the wrong error: #PF(0x%lx)\n", segv_err); return 1; } --------------24AF2ECE419D14C7D78A028E--