From patchwork Sun Feb 3 13:40:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 157364 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2808239jaa; Sun, 3 Feb 2019 05:40:47 -0800 (PST) X-Google-Smtp-Source: ALg8bN7uZRnVlqwnEzGmONF0/qXaJ/d9Brci/8z1gJmsFl+J4J+q2AeOEhE+4i6m1JkzqXOcfEF/ X-Received: by 2002:a17:902:a601:: with SMTP id u1mr47595273plq.77.1549201247332; Sun, 03 Feb 2019 05:40:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549201247; cv=none; d=google.com; s=arc-20160816; b=pOXMszV8koBpeYSBBlOZvmzxo5Rolc4WgF9JeDNqQJgzCKx+0KT6NfuQzl+VfqKZsL cfe4x+rsg1pQFEun30m6GNc2FA69GITx+/BsfMK+PRzdT43o2EPkNIHw1X6YEj7x3OQu mnITb/aleJVD0mgQdQMEoJLy9PHa+GzA+xsI0qxhxHdpkkGf57KUE3IHPcGuFylZcUXQ RyEe1BS80MPEcWrn6zN/l+okhSb7L81DOoXJdLm1L5/HFQekgPuQCWWxDzgDuuRUfVMA /44HXJMW8NWEQyQajmNko5acNu1Orkv7Ip8ws3s5r6l0IVgb+s5NlA/hVCkRZvW/EilZ M+og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GXI1MtsIhmcQ974iRTmjpWmjsRXrYgeNfDwmfPbl/68=; b=lOPMpBJ35g2zQ0PpiYJmf10t3nIePYjG+ZKtr+gJLdmlXCyOIqO+dDvngrzj4KlRdx l2oRDZuq4jXeJ63SdPJIRYRtUMLlMbkEgzqmP+KH2BTK0Zwx4xzDev65lx+DGDuGlcQs a/RY4Wn2KMUlrmcBwttyCpZdBZonWDlSDBK9gGh0a9tMsnQbSmk6mnaq8Ab0/qVZklBW KnxzgjeIpef2s0iO2k+SAtb/lwdbisBCc2Kfv9IqB8xbzSVQ02tcTnQFNb8HKsmUsU+6 0vEpsVtZdpOYYpoXX5G+aNYPT860X8CK+jZcHVsKQF6H8q0HJKuiHNJJZ8hFcl3JAGRc RQXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=dlC7sYmE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a13si12462139pgh.561.2019.02.03.05.40.47; Sun, 03 Feb 2019 05:40:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=dlC7sYmE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727854AbfBCNkp (ORCPT + 31 others); Sun, 3 Feb 2019 08:40:45 -0500 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:57524 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726664AbfBCNkn (ORCPT ); Sun, 3 Feb 2019 08:40:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=GXI1MtsIhmcQ974iRTmjpWmjsRXrYgeNfDwmfPbl/68=; b=dlC7sYmEosC9VKr/Lo6mR0uYx+ wwnIVoMYEaCNx0WZ8AemE4DCMIatUeyTX+TPBJ2+2SMEg7W6+kUMjvE51OBWXeLdHQqMtcmOCxZwY RUzJzyv2mTD81calLCjaTVZ+oaIlZiPn0EVXRIKGJ3ERuhMutGwWq3xCGjooLq1ng8Hs=; Received: from [2001:67c:1810:f055:877d:5801:eba7:24a1] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gqI0b-0000WJ-0r; Sun, 03 Feb 2019 13:40:29 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 8D9D1440071; Sun, 3 Feb 2019 13:40:26 +0000 (GMT) From: Mark Brown To: Shuah Khan , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" , Andy Lutomirski Cc: linux-kernel@vger.kernel.org, x86@kernel.org, linux-kselftest@vger.kernel.org, Mark Brown Subject: [PATCH 1/2] selftests/x86/fsgsbase: Indirect output through a wrapper function Date: Sun, 3 Feb 2019 14:40:16 +0100 Message-Id: <20190203134017.9375-2-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190203134017.9375-1-broonie@kernel.org> References: <20190203134017.9375-1-broonie@kernel.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation for a change to make this test run repeatedly which would generate huge amounts of output as is indirect all the printf() calls in the program through a wrapper and add a quiet flag which can be used to suppress the output. This is fairly quick and dirty, I'm not 100% sure what would be idiomatic here. Signed-off-by: Mark Brown --- tools/testing/selftests/x86/fsgsbase.c | 52 ++++++++++++++++---------- 1 file changed, 32 insertions(+), 20 deletions(-) -- 2.20.1 diff --git a/tools/testing/selftests/x86/fsgsbase.c b/tools/testing/selftests/x86/fsgsbase.c index f249e042b3b5..6cda6daa1f8c 100644 --- a/tools/testing/selftests/x86/fsgsbase.c +++ b/tools/testing/selftests/x86/fsgsbase.c @@ -7,6 +7,7 @@ #define _GNU_SOURCE #include #include +#include #include #include #include @@ -32,6 +33,17 @@ static volatile sig_atomic_t want_segv; static volatile unsigned long segv_addr; static int nerrs; +static bool quiet; + +static void logger(const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + if (!quiet) + vprintf(fmt, args); + va_end(args); +} static void sethandler(int sig, void (*handler)(int, siginfo_t *, void *), int flags) @@ -118,29 +130,29 @@ static void check_gs_value(unsigned long value) unsigned long base; unsigned short sel; - printf("[RUN]\tARCH_SET_GS to 0x%lx\n", value); + logger("[RUN]\tARCH_SET_GS to 0x%lx\n", value); if (syscall(SYS_arch_prctl, ARCH_SET_GS, value) != 0) err(1, "ARCH_SET_GS"); asm volatile ("mov %%gs, %0" : "=rm" (sel)); base = read_base(GS); if (base == value) { - printf("[OK]\tGSBASE was set as expected (selector 0x%hx)\n", + logger("[OK]\tGSBASE was set as expected (selector 0x%hx)\n", sel); } else { nerrs++; - printf("[FAIL]\tGSBASE was not as expected: got 0x%lx (selector 0x%hx)\n", + logger("[FAIL]\tGSBASE was not as expected: got 0x%lx (selector 0x%hx)\n", base, sel); } if (syscall(SYS_arch_prctl, ARCH_GET_GS, &base) != 0) err(1, "ARCH_GET_GS"); if (base == value) { - printf("[OK]\tARCH_GET_GS worked as expected (selector 0x%hx)\n", + logger("[OK]\tARCH_GET_GS worked as expected (selector 0x%hx)\n", sel); } else { nerrs++; - printf("[FAIL]\tARCH_GET_GS was not as expected: got 0x%lx (selector 0x%hx)\n", + logger("[FAIL]\tARCH_GET_GS was not as expected: got 0x%lx (selector 0x%hx)\n", base, sel); } } @@ -149,7 +161,7 @@ static void mov_0_gs(unsigned long initial_base, bool schedule) { unsigned long base, arch_base; - printf("[RUN]\tARCH_SET_GS to 0x%lx then mov 0 to %%gs%s\n", initial_base, schedule ? " and schedule " : ""); + logger("[RUN]\tARCH_SET_GS to 0x%lx then mov 0 to %%gs%s\n", initial_base, schedule ? " and schedule " : ""); if (syscall(SYS_arch_prctl, ARCH_SET_GS, initial_base) != 0) err(1, "ARCH_SET_GS"); @@ -161,10 +173,10 @@ static void mov_0_gs(unsigned long initial_base, bool schedule) if (syscall(SYS_arch_prctl, ARCH_GET_GS, &arch_base) != 0) err(1, "ARCH_GET_GS"); if (base == arch_base) { - printf("[OK]\tGSBASE is 0x%lx\n", base); + logger("[OK]\tGSBASE is 0x%lx\n", base); } else { nerrs++; - printf("[FAIL]\tGSBASE changed to 0x%lx but kernel reports 0x%lx\n", base, arch_base); + logger("[FAIL]\tGSBASE changed to 0x%lx but kernel reports 0x%lx\n", base, arch_base); } } @@ -195,7 +207,7 @@ static void do_remote_base() unsigned short sel; asm volatile ("mov %%gs, %0" : "=rm" (sel)); - printf("\tother thread: ARCH_SET_GS(0x%lx)%s -- sel is 0x%hx\n", + logger("\tother thread: ARCH_SET_GS(0x%lx)%s -- sel is 0x%hx\n", to_set, hard_zero ? " and clear gs" : "", sel); } @@ -228,7 +240,7 @@ void do_unexpected_base(void) .useable = 0 }; if (syscall(SYS_modify_ldt, 1, &desc, sizeof(desc)) == 0) { - printf("\tother thread: using LDT slot 0\n"); + logger("\tother thread: using LDT slot 0\n"); asm volatile ("mov %0, %%gs" : : "rm" ((unsigned short)0x7)); } else { /* No modify_ldt for us (configured out, perhaps) */ @@ -250,10 +262,10 @@ void do_unexpected_base(void) munmap(low_desc, sizeof(desc)); if (ret != 0) { - printf("[NOTE]\tcould not create a segment -- test won't do anything\n"); + logger("[NOTE]\tcould not create a segment -- test won't do anything\n"); return; } - printf("\tother thread: using GDT slot %d\n", desc.entry_number); + logger("\tother thread: using GDT slot %d\n", desc.entry_number); asm volatile ("mov %0, %%gs" : : "rm" ((unsigned short)((desc.entry_number << 3) | 0x3))); } @@ -298,10 +310,10 @@ static void set_gs_and_switch_to(unsigned long local, local = 0; } - printf("[RUN]\tARCH_SET_GS(0x%lx)%s, then schedule to 0x%lx\n", + logger("[RUN]\tARCH_SET_GS(0x%lx)%s, then schedule to 0x%lx\n", local, hard_zero ? " and clear gs" : "", remote); if (force_sel) - printf("\tBefore schedule, set selector to 0x%hx\n", force_sel); + logger("\tBefore schedule, set selector to 0x%hx\n", force_sel); if (syscall(SYS_arch_prctl, ARCH_SET_GS, local) != 0) err(1, "ARCH_SET_GS"); if (hard_zero) @@ -309,7 +321,7 @@ static void set_gs_and_switch_to(unsigned long local, if (read_base(GS) != local) { nerrs++; - printf("[FAIL]\tGSBASE wasn't set as expected\n"); + logger("[FAIL]\tGSBASE wasn't set as expected\n"); } if (force_sel) { @@ -335,11 +347,11 @@ static void set_gs_and_switch_to(unsigned long local, asm volatile ("mov %%gs, %0" : "=rm" (sel_post_sched)); base = read_base(GS); if (base == local && sel_pre_sched == sel_post_sched) { - printf("[OK]\tGS/BASE remained 0x%hx/0x%lx\n", + logger("[OK]\tGS/BASE remained 0x%hx/0x%lx\n", sel_pre_sched, local); } else { nerrs++; - printf("[FAIL]\tGS/BASE changed from 0x%hx/0x%lx to 0x%hx/0x%lx\n", + logger("[FAIL]\tGS/BASE changed from 0x%hx/0x%lx to 0x%hx/0x%lx\n", sel_pre_sched, local, sel_post_sched, base); } } @@ -348,7 +360,7 @@ static void test_unexpected_base(void) { unsigned long base; - printf("[RUN]\tARCH_SET_GS(0), clear gs, then manipulate GSBASE in a different thread\n"); + logger("[RUN]\tARCH_SET_GS(0), clear gs, then manipulate GSBASE in a different thread\n"); if (syscall(SYS_arch_prctl, ARCH_SET_GS, 0) != 0) err(1, "ARCH_SET_GS"); asm volatile ("mov %0, %%gs" : : "rm" ((unsigned short)0)); @@ -360,10 +372,10 @@ static void test_unexpected_base(void) base = read_base(GS); if (base == 0) { - printf("[OK]\tGSBASE remained 0\n"); + logger("[OK]\tGSBASE remained 0\n"); } else { nerrs++; - printf("[FAIL]\tGSBASE changed to 0x%lx\n", base); + logger("[FAIL]\tGSBASE changed to 0x%lx\n", base); } } From patchwork Sun Feb 3 13:40:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 157363 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2808232jaa; Sun, 3 Feb 2019 05:40:47 -0800 (PST) X-Google-Smtp-Source: ALg8bN7aoFpTha2UEh8TTeBzXawxjD0UZq5G1prq2VGD6O44Sr4WgMcC+amYvsc1zhsv7P52NwmY X-Received: by 2002:a17:902:9a02:: with SMTP id v2mr48645282plp.180.1549201246978; Sun, 03 Feb 2019 05:40:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549201246; cv=none; d=google.com; s=arc-20160816; b=uKur7XRaGR1qB7B51pLIqdM8/dLfw3dW7gFBlGF+e20azst7IiRtImSIP6eGdB9cyB V+K1rpPz4ffhgHPiMUdNX3Did7drke2E9FnhFSFgcAD+CrP5ypKsn8dDRyKrSCVYjlF9 w8ne3mqJdCmfb9//trihtzPlMv0TGA/oMvi3z9/tCv3g2FHZ0k2r6JuC+GOl/qfMr9J7 25Q2HQK8PbhGmAs4R1GHRa58xYGA2M7d6VhAzSgQad0RXx45XzercH4GHdFniciYkCD+ ZhuPFFBJzqcLzHMYzWeCT1WrJwWcv8sl/9Co9+AgbYSSq6zxaA+VC7UWyLXhBbM3hXPh Y6lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=VKySZkkI4XqwFjyt4DuiZf+0fTKw+MXXbKB8BaCZ13k=; b=f8oyFIZIqEq8s7Yx6PrSYYvhfiAoS3Lp7na/Ss1gzsBAGkAXTGFP1UM8Aoy9nUY3Fy sc8FFGQo0kh5VQRdm2WmyWlD5xBwbD4pDFSPEhDFd0EPP0p0J3FQ/4T4cWmumSUw3lK7 6MUAzdRF1FWogkGG3d1kb8kCF6E2wnBqYdRuQYzEhLJL1M7N96aV6Dtd4h/AcQHF386j 1c2mfvdc13yMamfQnYIT2gg1qxQAfKl53hOfZv0Yb59UFg7G+gGhJwlddonZBhygOPHw 6X+m2LAMMJs9KbBhex3mEHL8dW5Ze2Qa4kPbSTjQSekTvpAyR5IzWpz4DGYACZ93wm/z 3qvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=rMoGEuRa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a13si12462139pgh.561.2019.02.03.05.40.46; Sun, 03 Feb 2019 05:40:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=rMoGEuRa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727800AbfBCNkl (ORCPT + 31 others); Sun, 3 Feb 2019 08:40:41 -0500 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:57454 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726664AbfBCNkk (ORCPT ); Sun, 3 Feb 2019 08:40:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=VKySZkkI4XqwFjyt4DuiZf+0fTKw+MXXbKB8BaCZ13k=; b=rMoGEuRa5Ns7Sqj3C3wPhDndA+ DRllUrxjY2P7Pl6XtHB/CvviT+37/zwq7shrGySPhlonwsHe7Ql8HFTwdO8VkVKquCooankhnjxKe +GSVGtDTxVw5evEkkQA79x2N6bbhUhZjKrAbeeAQqPU79dGgcOIpCzTxSqZvrFDxPzpg=; Received: from [2001:67c:1810:f055:877d:5801:eba7:24a1] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gqI0a-0000WH-WB; Sun, 03 Feb 2019 13:40:29 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 90A91440083; Sun, 3 Feb 2019 13:40:26 +0000 (GMT) From: Mark Brown To: Shuah Khan , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" , Andy Lutomirski Cc: linux-kernel@vger.kernel.org, x86@kernel.org, linux-kselftest@vger.kernel.org, Mark Brown , Dan Rue Subject: [PATCH 2/2] selftests/x86/fsgsbase: Default to trying to run the test repeatedly Date: Sun, 3 Feb 2019 14:40:17 +0100 Message-Id: <20190203134017.9375-3-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190203134017.9375-1-broonie@kernel.org> References: <20190203134017.9375-1-broonie@kernel.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In automated testing it has been found that on many systems the fsgsbase test fails intermittently. This was reported and discussed a while back: https://lore.kernel.org/lkml/20180126153631.ha7yc33fj5uhitjo@xps/ with the analysis concluding that this is a hardware issue affecting a subset of systems but no fix has been merged as yet. As well as the actual problem found by testing the intermittent test failure is causing issues for the people doing the automated testing due to the noise. In order to make the testing stable modify the test program to iterate through the test repeatedly, choosing 5000 iterations based on prior reports and local testing. This unfortunately greatly increases the execution time for the selftests when things succeed which isn't great, in my local tests on a range of systems it pushes the execution time up to approximately a minute when no failures are encountered. Reported-by: Dan Rue Signed-off-by: Mark Brown --- tools/testing/selftests/x86/fsgsbase.c | 27 +++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/tools/testing/selftests/x86/fsgsbase.c b/tools/testing/selftests/x86/fsgsbase.c index 6cda6daa1f8c..83410749ff1f 100644 --- a/tools/testing/selftests/x86/fsgsbase.c +++ b/tools/testing/selftests/x86/fsgsbase.c @@ -379,7 +379,7 @@ static void test_unexpected_base(void) } } -int main() +int test() { pthread_t thread; @@ -437,3 +437,28 @@ int main() return nerrs == 0 ? 0 : 1; } + +int main() +{ + int tries = 5000; + int i; + + if (tries > 1) + quiet = true; + + for (i = 0; i < tries; i++) { + if (test() != 0) + break; + } + + if (quiet) { + if (nerrs) { + printf("[FAIL] %d errors detected in %d tries\n", + nerrs, i + 1); + } else { + printf("[PASS] %d runs succeeded\n", i); + } + } + + return nerrs == 0 ? 0 : 1; +}