From patchwork Mon Jun 5 18:01:30 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: 103419 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2870087vqr; Mon, 5 Jun 2023 11:16:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ56Uz95yag3vw5oiDD+DApbTnD0glNMBqbOhu6GVKUZuCqInOZYvPcdqV871ZgUV9a/cXU7 X-Received: by 2002:a17:902:ce85:b0:1b2:1ab6:912e with SMTP id f5-20020a170902ce8500b001b21ab6912emr1344502plg.4.1685989016468; Mon, 05 Jun 2023 11:16:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685989016; cv=none; d=google.com; s=arc-20160816; b=yc4sldQFuW0C1Txi7DEP8bvuXkJAmoCb7WGRwIq54fBnWq5ZiH595FjllLgfPxA3VJ 0hZHEomSbvZGsMe9Gm8GLk2w4KXcDylP+Nf0yJTvfzC0J7K1BKv6QXhgI13S2a6MEyot qY7rljlj0C7I1L2m3waU0ytzgHQlCaPiPf1t0XVw4U7obxRBywBIA6rrpBP6AV9w1ZPn OB9HMSm8xn6vcJkbDfgs4XIULMuJoufJK5XjVKHcQb3vBphlItz4lDeXynAzhYXlLPVx 8lZoUu94Wt9cU26pVAUtt0RDENuJrSpV8gQPoKETZeMJSWWAvxbgc+r2qz9GqJiFTgon IfwA== 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=0LLUpqGHRxNZQm9k99I7o0ydSvwm9+uS/tKGualXDnw=; b=ZDIgQUrhn3DYVGh1dPYA3kWij3k+5Q/EqwrztBRsvsPW73hg2QqOo91IwC9vB7+LQr ZNbSIOTSavd9zL/zVJ06KOA5hr63nLCk/JrYlGEU61Hg+mIZ0vWzEz8S+iR1Y9jlpOvB P0m0QmU8w06j13ASXIGNrScIzQ9Nf7mtADuwFGIshoVMjHsyD2P8ydmxCIr2inR70va+ IvnRQzjnBE3V42i9Jqn30QFM8HXQrS9BqvWbawRD6LLghemyzWE9JD3sEugZ/6ODp+n3 H3cffqQMw3hv8KZuFQDtotlJO6I/OUVDjlTFrNSqz0j0MwfGOMqncglyNVbWNVbrymkd HivQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JRTvNRAv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t5-20020a170902e84500b001ab089f7329si6112455plg.73.2023.06.05.11.16.41; Mon, 05 Jun 2023 11:16:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JRTvNRAv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235087AbjFESCe (ORCPT + 99 others); Mon, 5 Jun 2023 14:02:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234800AbjFESCY (ORCPT ); Mon, 5 Jun 2023 14:02:24 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC452F9; Mon, 5 Jun 2023 11:02:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685988143; x=1717524143; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SfPvkmzWJcJdc6LqGPirAEzeqOxBh6wxev3IG7Dp8Fo=; b=JRTvNRAvtis4Iuzu5jWuQknTkfUv0iBjpLOK+i60bssRhnjg+iOFGXb8 J2SW+oeSEDMHNeGToQT0OxW/5gPGQ2Sg6mI7OLhlIEBP5Bst1eSg3gZS7 /WArnn+H94Nb6uxcBfvkbARB0y+TkzWx83axuuyxGzmS+hygOHLFDcedH CGsbn73xTVg3/Gqn+lz32u4HP+IKBjgqsIP1mNlWkeD0WWrcsy+G96UYq CsH74YOqPTwJS9LzvQZxjZvzLreOyj6ovD/u8w4oRS//S2nfetjLPg/jy q4PVgOtZEC9a60YFwuok+zhB+VRFocr283XSF1j3+t8XRDBO/7b0/VfMx w==; X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="442814910" X-IronPort-AV: E=Sophos;i="6.00,218,1681196400"; d="scan'208";a="442814910" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2023 11:02:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="821274036" X-IronPort-AV: E=Sophos;i="6.00,218,1681196400"; d="scan'208";a="821274036" Received: from gfittedx-mobl.ger.corp.intel.com (HELO ijarvine-MOBL2.ger.corp.intel.com) ([10.252.47.115]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2023 11:02:08 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: linux-kselftest@vger.kernel.org, Reinette Chatre , Shuah Khan , Shaopeng Tan , Fenghua Yu , Sai Praneeth Prakhya , Babu Moger , linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH v3 04/19] selftests/resctrl: Close perf value read fd on errors Date: Mon, 5 Jun 2023 21:01:30 +0300 Message-Id: <20230605180145.112924-5-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230605180145.112924-1-ilpo.jarvinen@linux.intel.com> References: <20230605180145.112924-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767887618554570024?= X-GMAIL-MSGID: =?utf-8?q?1767887618554570024?= Perf event fd (fd_lm) is not closed on some error paths. Always close fd_lm in get_llc_perf() and add close into an error handling block in cat_val(). Fixes: 790bf585b0ee ("selftests/resctrl: Add Cache Allocation Technology (CAT) selftest") Signed-off-by: Ilpo Järvinen --- tools/testing/selftests/resctrl/cache.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/resctrl/cache.c b/tools/testing/selftests/resctrl/cache.c index 8a4fe8693be6..ced47b445d1e 100644 --- a/tools/testing/selftests/resctrl/cache.c +++ b/tools/testing/selftests/resctrl/cache.c @@ -87,21 +87,20 @@ static int reset_enable_llc_perf(pid_t pid, int cpu_no) static int get_llc_perf(unsigned long *llc_perf_miss) { __u64 total_misses; + int ret; /* Stop counters after one span to get miss rate */ ioctl(fd_lm, PERF_EVENT_IOC_DISABLE, 0); - if (read(fd_lm, &rf_cqm, sizeof(struct read_format)) == -1) { + ret = read(fd_lm, &rf_cqm, sizeof(struct read_format)); + close(fd_lm); + if (ret == -1) { perror("Could not get llc misses through perf"); - return -1; } total_misses = rf_cqm.values[0].value; - - close(fd_lm); - *llc_perf_miss = total_misses; return 0; @@ -253,6 +252,7 @@ int cat_val(struct resctrl_val_param *param) memflush, operation, resctrl_val)) { fprintf(stderr, "Error-running fill buffer\n"); ret = -1; + close(fd_lm); break; }