From patchwork Thu Aug 29 13:16:55 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: 823723 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) (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 982F417571; Thu, 29 Aug 2024 13:17:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724937439; cv=none; b=dluI7+jveY1db9QshNwm6FfjLUI1chKyS/CERErkEWtRuYWRp4a4m+H+jSlA+n0maIVHlJw7WbbguU2XLQ98gU5UE8wIgVQyv49akWRAqppF5QpoYhkxfp0bYlYJSxPYNoZR6nlGKkzKpyj42ChbtEQvzElFX5A/jphla0mgdqw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724937439; c=relaxed/simple; bh=OkheW9fep5gmAkh23uQK2aIyS0gnyMxZh++kQMkX4rY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=EB8A9f5uScn9yWZfoeZaDMXbXnI46V2gEgk6xOlMmP9Pnq1Fl123Fq3mV1SNWsOUYtN2MKCRFVikBCfvs2SgW1lge5akPt5JLfdh1W0WLldTz02bub8Ti03wf05qaYLYftiTMOtFgNdRJfSAP+kkBx7yRd2ZZQhPUNaanIFTbuI= 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=GA9kBnfx; arc=none smtp.client-ip=198.175.65.16 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="GA9kBnfx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724937437; x=1756473437; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OkheW9fep5gmAkh23uQK2aIyS0gnyMxZh++kQMkX4rY=; b=GA9kBnfx8XJik29/gcb1VXKvTer4Yt09ztIjcp5KOMIbm07T6PiwSccN xUlpkCjlxo2SGFheTbdYYKRnUUhvp+KdlnynFI3qJcuHBsqppM1YZ+SOe qK1e6IWME2AksRCA8ufzjskYCXB4WcNqQk7fZFTzCnHggxBwc8pAD8DSU bjow/4Es0udPR0QiVitbw+PbnWBhsprs8/2ZQihiLT8+Wms2KU0lsXS21 JgCz3swyxiCofETL9QTHIGP26bmmqXMa/nKH1judfOwn6fVApveX2a75Q vrhaS99eT1j6z2auP/ra5MfKJi9/3uj+Ee28aLvhFKRIqO1PKK2/YkJ2/ A==; X-CSE-ConnectionGUID: 9zSLc8sRRiSZJT+pivhdeA== X-CSE-MsgGUID: QuNVAxY4T+OU5sKrqn2chA== X-IronPort-AV: E=McAfee;i="6700,10204,11179"; a="23656465" X-IronPort-AV: E=Sophos;i="6.10,185,1719903600"; d="scan'208";a="23656465" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2024 06:17:17 -0700 X-CSE-ConnectionGUID: qoUlIOT0TyOKUZUzyzqipA== X-CSE-MsgGUID: 4saiCVzbQfOyOLMF1RwrGw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,185,1719903600"; d="scan'208";a="68461021" Received: from ijarvine-desk1.ger.corp.intel.com (HELO localhost) ([10.245.245.59]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2024 06:17:14 -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?Maciej_Wiecz=C3=B3r-Retman?= , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH v3 1/3] selftests/resctrl: Generalize non-contiguous CAT check Date: Thu, 29 Aug 2024 16:16:55 +0300 Message-Id: <20240829131657.1917-2-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240829131657.1917-1-ilpo.jarvinen@linux.intel.com> References: <20240829131657.1917-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 Thu Aug 29 13:16:57 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: 823722 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) (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 88FFF1946C4; Thu, 29 Aug 2024 13:17:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724937460; cv=none; b=G6Xi/6QLprpgIWzZnIEd0rN8yg4AzMHQIztHKNPfksMP7pFE2GsjTHokITQz7tl40buPznhOYU+8iPLYx7ZSA56FlS12b1iCLoH6gSLpRh/Q5p1vn+OM+uQNAybFhOKu+Pok8BLdCmoIaPPVuCVVkrt5Vt9K0JKr3OWrBKJVweY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724937460; c=relaxed/simple; bh=vd4hmH7m4TRltyAYl86p9WBSPwN5Pa4yCsqfc0W/Wr8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=eR+IDXvTQnlmYDmxEYbFAjQNh+hl8h5iLltFvYpy3yAgUxMgQPUlu02l10mkAUYK4AyxHC5r0+CPpuN3+aik0+coCsE3SIPfF8IWRdLAGCX8fTG90xPWAc5ZVMH7jn2wnhza8u2mvoUw+u92GqEa7140omwVF7/ZV4+YpG/hByY= 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=kjeFMe7R; arc=none smtp.client-ip=198.175.65.16 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="kjeFMe7R" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724937458; x=1756473458; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vd4hmH7m4TRltyAYl86p9WBSPwN5Pa4yCsqfc0W/Wr8=; b=kjeFMe7Rdqx5RFSrkxcOgxs8lBcBnRL+Yf5+nQnPE/jJaap5WAz7xExE Ht0WS1vEE3N4LG2vyHdYakxt+YtcHds5w5V2A5A+lMkyW+BVfqdD0v0T9 vvNIMcQXey/xXy1BiWm/ALZgvReS0iAQ8ERsEow4ISHCd7fb1bGg3Xz9/ MyeL9dH8Fptp0sKLH33XeD1eN6EnPnoJgImxl7ECDZVK6VbtTczXDUhQB HoO/f72L+xN4L18LkMnp2NTftPxBCgjvn6ncX4fuFYN0PuDRqjWpfWU8y gUO+/+Xb78m0JWucv8i/HZUVizcWtQmreIrsZBi7iO9bL78zf1x9tkKdI w==; X-CSE-ConnectionGUID: bMEs7/HJSs+Elxk3YGkKJw== X-CSE-MsgGUID: PJ29d5GWRSaVFg5QV+2ODw== X-IronPort-AV: E=McAfee;i="6700,10204,11179"; a="23656536" X-IronPort-AV: E=Sophos;i="6.10,185,1719903600"; d="scan'208";a="23656536" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2024 06:17:38 -0700 X-CSE-ConnectionGUID: +a2GMF3LRYaVi/zc5uxDxQ== X-CSE-MsgGUID: GuomcuL3RgCGTy5MDc07Kg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,185,1719903600"; d="scan'208";a="68461099" Received: from ijarvine-desk1.ger.corp.intel.com (HELO localhost) ([10.245.245.59]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Aug 2024 06:17: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?Maciej_Wiecz=C3=B3r-Retman?= , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH v3 3/3] kselftest: Provide __cpuid_count() stub on non-x86 archs Date: Thu, 29 Aug 2024 16:16:57 +0300 Message-Id: <20240829131657.1917-4-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240829131657.1917-1-ilpo.jarvinen@linux.intel.com> References: <20240829131657.1917-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. Define HAVE_CPUID in lib.mk based on ARCH (x86 or x86_64). If ARCH is not set, acquire it using uname -m. Provide a stub for __cpuid_count() if HAVE_CPUID is not present to allow build to succeed. The stub casts its arguments to void to avoid causing "unused variable" or "set but not used" warnings. Fixes: ae638551ab64 ("selftests/resctrl: Add non-contiguous CBMs CAT test") Reported-by: Muhammad Usama Anjum Signed-off-by: Ilpo Järvinen --- v3: - Remove "empty" wording - Also cast input parameters to void - Initialize ARCH from uname -m if not set (this might allow cleaning up some other makefiles but that is left as future work) v2: - Removed RFC & added Fixes and Tested-by - Fixed the error message's line splits - Noted down the reason for void casts in the stub --- tools/testing/selftests/kselftest.h | 6 ++++++ tools/testing/selftests/lib.mk | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/tools/testing/selftests/kselftest.h b/tools/testing/selftests/kselftest.h index b8967b6e29d5..9c4bfbf107f1 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)level; (void)count; (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..8e3069926153 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -23,6 +23,8 @@ CLANG_TARGET_FLAGS_x86_64 := x86_64-linux-gnu # Default to host architecture if ARCH is not explicitly given. ifeq ($(ARCH),) +ARCH := $(shell uname -m 2>/dev/null || echo not) +ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/) CLANG_TARGET_FLAGS := $(shell $(CLANG) -print-target-triple) else CLANG_TARGET_FLAGS := $(CLANG_TARGET_FLAGS_$(ARCH)) @@ -199,6 +201,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)