From patchwork Sun Nov 20 20:07:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 23448 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1250558wrr; Sun, 20 Nov 2022 12:09:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf7AGicSYpVXwLWgSf+kRxX7cUMCsrR80+sdG5XbxuuSO2mgh00f3QyQnIf6B0cSo0IlzJd5 X-Received: by 2002:a05:6a00:3029:b0:572:8c05:6e2c with SMTP id ay41-20020a056a00302900b005728c056e2cmr17252257pfb.85.1668974947086; Sun, 20 Nov 2022 12:09:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668974947; cv=none; d=google.com; s=arc-20160816; b=O8w0jPdqN8WB4udpEh+zGyIkkW1vR8jurZ4iWd2Ln0VTukB/iju+RMOvs787Ta2v/P 6rgbZk/3qyv4CZ3BPrrCzjVCwHDpgmqZgC0jBVKXc/gTr31/dSy6J5+gqhRCAIOpAZWW ONuazT2NYDoSG5hWoqtr5TezHtnfPvcjqJRb8JxMHBsGNS8+MkR7YcsFty0NO7ZnB7sS ToshcgVqDqcxirNADuywqKmvs8sakMUPrTTtGVqHn5dYFVnO3Eq1xX3LiBlHBqZK4GLj jUVLxMWS/DtvsFx5cZmgt0Pw2gzj7Lx+KU8F1urVKkpRXXbpjvRyedKSudREll6w3FZe Xj1A== 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=4RvaouRM2+G+znha67ehSRwzzKvF8cyrCvUAnbEOndI=; b=C6o4voP79WjM1Q/w5FcbjWJpBm2E0duPz4TEJ2utB1cvh1pxbnL4MgyUwFEmJhYnrE Wg8PVDMUo7Hz5MiTtyyqe9T+0DmoVt9nFSmCEJ/LoNee1YT4BMuTgFv/vr8kvFkQvtOx nOYzGQCQCN7usfGJS/wcWMFYnUVvm5bzPcBAckOGrfi7x+UzqwO5IheMl6Y22jKtRYAd KWNSPMTKKqT43H/m5rHaHLOt98YwozkLhcGkV06fmzIXvy6BtUctcNKf9m/J3sp81uMv 6xt3VxBulHIvlrXGmcbnH4kKEW4lbXxVRXW/UIjSgGh9BgC43VXpl+SEypq8+2vYgkyE G+xA== 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 d4-20020a056a0010c400b0056590cd0969si9678300pfu.208.2022.11.20.12.08.54; Sun, 20 Nov 2022 12:09:07 -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 S229850AbiKTUHx (ORCPT + 99 others); Sun, 20 Nov 2022 15:07:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229674AbiKTUHi (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 6286C17E1E; 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 F109760D17; Sun, 20 Nov 2022 20:07:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 671ADC433B5; 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-00Di6D-1e; Sun, 20 Nov 2022 15:07:34 -0500 Message-ID: <20221120200734.299297602@goodmis.org> User-Agent: quilt/0.66 Date: Sun, 20 Nov 2022 15:07:06 -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 06/13] ftrace: Optimize the allocation for mcount entries 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?1750047074150201025?= X-GMAIL-MSGID: =?utf-8?q?1750047074150201025?= From: Wang Wensheng If we can't allocate this size, try something smaller with half of the size. Its order should be decreased by one instead of divided by two. Link: https://lkml.kernel.org/r/20221109094434.84046-3-wangwensheng4@huawei.com Cc: Cc: Cc: stable@vger.kernel.org Fixes: a79008755497d ("ftrace: Allocate the mcount record pages as groups") 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 8b13ce2eae70..56a168121bfc 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -3190,7 +3190,7 @@ static int ftrace_allocate_records(struct ftrace_page *pg, int count) /* if we can't allocate this size, try something smaller */ if (!order) return -ENOMEM; - order >>= 1; + order--; goto again; }