From patchwork Tue Aug 13 10:45:13 2024 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: 13761760 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D92E876025; Tue, 13 Aug 2024 10:45:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723545939; cv=none; b=A+MteoZX+AyiuQCI8FHfffG2694jnuFh6bdR980Mp+8U350/rfJjcIr3J6vHu8QVoTVfYh+f7EkiKmGh24u1EdrPn+MIqeSymc2peKr7fNBQfuOEVqLAUQmS9gMYFl6wCfKewBHl8EuoTdJSkS7PJ5XcgT+hXWRuDZCj8G+6N4U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723545939; c=relaxed/simple; bh=Wc6JtmV6Oc9mUVenADICsjG8fBbJzxjtHcl4cNUR74w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=rOnY5sh8BARJgXCggbardiywiYLg9wiwNjFOULJLabCU/x8qSDkfBIA+LEnoI8wtW04G9PU3UmG3/Qv5svRUmeJJsZ2tPATxQoqLwSu4dtBkPvrCaA7BY2GUfFLrNNoR20+F/p7iIK/BtarzEuOjezQTwqqqUKFqtBISD+hlf34= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=YmeA7ZZx; arc=none smtp.client-ip=198.175.65.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="YmeA7ZZx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723545938; x=1755081938; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Wc6JtmV6Oc9mUVenADICsjG8fBbJzxjtHcl4cNUR74w=; b=YmeA7ZZxS1iHsVOKOjp60X4zDZIxScHtVpbn/IgNmV8bqU3N/xymuJKg ZEZDIBA8QQzAEGlLmru9gZ79aINMrcI0gDDEsLmrEtoHGTTrOtiPeA4qq bNb/FrH88OTYcRBHzLQAQqExNmMj0+kDC1MY1h9Yg428DpzHNARp9n8MX FcMs4fASrKiMID/X2HVYIuoWL84HGuGrJahr9wS5CpIfPNPfQXejxG4zR RzZz//wDHMdE7dCN6/H0ZPwRkK6bCdUe93v3bsbF36Dpbq7pOaS75ziYy PmlK89dpN9GMpFGbbMZjwDKZcHF6GroYffTJGBrlEsJrjr+Md02jgsO05 A==; X-CSE-ConnectionGUID: Ly6o/u5ySDK604cskoLxdw== X-CSE-MsgGUID: rQ07yxktSy2XxoYNDDLO/A== X-IronPort-AV: E=McAfee;i="6700,10204,11162"; a="39148373" X-IronPort-AV: E=Sophos;i="6.09,285,1716274800"; d="scan'208";a="39148373" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 03:45:37 -0700 X-CSE-ConnectionGUID: Lf554aaQTcCm4QW0zSEftg== X-CSE-MsgGUID: 5oR2ceEbTtitKUGbcCPxAQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,285,1716274800"; d="scan'208";a="62786950" Received: from ijarvine-desk1.ger.corp.intel.com (HELO localhost) ([10.245.244.153]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 03:45:34 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Muhammad Usama Anjum , Shuah Khan , Reinette Chatre , linux-kselftest@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Shaopeng Tan , Fenghua Yu , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH 1/3] selftests/resctrl: Generalize non-contiguous CAT check Date: Tue, 13 Aug 2024 13:45:13 +0300 Message-Id: <20240813104515.19152-2-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240813104515.19152-1-ilpo.jarvinen@linux.intel.com> References: <20240813104515.19152-1-ilpo.jarvinen@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 arch_supports_noncont_cat() checks if vendor is ARCH_AMD and if that is not true, ARCH_INTEL is assumed which might not be true either because get_vendor() can also return zero if neither AMD nor Intel is detected. Generalize the vendor check using switch/case logic and return false for unknown vendors. Signed-off-by: Ilpo Järvinen Reviewed-by: Muhammad Usama Anjum --- tools/testing/selftests/resctrl/cat_test.c | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/resctrl/cat_test.c b/tools/testing/selftests/resctrl/cat_test.c index 742782438ca3..51a1cb6aac34 100644 --- a/tools/testing/selftests/resctrl/cat_test.c +++ b/tools/testing/selftests/resctrl/cat_test.c @@ -292,19 +292,25 @@ static bool arch_supports_noncont_cat(const struct resctrl_test *test) { unsigned int eax, ebx, ecx, edx; - /* AMD always supports non-contiguous CBM. */ - if (get_vendor() == ARCH_AMD) + switch (get_vendor()) { + case ARCH_AMD: + /* AMD always supports non-contiguous CBM. */ return true; - /* Intel support for non-contiguous CBM needs to be discovered. */ - if (!strcmp(test->resource, "L3")) - __cpuid_count(0x10, 1, eax, ebx, ecx, edx); - else if (!strcmp(test->resource, "L2")) - __cpuid_count(0x10, 2, eax, ebx, ecx, edx); - else - return false; + case ARCH_INTEL: + /* Intel support for non-contiguous CBM needs to be discovered. */ + if (!strcmp(test->resource, "L3")) + __cpuid_count(0x10, 1, eax, ebx, ecx, edx); + else if (!strcmp(test->resource, "L2")) + __cpuid_count(0x10, 2, eax, ebx, ecx, edx); + else + return false; + + return ((ecx >> 3) & 1); - return ((ecx >> 3) & 1); + default: + return false; + } } static int noncont_cat_run_test(const struct resctrl_test *test, From patchwork Tue Aug 13 10:45:14 2024 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: 13761761 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C2AB8170A0E; Tue, 13 Aug 2024 10:45:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723545950; cv=none; b=P9WapAxa0XsQxuR+pZzxCotDFvzjZ3t0O/zjRzzG04Uvj20mwfW0LeZUa1StMVqZihKYSX7ClCJ+uxxXi9hoh1/Epw+zZGtQHLGRwDPSCwe5SDQSab36Sw88E9us/Gj3+c9t1Dd+Hr9E1yegQNUgYX/IFKEKgypY3b67Zo9Va8o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723545950; c=relaxed/simple; bh=Ym9owthrbjXls/1zHUYjwSlYFNOdKvhxf1RaVgaxXY0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=FZRPvX2eBjR9O9P0dAllo+wgqQCEYCBi22XkBEFvS24ltziF3k4IRrKyZvflExH/D8KAdzYr7voXAJOqpurSVfn4j/u8aiZHwlVI45O5DseKVUmps9vPvSOXKpXkFebMNxXhp1d9OUpHOFUILEigNOP0AInwKZ+P1I8fTyhanHc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=mcLpu6po; arc=none smtp.client-ip=198.175.65.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="mcLpu6po" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723545949; x=1755081949; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ym9owthrbjXls/1zHUYjwSlYFNOdKvhxf1RaVgaxXY0=; b=mcLpu6poCTQQAawhZyagZIaAURGb01Zr2zdSOde45A3uAZo2NRiZh1QM YlyeoAIKxvUToR+F3ifSefObNJZG5yWG3nm97FmdqcparOhKwBUNxlmxU nAw/YTjLPtbs/y8zPwmIrX4uGgrVDiKg5huoNxrdV6Aosee1jEGHogxLW DxJeoB3WgzPVeDj6yfcaY6ATUhYIbrpR0AOg6ijmEQmyNffy1aJweS9Uv CrzE5LQRFkQW7aedWTPGUdt62B3wU5OL3nhdBiGZPnK2DNHTPb8od9gI7 Ot5lgj7M8ZTp2E772apEvQb+MyaBy4/+hm69q0n8wAHmZSkkexSdL4B0j Q==; X-CSE-ConnectionGUID: OaOoKwg2QRmy9AZsjVX3ag== X-CSE-MsgGUID: yxj9Wg7oQhKP2vHB2HKc8w== X-IronPort-AV: E=McAfee;i="6700,10204,11162"; a="39148393" X-IronPort-AV: E=Sophos;i="6.09,285,1716274800"; d="scan'208";a="39148393" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 03:45:45 -0700 X-CSE-ConnectionGUID: FdeGQ1LdS8Og/1oLeWS0Kw== X-CSE-MsgGUID: Qk/6pKXRRLi34EwGbC/pKg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,285,1716274800"; d="scan'208";a="62786970" Received: from ijarvine-desk1.ger.corp.intel.com (HELO localhost) ([10.245.244.153]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 03:45:42 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Muhammad Usama Anjum , Shuah Khan , Reinette Chatre , linux-kselftest@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Shaopeng Tan , Fenghua Yu , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH 2/3] selftests/resctrl: Always initialize ecx to avoid build warnings Date: Tue, 13 Aug 2024 13:45:14 +0300 Message-Id: <20240813104515.19152-3-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240813104515.19152-1-ilpo.jarvinen@linux.intel.com> References: <20240813104515.19152-1-ilpo.jarvinen@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To avoid warnings when __cpuid_count() is an empty stub, always initialize ecx because it is used in the return statement. Signed-off-by: Ilpo Järvinen Reviewed-by: Muhammad Usama Anjum --- tools/testing/selftests/resctrl/cat_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/resctrl/cat_test.c b/tools/testing/selftests/resctrl/cat_test.c index 51a1cb6aac34..9882c5d19408 100644 --- a/tools/testing/selftests/resctrl/cat_test.c +++ b/tools/testing/selftests/resctrl/cat_test.c @@ -290,7 +290,7 @@ static int cat_run_test(const struct resctrl_test *test, const struct user_param static bool arch_supports_noncont_cat(const struct resctrl_test *test) { - unsigned int eax, ebx, ecx, edx; + unsigned int eax, ebx, ecx = 0, edx; switch (get_vendor()) { case ARCH_AMD: From patchwork Tue Aug 13 10:45:15 2024 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: 13761762 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A649E19412F; Tue, 13 Aug 2024 10:45:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723545956; cv=none; b=mdH134eUMRojZHGjh2O3WwTuqtE9hX4DE8/vIlcavScaF2aahtJHI0fJcgeS+sG4lXB5yacmbB+35l+V1npibFgaqLyQMSQOkkcvJ/2rDVMzD86NARagjJfxIcMnKIDk7LUBInwds05a7IrjIt1d+yONgpsm8gkhKJofnYK3Eng= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723545956; c=relaxed/simple; bh=v81MhE6xDXgDZOFXo+ZC17F/It7tvKtBSbnCvwss14Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=PEwLCmapSYZw9KoAhamo1h6MKvxD6rkEG01MSF7KBUfwY1KBd9o7TsbyYEEle2ZQYsp5xb5XQJL30PEIviadXbEUR/pXt6PfdykaLtXnvxjAnQU7R5MLhPzj0q9h8EV8Q1ibvxLKjxBBZeXqE8jiTP8aLlASt4UZkTWPEJlclj0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=M7oeg30Q; arc=none smtp.client-ip=198.175.65.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="M7oeg30Q" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723545954; x=1755081954; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=v81MhE6xDXgDZOFXo+ZC17F/It7tvKtBSbnCvwss14Y=; b=M7oeg30QnaExdZm9e67V5ihPXT3g56xFrcs9FNjH3Fp3a7sh/5MY3J1O uXlTARuxkLArUVDIVqP+191HS5oKmfpoOEAZzWFb1qyagoIzZnIgw0sKW un94584DuqGmUICKbHNoYvcwfK5Yr33h9MeILHwQqa6mJ2qDUiUSn0ghu Brdi/NnuHhS108FWvwrxuJ3pm6AotRWg7S7YysX0V2X2/FTty0IF5HFH+ FgHQRtPUBUfYWTuUnyc5FnSnaKDC561mxX7wa9uS7OL1bUcjzGmygKDCc wNIETn+AP1xrfX/7cs2Tj894LRozlGEf4PbrGRtFB4EJLk6wD9VWMttwd g==; X-CSE-ConnectionGUID: JleBrvYgTYi2n4GLcBdsxA== X-CSE-MsgGUID: 4I5f5SLOT96bgsaKw8s+Dw== X-IronPort-AV: E=McAfee;i="6700,10204,11162"; a="39148404" X-IronPort-AV: E=Sophos;i="6.09,285,1716274800"; d="scan'208";a="39148404" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 03:45:54 -0700 X-CSE-ConnectionGUID: vMHT6o2AS5SnzpzhOdOgKg== X-CSE-MsgGUID: /nl3434FS8Wc/mvNuYIfAg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,285,1716274800"; d="scan'208";a="62786989" Received: from ijarvine-desk1.ger.corp.intel.com (HELO localhost) ([10.245.244.153]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2024 03:45:51 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Muhammad Usama Anjum , Shuah Khan , Reinette Chatre , linux-kselftest@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Shaopeng Tan , Fenghua Yu , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [RFC PATCH 3/3] kselftest: Provide __cpuid_count() stub on non-x86 archs Date: Tue, 13 Aug 2024 13:45:15 +0300 Message-Id: <20240813104515.19152-4-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240813104515.19152-1-ilpo.jarvinen@linux.intel.com> References: <20240813104515.19152-1-ilpo.jarvinen@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Building resctrl selftest fails on ARM because it uses __cpuid_count() that fails the build with error: CC resctrl_tests In file included from resctrl.h:24, from cat_test.c:11: In function 'arch_supports_noncont_cat', inlined from 'noncont_cat_run_test' at cat_test.c:323:6: ../kselftest.h:74:9: error: impossible constraint in 'asm' 74 | __asm__ __volatile__ ("cpuid\n\t" \ | ^~~~~~~ cat_test.c:301:17: note: in expansion of macro '__cpuid_count' 301 | __cpuid_count(0x10, 1, eax, ebx, ecx, edx); | ^~~~~~~~~~~~~ ../kselftest.h:74:9: error: impossible constraint in 'asm' 74 | __asm__ __volatile__ ("cpuid\n\t" \ | ^~~~~~~ cat_test.c:303:17: note: in expansion of macro '__cpuid_count' 303 | __cpuid_count(0x10, 2, eax, ebx, ecx, edx); | ^~~~~~~~~~~~~ The resctrl selftest would run that code only on Intel CPUs but as is, the code cannot be build at all. Provide an empty stub for __cpuid_count() if it is not supported to allow build to succeed. Reported-by: Muhammad Usama Anjum Signed-off-by: Ilpo Järvinen Reviewed-by: Muhammad Usama Anjum Tested-by: Muhammad Usama Anjum --- tools/testing/selftests/kselftest.h | 6 ++++++ tools/testing/selftests/lib.mk | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/tools/testing/selftests/kselftest.h b/tools/testing/selftests/kselftest.h index b8967b6e29d5..71593add1b39 100644 --- a/tools/testing/selftests/kselftest.h +++ b/tools/testing/selftests/kselftest.h @@ -70,10 +70,16 @@ * have __cpuid_count(). */ #ifndef __cpuid_count +#ifdef HAVE_CPUID #define __cpuid_count(level, count, a, b, c, d) \ __asm__ __volatile__ ("cpuid\n\t" \ : "=a" (a), "=b" (b), "=c" (c), "=d" (d) \ : "0" (level), "2" (count)) +#else +#define __cpuid_count(level, count, a, b, c, d) do { \ + (void)a; (void)b; (void)c; (void)d; \ +} while (0) +#endif #endif /* define kselftest exit codes */ diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index d6edcfcb5be8..236db9b24037 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -199,6 +199,10 @@ clean: $(if $(TEST_GEN_MODS_DIR),clean_mods_dir) # Build with _GNU_SOURCE by default CFLAGS += -D_GNU_SOURCE= +ifeq ($(ARCH),$(filter $(ARCH),x86 x86_64)) +CFLAGS += -DHAVE_CPUID= +endif + # Enables to extend CFLAGS and LDFLAGS from command line, e.g. # make USERCFLAGS=-Werror USERLDFLAGS=-static CFLAGS += $(USERCFLAGS)