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 59826376; Wed, 2 Oct 2024 13:35:30 +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=1727876130; cv=none; b=YdTiJtu/mQI7PHiWK0qT0lKpvn4Rgh5vY4Jtbw33sPyRw6UXCSIQQPXCQF0yn6lFMSLyEFuKYHQO5wVQerkP++mMgG/aqgXLMjd0Yo8aYOodb9A0PqtW4neSC8CDqaUExRxPP/Bel7XAMdAwmFgqmKHAamZ6OGhbtH0b/f8aLE0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727876130; c=relaxed/simple; bh=IRbeKA0fWP3R1VB3ZiOTv33UJ2w9/GaSz03ERpMkmyE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mPoNKlvAPIq/1h3TsFqhoZzxBqEdXNwG/YCDL9Wn1mk2tDQP4cdHKDmKvM/qE6LDppor6cPpthpWMXT+ycbURwnYF/LEuBO/mXea4RYoWiMsVhYrOm8auRUB7fjK1roZcCBObrdmS5JNCsZ7X9S0UoctZM0JFcxz8TPNlIZkwVc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fPNkn1Jj; 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="fPNkn1Jj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A7AE6C4CEC5; Wed, 2 Oct 2024 13:35:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727876130; bh=IRbeKA0fWP3R1VB3ZiOTv33UJ2w9/GaSz03ERpMkmyE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fPNkn1JjSorqC4iZuOcbtl9l/pn8nO/DAv0rySymtuMeEdupKr9VWQXo4pwKCz7ei seHDJbFPs6MeuhgFZscT6ora4xAmXQtQeYQ7zFOjyVAEAQYSt1vgIp8WhSJyv0K6I6 yU7Wy7F7g5EkQjUe7GVFi5naiQnugn2GucGZu6RI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ian Rogers , Adrian Hunter , Alexander Shishkin , Athira Rajeev , Chaitanya S Prakash , Colin Ian King , David Ahern , Dominique Martinet , Ingo Molnar , James Clark , Jiri Olsa , John Garry , Junhao He , Kan Liang , Mark Rutland , Masami Hiramatsu , Namhyung Kim , Peter Zijlstra , Yang Jihong , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 6.11 339/695] perf time-utils: Fix 32-bit nsec parsing Date: Wed, 2 Oct 2024 14:55:37 +0200 Message-ID: <20241002125835.982186183@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125822.467776898@linuxfoundation.org> References: <20241002125822.467776898@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ian Rogers [ Upstream commit 38e2648a81204c9fc5b4c87a8ffce93a6ed91b65 ] The "time utils" test fails in 32-bit builds: ... parse_nsec_time("18446744073.709551615") Failed. ptime 4294967295709551615 expected 18446744073709551615 ... Switch strtoul to strtoull as an unsigned long in 32-bit build isn't 64-bits. Fixes: c284d669a20d408b ("perf tools: Move parse_nsec_time to time-utils.c") Signed-off-by: Ian Rogers Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Athira Rajeev Cc: Chaitanya S Prakash Cc: Colin Ian King Cc: David Ahern Cc: Dominique Martinet Cc: Ingo Molnar Cc: James Clark Cc: Jiri Olsa Cc: John Garry Cc: Junhao He Cc: Kan Liang Cc: Mark Rutland Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Yang Jihong Link: https://lore.kernel.org/r/20240831070415.506194-3-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/time-utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/time-utils.c b/tools/perf/util/time-utils.c index 3024439216816..1b91ccd4d5234 100644 --- a/tools/perf/util/time-utils.c +++ b/tools/perf/util/time-utils.c @@ -20,7 +20,7 @@ int parse_nsec_time(const char *str, u64 *ptime) u64 time_sec, time_nsec; char *end; - time_sec = strtoul(str, &end, 10); + time_sec = strtoull(str, &end, 10); if (*end != '.' && *end != '\0') return -1; @@ -38,7 +38,7 @@ int parse_nsec_time(const char *str, u64 *ptime) for (i = strlen(nsec_buf); i < 9; i++) nsec_buf[i] = '0'; - time_nsec = strtoul(nsec_buf, &end, 10); + time_nsec = strtoull(nsec_buf, &end, 10); if (*end != '\0') return -1; } else -- 2.43.0