From patchwork Fri Sep 29 11:20:38 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: 146529 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3987832vqu; Fri, 29 Sep 2023 05:28:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFyb0pAY946fwKNCp1TmqrR3X7QCnGuYsUothQNTQOXVkQoKCqsIsUiQpPK3d3A6mbhc8T4 X-Received: by 2002:a05:6a20:a110:b0:13d:1d14:6693 with SMTP id q16-20020a056a20a11000b0013d1d146693mr4385118pzk.45.1695990506442; Fri, 29 Sep 2023 05:28:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695990506; cv=none; d=google.com; s=arc-20160816; b=Q1pdeMQy8gtZyRzxP2MNpgK/9r82W/e9mouAfgMbSsHwwZyXmoy6pYxE1Et6xIroKW pqgI7Trbz7M/dj0nT/OjluOC19FEi1AaPQo1DmYGCg5JyJDeyq/YvbVhEzNAQv3dkWaK f4ABzSc3ez602LHgn0ifIKvG5lqlZtTeZ0hqlMVYgVEXHj52lTQYuT2E2bDN5yLj3qou DePur93hSIiqRjYc69CShHUGfmNNZ1BtkPJjyBFFYY2Y9dejUBo9miZxQHqdYrV30Hld CQbLcWHg1vJQxZhv8VRHvW++QI2Rt/w3k03r6oCsY6HEALc7ti7QOtPWHZwnVxx0sfte N6Og== 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=FCDDx+g9WyxQok3snwGB0K5XwwN6SQrpJdNL/XdQeug=; fh=0zBAjxShfumhVJgCQ7/PrZqZq2D8mhtAJK1GC38L6Jc=; b=GV5jf+uNbleyLK0WMLj0ifAB4VoMAIpnv+H2ekBfHzX08ScF2EQHijeRf5Db7KvmB1 kZIru1+4vjjjpdSUbIFPOnPWfIopLcrpwX+uIsGDnXbs5iJE5DAilIPOgcOHoWxHnKc+ 5JhFGDtBuKWxMvh2TnK6WCh5EBzs3EmwMAwbrkEZ1W3pF4zngMfG0nta61hJ9Bx//PO+ 8yOB2pqCx+DNS7hdKX+Bty4nvLlwt+qm283clY3AuGDZ0IVqB5BC6F2z2EjbMzS8qej1 qQlg50xFinlYDeSyKz+kQROZhy2dd8pppg7f22chj5bbKUDbMd7nr3yyCGcVvm7Qqpe0 sRdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HXE2UCMY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id by6-20020a056a00400600b0068fc2f7cef3si19709667pfb.358.2023.09.29.05.28.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 05:28:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HXE2UCMY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 0E01980BB56F; Fri, 29 Sep 2023 04:22:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233106AbjI2LWG (ORCPT + 20 others); Fri, 29 Sep 2023 07:22:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233102AbjI2LWA (ORCPT ); Fri, 29 Sep 2023 07:22:00 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F109CD3; Fri, 29 Sep 2023 04:21:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695986515; x=1727522515; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5l0ZHuykukESFgWvvhf6YnavKoa3byGUAMZS0+yfFSI=; b=HXE2UCMY2u3nmGx39Avlik5FQtNktHAMvCTOEW4nAKH+JPSGEnWxH4dk 7KeP9KcqhBiGpiwxpe4joj/D5ePcwU0TazNd5sEBwsceEwSc1zrgSEap1 htUbr3dCiuSm0zr1HG+NztHeLWaUXPc/2jc2hAF3oDECxO70z/+NwTTy+ +Il+8gMXE2kJhOiBlm4H4xr4r9mIZQ9HLAHEDpu4GS1cc6yRCOLAwENOt 1KlJ8fFecIKJCL62I+qSQ0tV55PbMf6uvlylJqNGsBgggdEo45cvC3U0t 2TLTBPO+J8Qh/LMWQ9ZrQiL57M2p1tLSiOOx5Tmr1UxO7/lInUGbHaIs+ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10847"; a="361655039" X-IronPort-AV: E=Sophos;i="6.03,187,1694761200"; d="scan'208";a="361655039" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2023 04:21:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10847"; a="996901553" X-IronPort-AV: E=Sophos;i="6.03,187,1694761200"; d="scan'208";a="996901553" Received: from valeks2x-mobl.ger.corp.intel.com (HELO localhost) ([10.252.53.242]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2023 04:21:51 -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 v3 6/7] selftests/resctrl: Fix feature checks Date: Fri, 29 Sep 2023 14:20:38 +0300 Message-Id: <20230929112039.7488-7-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230929112039.7488-1-ilpo.jarvinen@linux.intel.com> References: <20230929112039.7488-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email 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 (groat.vger.email [0.0.0.0]); Fri, 29 Sep 2023 04:22:20 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778374941283332815 X-GMAIL-MSGID: 1778374941283332815 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 7836bf0655fe..063fc3e50e48 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; }