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 D25661C6FFE; Wed, 5 Mar 2025 17:57:04 +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=1741197424; cv=none; b=LKIP152noZRPhSIMwpzPK0HJxknJV1QxKwJVDrmggFVA2cel2AwW50X9p0k+lwsYcdHB/gypX3HO3wepaj8Hfz0kdJDJ74k3QdkRAYB7mnAlVu2QzWfng+nCBTjxMC+4DI0EyoupQ7iiWR9f6WBfA9xeaHAbMxv2VeB3Tdolm0Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741197424; c=relaxed/simple; bh=04DlpsXN29qjzNXuYUkggDN/2pgl7jfDkI16+WyL4i8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sRPF4oBYFGqcNo4KQOc8zzuereVGcirM2QPfxE5bpXZP9atfoUSD8bRGFLPeYmF7f6D6BnT/BTo3v+aPqe/KYM6OPkLkpqGaS46ujQgqRbYIo1zcBscFbH710IVWi8Ih03rgUbEF4rNeSYkAwZBrDaD4RpDkDNKHBq4/umax1LU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Zlq7ZW0F; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Zlq7ZW0F" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5AD43C4CED1; Wed, 5 Mar 2025 17:57:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741197424; bh=04DlpsXN29qjzNXuYUkggDN/2pgl7jfDkI16+WyL4i8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zlq7ZW0FVu1qNHGT/9HU7dQjwsnkqvqh1YvXKYYIhaZK339gHyNyGmYNEISoEjGRw GnJSTd7QGK47aYNtf1zsiFOjBWBLdGdcJDcPggFlgb6PBvxkZDPstbFIMuQQNtT48s J96woUYT+CmyNhJyzsC0O/60f+nIgBq4zp8QaTIg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kan Liang , Ingo Molnar , Ravi Bangoria , Peter Zijlstra Subject: [PATCH 6.1 152/176] perf/core: Fix low freq setting via IOC_PERIOD Date: Wed, 5 Mar 2025 18:48:41 +0100 Message-ID: <20250305174511.542188671@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250305174505.437358097@linuxfoundation.org> References: <20250305174505.437358097@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kan Liang commit 0d39844150546fa1415127c5fbae26db64070dd3 upstream. A low attr::freq value cannot be set via IOC_PERIOD on some platforms. The perf_event_check_period() introduced in: 81ec3f3c4c4d ("perf/x86: Add check_period PMU callback") was intended to check the period, rather than the frequency. A low frequency may be mistakenly rejected by limit_period(). Fix it. Fixes: 81ec3f3c4c4d ("perf/x86: Add check_period PMU callback") Signed-off-by: Kan Liang Signed-off-by: Ingo Molnar Reviewed-by: Ravi Bangoria Cc: Peter Zijlstra Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20250117151913.3043942-2-kan.liang@linux.intel.com Closes: https://lore.kernel.org/lkml/20250115154949.3147-1-ravi.bangoria@amd.com/ Signed-off-by: Greg Kroah-Hartman --- kernel/events/core.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5679,14 +5679,15 @@ static int _perf_event_period(struct per if (!value) return -EINVAL; - if (event->attr.freq && value > sysctl_perf_event_sample_rate) - return -EINVAL; - - if (perf_event_check_period(event, value)) - return -EINVAL; - - if (!event->attr.freq && (value & (1ULL << 63))) - return -EINVAL; + if (event->attr.freq) { + if (value > sysctl_perf_event_sample_rate) + return -EINVAL; + } else { + if (perf_event_check_period(event, value)) + return -EINVAL; + if (value & (1ULL << 63)) + return -EINVAL; + } event_function_call(event, __perf_event_period, &value);