From patchwork Mon Oct 2 09:48:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 147317 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1465383vqb; Mon, 2 Oct 2023 07:28:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH8MUuVJSX4VuYXf5RU5w/Dti12DTTvDldsOjiu7JiJEYlI8taz46KIeTdcF39ECqi8w4W5 X-Received: by 2002:a17:903:1109:b0:1c6:17a4:afae with SMTP id n9-20020a170903110900b001c617a4afaemr13710502plh.4.1696256881670; Mon, 02 Oct 2023 07:28:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696256881; cv=none; d=google.com; s=arc-20160816; b=SoaJdLip12bqr5bexy0KyUZ9ueXJ6iMOCmifUJwzsywezMzrJoq+3d5RNEhZhNjM0M krxRpVNSWTozz0Ms7CfGEYrJ1My530ozcH6zCK0EoR1yAUDaSsesdb1dWlCL1qfu/aZ0 TlnL1n36e+dDEKTyM8u27TJ7DkfrAc7BAuFq+c0LAHXf5HjdsKJ+XSDtN3IHOODU1tCd +z6G8Cn4JEppU+AH1aFR/1yKDG/KUVIM63SsmVVvnGdxoqxeQLQR15kFyDiDKZXsPGh6 8q5THwsjVQVxgSKGhBMADNf2DPDNshNr/PzXljo0M57/T2Raesrz8MX6stBkb2WjKgCx SE0A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8frexNrSmqr+3APsrehSj53WZhLYTX9yXPkDqN7c1Mc=; fh=0zBAjxShfumhVJgCQ7/PrZqZq2D8mhtAJK1GC38L6Jc=; b=mUfwFmKRP0Ntp0P70wii9OkQdW1VAS2KbJGif7sFreak9AD2VXhp+C3B+FR+Bbk9JD amNVpyECGlcJRPyjKmEUvpzWx7EVw9I9u1uXwq73BG9VrKUDebKQT8BWBL4gCuqDRX+P kYPhf7a+8tgn1pqNa2KL6506QXWz/4AW3flICkURI6smxwFJ/2MlfRTBxWViwaM5918J PoMYqzJnbEJZHc3McbhiWxsugaX3c9cYnLYkjPvX8t23OlhjXSMZD5tygEUqYBkCeJZ2 J+rc48hijx8A3HPHXDFgQSr2JB+6GtOuPZ5Kzk+TZHua22ALN1HG80ORUMeg/7KNzMT6 tp0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Rw4xOaGs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id z14-20020a1709027e8e00b001c5fb45613dsi21485066pla.318.2023.10.02.07.28.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 07:28:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Rw4xOaGs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id A6589809778A; Mon, 2 Oct 2023 02:49:44 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236265AbjJBJtg (ORCPT + 16 others); Mon, 2 Oct 2023 05:49:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236263AbjJBJte (ORCPT ); Mon, 2 Oct 2023 05:49:34 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15B02AC; Mon, 2 Oct 2023 02:49:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696240172; x=1727776172; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=74ZZ/564V4oDiXOyHfqgSxaGtj8l14K+TxF0BdYOyXM=; b=Rw4xOaGsK3ECrjctpWCSRWGZe849jkgHcFD1YdvgNJD1HXAXmM/hcD7L 5ok8f7r/uhJpE4Z/AeVLhi0jYN3LfC1ezK4Yd6Y23a+Zd2TGxLS9Q72bJ fnDRI3LsMG6Qx699qEwxkOe577iglHcxM2SS4XwLQSe7IFwIeTGO6f+Lf Q8QeAPQMS2bOXCH+s1mV2r6iAHkZ6nG5/Tuf8VU1WWLeQbGVfA0RqXi3P o7Wc7lDMIUOpFHrGcNJqDLpMzD1+sTytLuPMcIt25U6MeyJqbwjP1JOoK Sza0tjYIgmZtDokhUQJjweKmXkdBi6So4HyCk8BdVPBPc8pDNQYN9KKZn w==; X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="381495440" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="381495440" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 02:49:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10850"; a="866456931" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="866456931" Received: from aanantha-mobl.gar.corp.intel.com (HELO localhost) ([10.251.221.191]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 02:49:28 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: linux-kselftest@vger.kernel.org, Shuah Khan , Reinette Chatre , =?utf-8?q?Maciej_Wiecz=C3=B3r-?= =?utf-8?q?Retman?= , Shaopeng Tan Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, =?utf-8?q?Ilpo_J?= =?utf-8?q?=C3=A4rvinen?= Subject: [PATCH v4 6/7] selftests/resctrl: Fix feature checks Date: Mon, 2 Oct 2023 12:48:12 +0300 Message-Id: <20231002094813.6633-7-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231002094813.6633-1-ilpo.jarvinen@linux.intel.com> References: <20231002094813.6633-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 02 Oct 2023 02:49:44 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778654255668717598 X-GMAIL-MSGID: 1778654255668717598 The MBA and CMT tests expect support of other features to be able to run. When platform only supports MBA but not MBM, MBA test will fail with: Failed to open total bw file: No such file or directory When platform only supports CMT but not CAT, CMT test will fail with: Failed to open bit mask file '/sys/fs/resctrl/info/L3/cbm_mask': No such file or directory It leads to the test reporting test fail (even if no test was run at all). Extend feature checks to cover these two conditions to show these tests were skipped rather than failed. Fixes: ee0415681eb6 ("selftests/resctrl: Use resctrl/info for feature detection") Signed-off-by: Ilpo Järvinen Tested-by: Shaopeng Tan Reviewed-by: Reinette Chatre Reviewed-by: Shaopeng Tan Cc: # selftests/resctrl: Refactor feature check to use resource and feature name --- tools/testing/selftests/resctrl/resctrl_tests.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c index a19dcc3f8fb0..2bbe3045a018 100644 --- a/tools/testing/selftests/resctrl/resctrl_tests.c +++ b/tools/testing/selftests/resctrl/resctrl_tests.c @@ -130,7 +130,9 @@ static void run_mba_test(const char * const *benchmark_cmd, int cpu_no) return; } - if (!validate_resctrl_feature_request("MB", NULL) || (get_vendor() != ARCH_INTEL)) { + if (!validate_resctrl_feature_request("MB", NULL) || + !validate_resctrl_feature_request("L3_MON", "mbm_local_bytes") || + (get_vendor() != ARCH_INTEL)) { ksft_test_result_skip("Hardware does not support MBA or MBA is disabled\n"); goto cleanup; } @@ -153,7 +155,8 @@ static void run_cmt_test(const char * const *benchmark_cmd, int cpu_no) return; } - if (!validate_resctrl_feature_request("L3_MON", "llc_occupancy")) { + if (!validate_resctrl_feature_request("L3_MON", "llc_occupancy") || + !validate_resctrl_feature_request("L3", NULL)) { ksft_test_result_skip("Hardware does not support CMT or CMT is disabled\n"); goto cleanup; }