From patchwork Sun Nov 20 20:07:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 23447 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1250542wrr; Sun, 20 Nov 2022 12:09:04 -0800 (PST) X-Google-Smtp-Source: AA0mqf7WvIn7tJ1xct5AmmpoT50kNQ4GFr3un4vG/1AJQt+BwRoF5WjrLxjIpHU8oNjunt96qkSv X-Received: by 2002:aa7:8610:0:b0:56c:ba99:8735 with SMTP id p16-20020aa78610000000b0056cba998735mr2515501pfn.15.1668974944279; Sun, 20 Nov 2022 12:09:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668974944; cv=none; d=google.com; s=arc-20160816; b=z5s/C3fX9jl4dGDyMznXY8ttUDsiD2tzmdJqHO+9Y5p/gNTnfpqfBEvhHVtSR4dN8E GVGliIZmPHDfkMGz5lvS82EFfARzt+N/yShzqm7wfhOaPEPyv1nN+sLHwHB60BB5wxNG 83d0KdssqTXl6QqSLwBZu8Kt8rVIyz4OA+HWfWbUvB6187DbpALQd1VHdKf2Z7NEjEiD U2TUjr4XfZTdLqwFGoxwQj4djRGCLICwdZWH+9b+JHk840xmMQDuXGSe6JR8G1RT2Zhn RvsJ6cdwMcFNnvvLy6kNd61LYkfDgAdtF0WSRXYPCeN0NeuLT0ay9+NS26Zs60nmUbBk m6Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=2NV/LynzdJXzmF9dIaORR/Ls1uWwoXIqfI6sk0YXrw8=; b=wBkrd8XLomT1CpNyXu5MsrvcIJt4FrQsVzumdDKRGyKnge4n7OdCR5EQq+kTAspdtA ivVHx7PcitguhDvPN4KtywoeRGvpuQgCNyNtD4bUVRkY112eKHUYsGGnQFZmbqRaGo22 NFDRQzP3OtTyKumoGI12Cw+PIqxooRH59ROEthyWsrlopN6/eey2lGvjmeDb9oY8zork zSlyVJd/TtzH41Qf9OggXflqClck+GWmELirZ+/hmpD20Dq3Yj1sHQVQpwgQq1z9RpnF K/jEVyYJmVKbtWw1y71VMvq4NHkka0IYaKC0wmHo9KkWiITetzgWeC8r+NqKzCBmaC4t goVQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id eb19-20020a056a004c9300b0056be594a8b2si8718563pfb.202.2022.11.20.12.08.50; Sun, 20 Nov 2022 12:09:04 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229836AbiKTUHv (ORCPT + 99 others); Sun, 20 Nov 2022 15:07:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229675AbiKTUHi (ORCPT ); Sun, 20 Nov 2022 15:07:38 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37BAD17AA3; Sun, 20 Nov 2022 12:07:36 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BB9B960D2B; Sun, 20 Nov 2022 20:07:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 310B0C433D7; Sun, 20 Nov 2022 20:07:35 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1owqbG-00Di5j-0t; Sun, 20 Nov 2022 15:07:34 -0500 Message-ID: <20221120200734.113566574@goodmis.org> User-Agent: quilt/0.66 Date: Sun, 20 Nov 2022 15:07:05 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , , stable@vger.kernel.org, Wang Wensheng Subject: [for-linus][PATCH 05/13] ftrace: Fix the possible incorrect kernel message References: <20221120200700.725968899@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS 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?1750047071623313041?= X-GMAIL-MSGID: =?utf-8?q?1750047071623313041?= From: Wang Wensheng If the number of mcount entries is an integer multiple of ENTRIES_PER_PAGE, the page count showing on the console would be wrong. Link: https://lkml.kernel.org/r/20221109094434.84046-2-wangwensheng4@huawei.com Cc: Cc: Cc: stable@vger.kernel.org Fixes: 5821e1b74f0d0 ("function tracing: fix wrong pos computing when read buffer has been fulfilled") Signed-off-by: Wang Wensheng Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ftrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 7dc023641bf1..8b13ce2eae70 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -7391,7 +7391,7 @@ void __init ftrace_init(void) } pr_info("ftrace: allocating %ld entries in %ld pages\n", - count, count / ENTRIES_PER_PAGE + 1); + count, DIV_ROUND_UP(count, ENTRIES_PER_PAGE)); ret = ftrace_process_locs(NULL, __start_mcount_loc,