From patchwork Wed Jun 10 17:21:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Lawrence X-Patchwork-Id: 208408 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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS 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 10CDCC433E0 for ; Wed, 10 Jun 2020 17:21:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D83D12070B for ; Wed, 10 Jun 2020 17:21:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="NoxsY6cY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728041AbgFJRVJ (ORCPT ); Wed, 10 Jun 2020 13:21:09 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:44182 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727883AbgFJRVJ (ORCPT ); Wed, 10 Jun 2020 13:21:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591809667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8x7zA9DhLqDyItEuwbgv+8oouxrHDSySR8TUcLh+iQM=; b=NoxsY6cY9pmfQ7lmjX/T8J4MkAiBuwyHfZHZ7q2r7LRuiHYLcGKlnKU3UV119aPmwCdjzA MKSI7AYacthtm/JjzHVygvyF/eJumEuP9tU6ZDFI8C2H/oAdFXGEumNL02YWy9f6quM0kk 49O0vQwi4SP7lyxxgYpscZU5U5wd+0I= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-172-mwvzNnDFN6qhEhqHIyyxow-1; Wed, 10 Jun 2020 13:21:06 -0400 X-MC-Unique: mwvzNnDFN6qhEhqHIyyxow-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6CFA0107ACF4; Wed, 10 Jun 2020 17:21:05 +0000 (UTC) Received: from jlaw-desktop.redhat.com (ovpn-117-142.rdu2.redhat.com [10.10.117.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03C6B1944D; Wed, 10 Jun 2020 17:21:04 +0000 (UTC) From: Joe Lawrence To: live-patching@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH 3/3] selftests/livepatch: filter 'taints' from dmesg comparison Date: Wed, 10 Jun 2020 13:21:01 -0400 Message-Id: <20200610172101.21910-4-joe.lawrence@redhat.com> In-Reply-To: <20200610172101.21910-1-joe.lawrence@redhat.com> References: <20200610172101.21910-1-joe.lawrence@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org The livepatch selftests currently filter out "tainting kernel with TAINT_LIVEPATCH" messages which may be logged when loading livepatch modules. Further filter the log to drop "loading out-of-tree module taints kernel" in the rare case the klp_test modules have been built out-of-tree. Signed-off-by: Joe Lawrence --- tools/testing/selftests/livepatch/functions.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh index 83560c3df2ee..f5d4ef12f1cb 100644 --- a/tools/testing/selftests/livepatch/functions.sh +++ b/tools/testing/selftests/livepatch/functions.sh @@ -260,7 +260,8 @@ function check_result { local result result=$(dmesg --notime | diff --changed-group-format='%>' --unchanged-group-format='' "$SAVED_DMESG" - | \ - grep -v 'tainting' | grep -e '^livepatch:' -e 'test_klp') + grep -e '^livepatch:' -e 'test_klp' | \ + grep -ve '\' -ve '\') if [[ "$expect" == "$result" ]] ; then echo "ok"