From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 7DB4C199E84; Mon, 9 Dec 2024 21:16:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733779008; cv=none; b=qRnAIDmyvx62kvPpd3Prvourd5kfJP2WpE9HbvSSJtIEk65sF5bS3aWloYe7MbbRiYGixqCWMsvBM0tjcHUvSTigOpfcO6qdMontNATcv6a3Q7GgtvAL40talf9oA7GFLuKLB2H6nrpQ8MF7+HfysoyIaKf1oOfkKTqsX7MQLH4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733779008; c=relaxed/simple; bh=zpbiRPrQcqR+u/XSDuWIKETzzmiEDIYdaOSjTzO20KE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=XwpGWvltUCeaeVi0snPvUREAFzAQVfNu99zlQ9hRV8MRXMieptNQGZSEWsjbyBjUXJWboxe1zAxFGNR7P7VY/YAwseypyn3PEpEsol6GNBinvNT2uWK2K1B5ke2aFLMybK4EeWE9SwGT6XaJv1gNGX0MCIhjDUfhn7G+cH6+tG4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uJFBpdNw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="uJFBpdNw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82154C4CED1; Mon, 9 Dec 2024 21:16:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733779008; bh=zpbiRPrQcqR+u/XSDuWIKETzzmiEDIYdaOSjTzO20KE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=uJFBpdNwBw0Ri79z9eREcri8iZVaZFS3umkA9gNpri3TzYZlPBele54LaZKAiGh3q 6Svyq/D816NbfTGuC5U7x+PQ76Id3mqjcMraVfhxbN86EfLKrf5TgN5bMIE+ptk5lD VibHgytZibmUT6op3pSGRj8ldRimkgkHqW6U6yDnvj69bOGw1YDc4GEbWJq8OqGgBg ITvkWsQ/Ox3MuQnsCDrXHtgnjNzp9n/4JgkNJJm/brqu01VbuKPM7eoIr2tGR9S4gi 4zqgF701+mWx51lasYYcKJ0CXonXPv78XEwXgcTo8xNgCwmanTwk4KxqUerIbuV7Sx SelFQpyvNmP8w== Date: Mon, 9 Dec 2024 18:16:39 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , Kan Liang , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v1 2/2] perf test hwmon_pmu: Fix event file location Message-ID: References: <20241206042306.1055913-1-irogers@google.com> <20241206042306.1055913-2-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241206042306.1055913-2-irogers@google.com> On Thu, Dec 05, 2024 at 08:23:06PM -0800, Ian Rogers wrote: > The temp directory is made and a known fake hwmon PMU created within > it. Prior to this fix the events were being incorrectly written to the > temp directory rather than the fake PMU directory. This didn't impact > the test as the directory fd matched the wrong location, but it > doesn't mirror what a hwmon PMU would actually look like. With these two files the 'perf test 11' for hwmon is successfully completed on my system where I previously reported failures. Thanks, applied, - Arnaldo > Signed-off-by: Ian Rogers > --- > tools/perf/tests/hwmon_pmu.c | 29 ++++++++++++++++++----------- > 1 file changed, 18 insertions(+), 11 deletions(-) > > diff --git a/tools/perf/tests/hwmon_pmu.c b/tools/perf/tests/hwmon_pmu.c > index f8bcee9660d5..d2b066a2b557 100644 > --- a/tools/perf/tests/hwmon_pmu.c > +++ b/tools/perf/tests/hwmon_pmu.c > @@ -65,7 +65,7 @@ static struct perf_pmu *test_pmu_get(char *dir, size_t sz) > { "temp2_label", "test hwmon event2\n", }, > { "temp2_input", "50000\n", }, > }; > - int dirfd, file; > + int hwmon_dirfd = -1, test_dirfd = -1, file; > struct perf_pmu *hwm = NULL; > ssize_t len; > > @@ -76,19 +76,24 @@ static struct perf_pmu *test_pmu_get(char *dir, size_t sz) > dir[0] = '\0'; > return NULL; > } > - dirfd = open(dir, O_DIRECTORY); > - if (dirfd < 0) { > + test_dirfd = open(dir, O_PATH|O_DIRECTORY); > + if (test_dirfd < 0) { > pr_err("Failed to open test directory \"%s\"\n", dir); > goto err_out; > } > > /* Create the test hwmon directory and give it a name. */ > - if (mkdirat(dirfd, "hwmon1234", 0755) < 0) { > + if (mkdirat(test_dirfd, "hwmon1234", 0755) < 0) { > pr_err("Failed to mkdir hwmon directory\n"); > goto err_out; > } > - file = openat(dirfd, "hwmon1234/name", O_WRONLY | O_CREAT, 0600); > - if (!file) { > + hwmon_dirfd = openat(test_dirfd, "hwmon1234", O_DIRECTORY); > + if (hwmon_dirfd < 0) { > + pr_err("Failed to open test hwmon directory \"%s/hwmon1234\"\n", dir); > + goto err_out; > + } > + file = openat(hwmon_dirfd, "name", O_WRONLY | O_CREAT, 0600); > + if (file < 0) { > pr_err("Failed to open for writing file \"name\"\n"); > goto err_out; > } > @@ -104,8 +109,8 @@ static struct perf_pmu *test_pmu_get(char *dir, size_t sz) > for (size_t i = 0; i < ARRAY_SIZE(test_items); i++) { > const struct test_item *item = &test_items[i]; > > - file = openat(dirfd, item->name, O_WRONLY | O_CREAT, 0600); > - if (!file) { > + file = openat(hwmon_dirfd, item->name, O_WRONLY | O_CREAT, 0600); > + if (file < 0) { > pr_err("Failed to open for writing file \"%s\"\n", item->name); > goto err_out; > } > @@ -119,16 +124,18 @@ static struct perf_pmu *test_pmu_get(char *dir, size_t sz) > } > > /* Make the PMU reading the files created above. */ > - hwm = perf_pmus__add_test_hwmon_pmu(dirfd, "hwmon1234", test_hwmon_name); > + hwm = perf_pmus__add_test_hwmon_pmu(hwmon_dirfd, "hwmon1234", test_hwmon_name); > if (!hwm) > pr_err("Test hwmon creation failed\n"); > > err_out: > if (!hwm) { > test_pmu_put(dir, hwm); > - if (dirfd >= 0) > - close(dirfd); > + if (hwmon_dirfd >= 0) > + close(hwmon_dirfd); > } > + if (test_dirfd >= 0) > + close(test_dirfd); > return hwm; > } > > -- > 2.47.0.338.g60cca15819-goog