From patchwork Thu Sep 16 16:00:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 513013 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp1400172jao; Thu, 16 Sep 2021 09:55:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysX7a+hr4n7vtFHU9x79k1AEQLINvYoUgAFmuWqGz2UWBzynTuk/EeBAkxTdW+3eEvyddt X-Received: by 2002:a02:a48:: with SMTP id 69mr5267637jaw.42.1631811323215; Thu, 16 Sep 2021 09:55:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631811323; cv=none; d=google.com; s=arc-20160816; b=qyVvv2HEMOiCM74fpCh02nXBtrxonAyG4wa424mwxr7efakxkdG+TO0SR0q0cIh6Sm hsPh6GCKmbBuhnRNLxPy8MLYxP9g+df4wy4sTmZeEEpFu3WcV2mNV67Pu/2CMyQcT5wk PDfxith3IHk0J/08YmoFdwmJccZRmUFYcMxHxyqjKGN89a9EaLTr4R7ZmORn89e2ocUc v8dSrUdOSIXzynnGCLMiWWjw20arWdgru/U9juWsxWl/PtLactFgjXneUWwYms2VK+aQ iO0elYRFX1LsnyvEFLaiB10u6N7Bfva//9L92ZCVCMZvGt8FIG8bCvrnXBiJtctGavvV TAUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DnNrzP8j9q8Ik75DL+0b42qCHjdjADkr5+cykFPrHtw=; b=OWimM+saw3qi7+ZFMz/7HRvAT6TF7IJnLuyyhEhZs5AQLJJ4O1J8LaS3QVDB/uXWjZ lDqrcsu0R6nfOGXrqOtK44JJO7eD1CRVWZ4oeK1LhhYrg2ZTzFac5YpjUNOuJD+yK46t fKpvPxEsZrsvawMMjsDinTS0bBYGMSGzW+HXqGKF7r6BJ6XUmJw/b18liw96YWZ8VVEq yfpzsXCvvdMnNiDlaFQni/poQ7YqEoElGSEn8LPLMvao1F751agxLYoQfLIYXLmnGwJF e86tU3vn2YAZ8bDZJM+A9ejDdoTw7pg79YQGJNXUvrIebaKhOh+CCNm5QOuVAk8ro//L sgxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sOMth0DV; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v18si3447989ilc.7.2021.09.16.09.55.22; Thu, 16 Sep 2021 09:55:23 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sOMth0DV; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241802AbhIPQ4k (ORCPT + 11 others); Thu, 16 Sep 2021 12:56:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:51240 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346230AbhIPQyb (ORCPT ); Thu, 16 Sep 2021 12:54:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2424861355; Thu, 16 Sep 2021 16:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631809804; bh=n94kMwFHUMe+HkJMYWMwz/mNrdLxyfQDhWM2x1S7TPk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sOMth0DVLMjbvqIP+AV5FpnQWHp8Z0LDjbBxp+OUbV9YW1rCj35ooBQgzDSu1PiSt BzbNX9hk8lwKpevjRJ7dwCk1a3RZ8CXoi5VlGiQ7a8PT57freY6Wq9zOhoFc1r3SEw TO/mIl1/RB4fD8RkSjUjImKH5C8Ob12Z2VnE1Ym4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mark Brown , Catalin Marinas , Sasha Levin Subject: [PATCH 5.13 290/380] kselftest/arm64: pac: Fix skipping of tests on systems without PAC Date: Thu, 16 Sep 2021 18:00:47 +0200 Message-Id: <20210916155813.929919044@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Brown [ Upstream commit 0c69bd2ca6ee20064dde7853cd749284e053a874 ] The PAC tests check to see if the system supports the relevant PAC features but instead of skipping the tests if they can't be executed they fail the tests which makes things look like they're not working when they are. Signed-off-by: Mark Brown Link: https://lore.kernel.org/r/20210819165723.43903-1-broonie@kernel.org Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- tools/testing/selftests/arm64/pauth/pac.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.30.2 diff --git a/tools/testing/selftests/arm64/pauth/pac.c b/tools/testing/selftests/arm64/pauth/pac.c index 592fe538506e..b743daa772f5 100644 --- a/tools/testing/selftests/arm64/pauth/pac.c +++ b/tools/testing/selftests/arm64/pauth/pac.c @@ -25,13 +25,15 @@ do { \ unsigned long hwcaps = getauxval(AT_HWCAP); \ /* data key instructions are not in NOP space. This prevents a SIGILL */ \ - ASSERT_NE(0, hwcaps & HWCAP_PACA) TH_LOG("PAUTH not enabled"); \ + if (!(hwcaps & HWCAP_PACA)) \ + SKIP(return, "PAUTH not enabled"); \ } while (0) #define ASSERT_GENERIC_PAUTH_ENABLED() \ do { \ unsigned long hwcaps = getauxval(AT_HWCAP); \ /* generic key instructions are not in NOP space. This prevents a SIGILL */ \ - ASSERT_NE(0, hwcaps & HWCAP_PACG) TH_LOG("Generic PAUTH not enabled"); \ + if (!(hwcaps & HWCAP_PACG)) \ + SKIP(return, "Generic PAUTH not enabled"); \ } while (0) void sign_specific(struct signatures *sign, size_t val) @@ -256,7 +258,7 @@ TEST(single_thread_different_keys) unsigned long hwcaps = getauxval(AT_HWCAP); /* generic and data key instructions are not in NOP space. This prevents a SIGILL */ - ASSERT_NE(0, hwcaps & HWCAP_PACA) TH_LOG("PAUTH not enabled"); + ASSERT_PAUTH_ENABLED(); if (!(hwcaps & HWCAP_PACG)) { TH_LOG("WARNING: Generic PAUTH not enabled. Skipping generic key checks"); nkeys = NKEYS - 1; @@ -299,7 +301,7 @@ TEST(exec_changed_keys) unsigned long hwcaps = getauxval(AT_HWCAP); /* generic and data key instructions are not in NOP space. This prevents a SIGILL */ - ASSERT_NE(0, hwcaps & HWCAP_PACA) TH_LOG("PAUTH not enabled"); + ASSERT_PAUTH_ENABLED(); if (!(hwcaps & HWCAP_PACG)) { TH_LOG("WARNING: Generic PAUTH not enabled. Skipping generic key checks"); nkeys = NKEYS - 1;