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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 8C4DDC742D2 for ; Sun, 14 Jul 2019 14:33:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6F44E20820 for ; Sun, 14 Jul 2019 14:33:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728370AbfGNOdK (ORCPT ); Sun, 14 Jul 2019 10:33:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48282 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728146AbfGNOdJ (ORCPT ); Sun, 14 Jul 2019 10:33:09 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 41C70308FC5F; Sun, 14 Jul 2019 14:33:09 +0000 (UTC) Received: from redhat.com (ovpn-120-38.rdu2.redhat.com [10.10.120.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 94D0B1001B2F; Sun, 14 Jul 2019 14:33:08 +0000 (UTC) Date: Sun, 14 Jul 2019 10:33:06 -0400 From: Joe Lawrence To: live-patching@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: shuah@kernel.org Subject: Re: [PATCH] selftests/livepatch: add test skip handling Message-ID: <20190714143306.GA29501@redhat.com> References: <20190714142829.29458-1-joe.lawrence@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190714142829.29458-1-joe.lawrence@redhat.com> User-Agent: Mutt/1.12.0 (2019-05-25) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Sun, 14 Jul 2019 14:33:09 +0000 (UTC) Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org On Sun, Jul 14, 2019 at 10:28:29AM -0400, Joe Lawrence wrote: > Before running a livpeatch self-test, first verify that we've built and > installed the livepatch self-test kernel modules by running a 'modprobe > --dry-run'. This should catch a few environment issues, including > !CONFIG_LIVEPATCH and !CONFIG_TEST_LIVEPATCH. In these cases, exit > gracefully with test-skip status rather than test-fail status. > > Reported-by: Jiri Benc > Suggested-by: Shuah Khan > Signed-off-by: Joe Lawrence > --- > tools/testing/selftests/livepatch/functions.sh | 18 ++++++++++++++++++ > .../selftests/livepatch/test-callbacks.sh | 5 +++++ > .../selftests/livepatch/test-livepatch.sh | 3 +++ > .../selftests/livepatch/test-shadow-vars.sh | 2 ++ > 4 files changed, 28 insertions(+) > > diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh > index 30195449c63c..92d6cfb49365 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,16 @@ function loop_until() { > done > } > > +function assert_mod() { > + local mod="$1" > + > + if ! modprobe --dry-run "$mod" &>/dev/null ; then > + skip "Failed modprobe --dry-run of module: $mod" > + fi > + > + return 1 > +} > + > function is_livepatch_mod() { > local mod="$1" > > diff --git a/tools/testing/selftests/livepatch/test-callbacks.sh b/tools/testing/selftests/livepatch/test-callbacks.sh > index e97a9dcb73c7..87a407cee7fd 100755 > --- a/tools/testing/selftests/livepatch/test-callbacks.sh > +++ b/tools/testing/selftests/livepatch/test-callbacks.sh > @@ -9,6 +9,11 @@ MOD_LIVEPATCH2=test_klp_callbacks_demo2 > MOD_TARGET=test_klp_callbacks_mod > MOD_TARGET_BUSY=test_klp_callbacks_busy > > +assert_mod $MOD_LIVEPATCH > +assert_mod $MOD_LIVEPATCH2 > +assert_mod $MOD_TARGET > +assert_mod $MOD_TARGET_BUSY > + > set_dynamic_debug > > > diff --git a/tools/testing/selftests/livepatch/test-livepatch.sh b/tools/testing/selftests/livepatch/test-livepatch.sh > index f05268aea859..8d3b75ceeeff 100755 > --- a/tools/testing/selftests/livepatch/test-livepatch.sh > +++ b/tools/testing/selftests/livepatch/test-livepatch.sh > @@ -7,6 +7,9 @@ > MOD_LIVEPATCH=test_klp_livepatch > MOD_REPLACE=test_klp_atomic_replace > > +assert_mod $MOD_LIVEPATCH > +assert_mod $MOD_REPLACE > + > set_dynamic_debug > > > diff --git a/tools/testing/selftests/livepatch/test-shadow-vars.sh b/tools/testing/selftests/livepatch/test-shadow-vars.sh > index 04a37831e204..1ab09bc50363 100755 > --- a/tools/testing/selftests/livepatch/test-shadow-vars.sh > +++ b/tools/testing/selftests/livepatch/test-shadow-vars.sh > @@ -6,6 +6,8 @@ > > MOD_TEST=test_klp_shadow_vars > > +assert_mod $MOD_TEST > + > set_dynamic_debug > > > -- > 2.21.0 > Testing: Here's the output if modprobe --dry-run doesn't like the modules (not built, etc.): TAP version 13 selftests: livepatch: test-livepatch.sh ======================================== SKIP: Failed modprobe --dry-run of module: test_klp_livepatch not ok 1..1 selftests: livepatch: test-livepatch.sh [SKIP] selftests: livepatch: test-callbacks.sh ======================================== SKIP: Failed modprobe --dry-run of module: test_klp_callbacks_demo not ok 1..2 selftests: livepatch: test-callbacks.sh [SKIP] selftests: livepatch: test-shadow-vars.sh ======================================== SKIP: Failed modprobe --dry-run of module: test_klp_shadow_vars not ok 1..3 selftests: livepatch: test-shadow-vars.sh [SKIP] We could fold assert_mod() into __load_mod() if folks perfer. I don't have strong opinion either way. -- Joe