From patchwork Tue Sep 3 14:45:25 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: 13788828 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (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 2C3A714A4E0; Tue, 3 Sep 2024 14:45:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725374750; cv=none; b=LnR/yfVxPuq1COX4u7r+c037NghxnMPjV7IsNqd/8uu3VyBDh9kezsNIPiT3FrZ2Ri5WIxqI95J9aWay1vViHoFGeWtulTeyXkvljhbEpgdmbobSsLCtHSuifsOmXOCx7Vv9l0KthAhXRkUYN8L44eSxg67ALy+/WVsdBH04Q3A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725374750; c=relaxed/simple; bh=OkheW9fep5gmAkh23uQK2aIyS0gnyMxZh++kQMkX4rY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=KX1ysbx8POSnbex8R3n94XQBdrCxaOJ24jQ/u1FaQXO4RH1eYChJpXjsw7oxZyBb8KYQWAuRthDTdr09WWrYGZ4wSV/3ddHsvcmSMcOYQe2GMiyivQkUbtKYl6jf4sJnDUu+gY/XuKW40IzPJPPJJ7Ntc39PlFP40BsZt0AP3Fo= 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=CzYawxx5; arc=none smtp.client-ip=198.175.65.17 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="CzYawxx5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725374749; x=1756910749; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OkheW9fep5gmAkh23uQK2aIyS0gnyMxZh++kQMkX4rY=; b=CzYawxx5pDYAx6Qgk3VTk8WKYXG64Z4j8PL9pn6JoZbko9WKDsm13NPr CTkvhwukUlWuwpOxQGDIEytFR2J+pae7B+8lXESdk1UVGnOfBuRUG1O9/ sxh+a+xP7Jxvpd2Zqjgb/EFVW6tpUv5v/tUuLre9THHxR7pO1rZDqPFKp voUeDugwmwfIHnSYmLTPRayM3C/dWOKCNcSOsQl847RL/Gbidk7pTQZL8 7rTTaFeGSXN7Y5Yz9j+p3LOF6wsg6kq87cJx3X9eh+knaeyKUB/xsFN1P d+9ym/sMJArxvZtHstycGDjjKEbIB5OTV411yxRC+PG136GhMF3PasBij g==; X-CSE-ConnectionGUID: pEsEjGyTTUycNWdoT3rGRg== X-CSE-MsgGUID: yFcjgDhBTgaMGOrlnGryZg== X-IronPort-AV: E=McAfee;i="6700,10204,11184"; a="24145195" X-IronPort-AV: E=Sophos;i="6.10,199,1719903600"; d="scan'208";a="24145195" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2024 07:45:48 -0700 X-CSE-ConnectionGUID: ojV7Tc9nSq6TCIQHLxfHmg== X-CSE-MsgGUID: cHXnl2mfRRKkC+xuD58aRQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,199,1719903600"; d="scan'208";a="64577442" Received: from ijarvine-desk1.ger.corp.intel.com (HELO localhost) ([10.245.244.241]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2024 07:45:45 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Muhammad Usama Anjum , Shuah Khan , Reinette Chatre , linux-kselftest@vger.kernel.org, Fenghua Yu , linux-kernel@vger.kernel.org Cc: Shaopeng Tan , =?utf-8?q?Maciej_Wiecz=C3=B3?= =?utf-8?q?r-Retman?= , =?utf-8?q?Ilpo_J?= =?utf-8?q?=C3=A4rvinen?= Subject: [PATCH v4 1/4] selftests/resctrl: Generalize non-contiguous CAT check Date: Tue, 3 Sep 2024 17:45:25 +0300 Message-Id: <20240903144528.46811-2-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240903144528.46811-1-ilpo.jarvinen@linux.intel.com> References: <20240903144528.46811-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 Sep 3 14:45:26 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: 13788829 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (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 33DA115443F; Tue, 3 Sep 2024 14:45:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725374759; cv=none; b=IOcZfw28XHB8I3f7NuxZHkm+PBIYQWHc/W52TRDO7Iszf1cFmTh/+5ZTfaGKqysWcN8XNcTCxYD5VA1mV+it1ohVafMlLde995p6hlCsJWApCqah9Eilq6dFLVK2XFlgC1AeACT/N2yeHM+/5+YDXy6sMknSE/Bcl5s5ZpLkuHo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725374759; c=relaxed/simple; bh=t6uBeYGfUEyeNA+x65LOdfaF0fJ05xrJR7VelOUkPi4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=OuaGHaOHd2//NltP5D9G+eUrm35O1szOWX6WYCFqx0Xw1F0urB7jQfYTRc7Tc6WTtFOTv0+bkltnOVopZoHCyzUlN0pR7+3w28lPELPqW1rgCkJSmlAA3W2qKqlh5CDaH4s5G2jw0BK6coqhcViWz7tYCxHQd89v4JbM5L9i0aY= 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=huAjjvLo; arc=none smtp.client-ip=198.175.65.17 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="huAjjvLo" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725374758; x=1756910758; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=t6uBeYGfUEyeNA+x65LOdfaF0fJ05xrJR7VelOUkPi4=; b=huAjjvLoOEdttytR46+Jv0Fq7tktu1KkndFj5MgDrlzagyxRbjXmn5tB R5qaRqoUqbIgHbhQwMQ56tlUvEbd46mB32xyl7QIMeKgzTig/1vfaqsZs 8JF+kImu/bb4ZMEt1Utd25R/iE0/Cg5IjgnDefnBmAXP6BbUUI8XwEIm5 scxKQTcVpIw+rI5rgztOmDSgokZyPi16B19GNB/j8pwk+BA33B5BdMTlR guQwOZojssQjojleoWH13/R3KFfQm5blCCDILAyVFlrvdud/d8RcvGwCM gp3/ZIDWsQmDzVuVZkynEXA6neb3DsIUDGALnUGY6ViUCvmHeLufurUwm g==; X-CSE-ConnectionGUID: uSxjkH6JTOeaYgj3iNZcfA== X-CSE-MsgGUID: uO4dyCMhQ1Opbq5/14pzZw== X-IronPort-AV: E=McAfee;i="6700,10204,11184"; a="24145250" X-IronPort-AV: E=Sophos;i="6.10,199,1719903600"; d="scan'208";a="24145250" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2024 07:45:58 -0700 X-CSE-ConnectionGUID: 0okE6BdUSYWzl3ZNIaxSRA== X-CSE-MsgGUID: XsGT0v20QliuVcplGZQ7qQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,199,1719903600"; d="scan'208";a="64577448" Received: from ijarvine-desk1.ger.corp.intel.com (HELO localhost) ([10.245.244.241]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2024 07:45:54 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Muhammad Usama Anjum , Shuah Khan , Reinette Chatre , linux-kselftest@vger.kernel.org, Fenghua Yu , linux-kernel@vger.kernel.org Cc: Shaopeng Tan , =?utf-8?q?Maciej_Wiecz=C3=B3?= =?utf-8?q?r-Retman?= , =?utf-8?q?Ilpo_J?= =?utf-8?q?=C3=A4rvinen?= Subject: [PATCH v4 2/4] selftests/resctrl: Always initialize ecx to avoid build warnings Date: Tue, 3 Sep 2024 17:45:26 +0300 Message-Id: <20240903144528.46811-3-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240903144528.46811-1-ilpo.jarvinen@linux.intel.com> References: <20240903144528.46811-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 Sep 3 14:45:27 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: 13788830 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (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 695C644C6F; Tue, 3 Sep 2024 14:46:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725374769; cv=none; b=TxRjDNMjxlyV5V6wpZD+wjvOLNDnzt3mLxqmAc7+YkSHNT67I2EUJb+e3COj62sU4yoLwd2nrvUzPS5WavKsUetcFezzrPSrS3EtVbWcbG++i/UufE3FJ2wh+zjqZlWhvx81xCqOiTB3FTNa5sW73tB/mngdBlb+S95GyHqHsZw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725374769; c=relaxed/simple; bh=LPPs4oCE7KV7VBYcHdwrc/ZyvAhlz7OEHNcKcZbEXSg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=KrKWOyRJzeI94IxOMqvUzDb8I8cTt5y6G1+dFXrabmyNT5bQnYOycshehUU5Csb+UVKA+NuT62/jXLVbijbjI8NSwoM0ZAYAKSr8S1nLarJwBsvkCeT6KbLFCjAbQ01WnJ9gmrbmC3rnS1LqbHQ4X85u5kq1941EN8XR6ie4NDs= 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=YjDPYAXB; arc=none smtp.client-ip=198.175.65.17 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="YjDPYAXB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725374767; x=1756910767; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LPPs4oCE7KV7VBYcHdwrc/ZyvAhlz7OEHNcKcZbEXSg=; b=YjDPYAXB/qlr/jHlNrZnjwN5h6f2oLBEQYEfhmwEH3HLaGUbIdV74VK7 MQRLFsJr5POJMZxp8/JB3V+qZcASY81P39aforw0H+vwvoCMaQgdGzpHm 2hYK8M7DdSuz4C5puTMthE2kTqQCOuQ5vPKzEgQY5+XMTfMAsGCit5ndk +sMeNcQ5L5k0S3fe95HL6mV6BDyV2XqoGcu8hMnYmnwUGWGKTDBHGTgre A0MpsQijcAqYzshfbjWM6JCzpMzN+UlzUusxHJjTsIhvfYZq7iBSRr5+E MEH4b4mPaZAFswG0YTn/kAzIsFqIq0SH4oQ5nbvjUqezRmxZEXrS2zSvg A==; X-CSE-ConnectionGUID: 2uLYDaAPRVWwdQwrschRFg== X-CSE-MsgGUID: okHRtK0xT02NZih9qZu4+g== X-IronPort-AV: E=McAfee;i="6700,10204,11184"; a="24145296" X-IronPort-AV: E=Sophos;i="6.10,199,1719903600"; d="scan'208";a="24145296" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2024 07:46:07 -0700 X-CSE-ConnectionGUID: Lz6jqwc2TWGZJM2dqyVeiQ== X-CSE-MsgGUID: 9yaUN89GQL+P47Z7qrs8Kg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,199,1719903600"; d="scan'208";a="64577452" Received: from ijarvine-desk1.ger.corp.intel.com (HELO localhost) ([10.245.244.241]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2024 07:46:04 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Muhammad Usama Anjum , Shuah Khan , Reinette Chatre , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Shaopeng Tan , Fenghua Yu , =?utf-8?q?Maciej_Wiecz=C3=B3r-Retman?= , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH v4 3/4] selftests/x86: don't clobber CFLAGS Date: Tue, 3 Sep 2024 17:45:27 +0300 Message-Id: <20240903144528.46811-4-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240903144528.46811-1-ilpo.jarvinen@linux.intel.com> References: <20240903144528.46811-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 The x86 selftests makefile clobbers CFLAGS preventing lib.mk from making the necessary adjustments into CFLAGS. This would lead to a build failure after upcoming change which wants to add -DHAVE_CPUID= into CFLAGS. Reorder CFLAGS initialization in x86 selftest. Place the constant part of CFLAGS initialization before inclusion of lib.mk but leave adding KHDR_INCLUDES into CFLAGS into the existing position because KHDR_INCLUDES might be generated inside lib.mk. Signed-off-by: Ilpo Järvinen --- v4: - New patch tools/testing/selftests/x86/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile index 5c8757a25998..88a6576de92f 100644 --- a/tools/testing/selftests/x86/Makefile +++ b/tools/testing/selftests/x86/Makefile @@ -1,4 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 +CFLAGS := -O2 -g -std=gnu99 -pthread -Wall + all: include ../lib.mk @@ -35,7 +37,7 @@ BINARIES_64 := $(TARGETS_C_64BIT_ALL:%=%_64) BINARIES_32 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_32)) BINARIES_64 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_64)) -CFLAGS := -O2 -g -std=gnu99 -pthread -Wall $(KHDR_INCLUDES) +CFLAGS += $(KHDR_INCLUDES) # call32_from_64 in thunks.S uses absolute addresses. ifeq ($(CAN_BUILD_WITH_NOPIE),1) From patchwork Tue Sep 3 14:45:28 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: 13788831 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) (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 04CA9153BE4; Tue, 3 Sep 2024 14:46:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725374778; cv=none; b=iLQ95GrfRM+//BHa2CVjFu0NG9Lm5QnYH7KGD7xyjavN6NmHyWSyuWGpVG3acNTJQeCOWr3ezqlRuPnxGWQD4IuXm7yogR1kDCGEKlCOspqINEYpjSPQkjTZIuVgxqSW1OBBwjPCcWO2sQAnvW+pHlsuASOzadmu9DGTo1wKp98= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725374778; c=relaxed/simple; bh=LUoij1ccctcrHN5PWV8R3XWhlyhZ6J0cEf6JBISm754=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=bxcLtG9rLwXqbl2CULu4BgNtyTHUGk9Qsi/tgTEr7J/kkchdGSD7tYSrX5ZKvn1sIrBl0io4l9fu/rR69d3d2oNxm/yAHv3JLk+M+YPL4V0GP1J8soDrOPxQ6RA02xAI6O7FxhqXdCioyKNyUA888UzBoGaXWzBjwZTY5ZOfXvY= 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=gDXlRrEA; arc=none smtp.client-ip=192.198.163.7 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="gDXlRrEA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725374777; x=1756910777; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LUoij1ccctcrHN5PWV8R3XWhlyhZ6J0cEf6JBISm754=; b=gDXlRrEA5ijHLji+xA1yUsbJxQVLISpHbdlzKZvGv8eRDIUWjdmTgLXG vBW8Cf80MUCuNVsLQW1VVxmfxuYtnp60FYCDsApYQ3Wewi/CLnYTBIXxu n91DIUc3RU4wbakzcBytemf9Ra9EkrF4xXNfm0TYlE8jGTGvx8spQYTLz hDCmy317GY6cjoey7xITCeS+GLWGpc9PwPU5huNEck8Tu8l6lsW0846tE gibixruttQUzv7p++qhoGgnIpKnXGdqiK4NVLn/hLhR8CZIIYvHnByDbx 6GupOrbjF8u1+pNSvDdLjyVT2Jduqn5wY5rC6V/9halul997C7x+XCkMI A==; X-CSE-ConnectionGUID: 6NTMZWZzRYO00xsmedw0Ew== X-CSE-MsgGUID: qE/XUX52QxSp7Tm+f2RNXw== X-IronPort-AV: E=McAfee;i="6700,10204,11184"; a="49384137" X-IronPort-AV: E=Sophos;i="6.10,199,1719903600"; d="scan'208";a="49384137" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2024 07:46:16 -0700 X-CSE-ConnectionGUID: y569VU89SuOHLxLIURFrQw== X-CSE-MsgGUID: t9vgbS2kSwKYi3Of+0CrMA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,199,1719903600"; d="scan'208";a="64610741" Received: from ijarvine-desk1.ger.corp.intel.com (HELO localhost) ([10.245.244.241]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2024 07:46:13 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Muhammad Usama Anjum , Shuah Khan , Reinette Chatre , linux-kselftest@vger.kernel.org, Maciej Wieczor-Retman , =?utf-8?q?Ilpo_J?= =?utf-8?q?=C3=A4rvinen?= , linux-kernel@vger.kernel.org Cc: Shaopeng Tan , Fenghua Yu Subject: [PATCH v4 4/4] kselftest: Provide __cpuid_count() stub on non-x86 archs Date: Tue, 3 Sep 2024 17:45:28 +0300 Message-Id: <20240903144528.46811-5-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240903144528.46811-1-ilpo.jarvinen@linux.intel.com> References: <20240903144528.46811-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 Tested-by: Muhammad Usama Anjum Reviewed-by: Muhammad Usama Anjum --- 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)