From patchwork Wed Feb 8 09:40:23 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: 652226 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 998CAC05027 for ; Wed, 8 Feb 2023 09:40:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229843AbjBHJkm (ORCPT ); Wed, 8 Feb 2023 04:40:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229490AbjBHJkl (ORCPT ); Wed, 8 Feb 2023 04:40:41 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 142B6977A; Wed, 8 Feb 2023 01:40:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675849241; x=1707385241; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=U5te91Tbq5bcJrl+9WOQqOi1osSLqIV0/0A3oSWetII=; b=eArhFvezlXrIsHO7y4PCNZ3nY9GvP2UKsGsqRmtORWukG6edm31gjosI ZXTlpjN/jWaYf20das9FYIE47qDdNl4V6LtzGtlKlCTelS9AljdlbeHTx jGz5hd6wG19j2VmkFi6M9bMGFfzY6bp/DPfDni758uyDy23Npu24p4LPZ U+8MQi0cYvj20A+BUmHzlg4Nwjuf2eBUEo/KKXvHq77+F93XpDCrrGrR3 mdjTEmkV7hZuLd4WwfESiCfb2q98YiROcODkTOfARowM3X0K5fcNRsZvz aUFYInyGmfSR4Uk8PoKVwfxoZ5yu0oRZvIp1z0V0VcYGZ4lZAfUGAHaw9 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10614"; a="328410784" X-IronPort-AV: E=Sophos;i="5.97,280,1669104000"; d="scan'208";a="328410784" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2023 01:40:40 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10614"; a="617150253" X-IronPort-AV: E=Sophos;i="5.97,280,1669104000"; d="scan'208";a="617150253" Received: from jstelter-mobl.ger.corp.intel.com (HELO ijarvine-MOBL2.ger.corp.intel.com) ([10.252.38.39]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2023 01:40:38 -0800 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Reinette Chatre , Fenghua Yu , Shuah Khan Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH 1/4] selftests/resctrl: Change initialize_llc_perf() return type to void Date: Wed, 8 Feb 2023 11:40:23 +0200 Message-Id: <20230208094026.22529-2-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230208094026.22529-1-ilpo.jarvinen@linux.intel.com> References: <20230208094026.22529-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org initialize_llc_perf() unconditionally does return 0 so no point in having it's return type as int. Hence, change it's return type from int to void. Co-developed-by: Fenghua Yu Signed-off-by: Fenghua Yu Signed-off-by: Ilpo Järvinen --- tools/testing/selftests/resctrl/cache.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/resctrl/cache.c b/tools/testing/selftests/resctrl/cache.c index 68ff856d36f0..4b8ee81aedae 100644 --- a/tools/testing/selftests/resctrl/cache.c +++ b/tools/testing/selftests/resctrl/cache.c @@ -48,7 +48,7 @@ static int perf_event_open_llc_miss(pid_t pid, int cpu_no) return 0; } -static int initialize_llc_perf(void) +static void initialize_llc_perf(void) { memset(&pea_llc_miss, 0, sizeof(struct perf_event_attr)); memset(&rf_cqm, 0, sizeof(struct read_format)); @@ -59,8 +59,6 @@ static int initialize_llc_perf(void) pea_llc_miss.config = PERF_COUNT_HW_CACHE_MISSES; rf_cqm.nr = 1; - - return 0; } static int reset_enable_llc_perf(pid_t pid, int cpu_no) @@ -234,11 +232,8 @@ int cat_val(struct resctrl_val_param *param) if (ret) return ret; - if (!strncmp(resctrl_val, CAT_STR, sizeof(CAT_STR))) { - ret = initialize_llc_perf(); - if (ret) - return ret; - } + if (!strncmp(resctrl_val, CAT_STR, sizeof(CAT_STR))) + initialize_llc_perf(); /* Test runs until the callback setup() tells the test to stop. */ while (1) { From patchwork Wed Feb 8 09:40:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 652225 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A0B6C05027 for ; Wed, 8 Feb 2023 09:40:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229490AbjBHJky (ORCPT ); Wed, 8 Feb 2023 04:40:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229684AbjBHJkw (ORCPT ); Wed, 8 Feb 2023 04:40:52 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C00F442C1; Wed, 8 Feb 2023 01:40:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675849247; x=1707385247; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=w+4SOYOHFtsPv6X601DdF2MZZiDyDeUy+9jXep2pHig=; b=WSWvz7/DXP2tg7EQ624fMeamhszyTdDVkFBXkWqXFhNfKjJzRasw7gB5 AynA7Ldh6Qc9TUgPCTgYqRa4TCEbJG35f4oLoV+yGMowrX0aWeoOfaF/F gzgfI1/z6wAOY/CrhAKcVqBsknFUr2H4PLkYU9MAew5STnfNFlInysQil 22AbPvGDWVrrD/0jv8qeiIATu8ZbI6AG1ime0Zci/yGPC2HI+6MP97pbs pkdHePUYsTt0AsG2ZGFsSq5WHhjG7QFZ4pD3XyGFqSrEmpJ0BhOBmvT3u hMLSKcs3h/gb8tAyqc5qLog8/SCCqmxlreUqKsriJgm+NiYrL74mmzIz+ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10614"; a="328410798" X-IronPort-AV: E=Sophos;i="5.97,280,1669104000"; d="scan'208";a="328410798" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2023 01:40:46 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10614"; a="617150282" X-IronPort-AV: E=Sophos;i="5.97,280,1669104000"; d="scan'208";a="617150282" Received: from jstelter-mobl.ger.corp.intel.com (HELO ijarvine-MOBL2.ger.corp.intel.com) ([10.252.38.39]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2023 01:40:44 -0800 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Reinette Chatre , Fenghua Yu , Shuah Khan Subject: [PATCH 3/4] selftests/resctrl: Change name from CBM_MASK_PATH to INFO_PATH Date: Wed, 8 Feb 2023 11:40:25 +0200 Message-Id: <20230208094026.22529-4-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230208094026.22529-1-ilpo.jarvinen@linux.intel.com> References: <20230208094026.22529-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org From: "Signed-off-by: Fenghua Yu" CBM_MASK_PATH is actually the path to resctrl/info, so change the macro name to correctly indicate what it represents. Signed-off-by: Fenghua Yu --- tools/testing/selftests/resctrl/resctrl.h | 2 +- tools/testing/selftests/resctrl/resctrlfs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/selftests/resctrl/resctrl.h index f0ded31fb3c7..4f0976f12634 100644 --- a/tools/testing/selftests/resctrl/resctrl.h +++ b/tools/testing/selftests/resctrl/resctrl.h @@ -28,7 +28,7 @@ #define MB (1024 * 1024) #define RESCTRL_PATH "/sys/fs/resctrl" #define PHYS_ID_PATH "/sys/devices/system/cpu/cpu" -#define CBM_MASK_PATH "/sys/fs/resctrl/info" +#define INFO_PATH "/sys/fs/resctrl/info" #define L3_PATH "/sys/fs/resctrl/info/L3" #define MB_PATH "/sys/fs/resctrl/info/MB" #define L3_MON_PATH "/sys/fs/resctrl/info/L3_MON" diff --git a/tools/testing/selftests/resctrl/resctrlfs.c b/tools/testing/selftests/resctrl/resctrlfs.c index 6f543e470ad4..cc6cf49e3129 100644 --- a/tools/testing/selftests/resctrl/resctrlfs.c +++ b/tools/testing/selftests/resctrl/resctrlfs.c @@ -210,7 +210,7 @@ int get_cbm_mask(char *cache_type, char *cbm_mask) if (!cbm_mask) return -1; - sprintf(cbm_mask_path, "%s/%s/cbm_mask", CBM_MASK_PATH, cache_type); + sprintf(cbm_mask_path, "%s/%s/cbm_mask", INFO_PATH, cache_type); fp = fopen(cbm_mask_path, "r"); if (!fp) {