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 5B19B1C26 for ; Wed, 23 Nov 2022 09:02:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B2DBC433C1; Wed, 23 Nov 2022 09:02:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1669194146; bh=My+juo3flgjCis09t/MObaxbHs+n5GvpiZetRIKpEyg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IMTkjBqTeRQjBNBguUX1xn64gCE0WLubAXGsXQACj2mQxqW7yT6ngTCA8ZMovdawe hw5Y9WNO4aZ9sGnwh0ZCLzkMgtJqKD2WSBlVMOs71UAqO4cWTGPyhS+YvdJ0Zw4EGj RKABouGXC/2soV4JAYiUK4p7gjNRGhHEOz/N9nXw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, mhiramat@kernel.org, mark.rutland@arm.com, Wang Wensheng , "Steven Rostedt (Google)" Subject: [PATCH 4.14 54/88] ftrace: Optimize the allocation for mcount entries Date: Wed, 23 Nov 2022 09:50:51 +0100 Message-Id: <20221123084550.409659235@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221123084548.535439312@linuxfoundation.org> References: <20221123084548.535439312@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Wang Wensheng commit bcea02b096333dc74af987cb9685a4dbdd820840 upstream. 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) Signed-off-by: Greg Kroah-Hartman --- kernel/trace/ftrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -3105,7 +3105,7 @@ static int ftrace_allocate_records(struc /* if we can't allocate this size, try something smaller */ if (!order) return -ENOMEM; - order >>= 1; + order--; goto again; }