From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48F09C77B70 for ; Tue, 11 Apr 2023 17:45:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230268AbjDKRpX (ORCPT ); Tue, 11 Apr 2023 13:45:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230222AbjDKRpS (ORCPT ); Tue, 11 Apr 2023 13:45:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF63665B0; Tue, 11 Apr 2023 10:45:01 -0700 (PDT) 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 61C2A62A30; Tue, 11 Apr 2023 17:45:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03B5DC433D2; Tue, 11 Apr 2023 17:44:58 +0000 (UTC) Date: Tue, 11 Apr 2023 13:44:56 -0400 From: Steven Rostedt To: Will Deacon Cc: Mark Rutland , Florent Revest , catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, bpf@vger.kernel.org, mhiramat@kernel.org, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kpsingh@kernel.org, jolsa@kernel.org, xukuohai@huaweicloud.com, lihuafei1@huawei.com, Linus Torvalds Subject: Re: [PATCH v6 0/5] Add ftrace direct call for arm64 Message-ID: <20230411134456.728551f8@gandalf.local.home> In-Reply-To: <20230411170807.GA23143@willie-the-truck> References: <20230405180250.2046566-1-revest@chromium.org> <20230411124749.7aeea715@gandalf.local.home> <20230411170807.GA23143@willie-the-truck> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-trace-kernel@vger.kernel.org On Tue, 11 Apr 2023 18:08:08 +0100 Will Deacon wrote: > On Tue, Apr 11, 2023 at 12:47:49PM -0400, Steven Rostedt wrote: > > On Tue, 11 Apr 2023 16:56:45 +0100 > > Mark Rutland wrote: > > > > > IIUC Steve was hoping to take the FUNCTION_GRAPH_RETVAL series through the > > > trace tree, and if that's still the plan, maybe both should go that way? > > > > The conflict is minor, and I think I prefer to still have the ARM64 bits go > > through the arm64 tree, as it will get better testing, and I don't like to > > merge branches ;-) > > > > I've added Linus to the Cc so he knows that there will be conflicts, but as > > long as we mention it in our pull request, with a branch that includes the > > solution, it should be fine going through two different trees. > > If it's just the simple asm-offsets conflict that Mark mentioned, then that > sounds fine to me. However, patches 3-5 don't seem to have anything to do I guess 3 and 5 are not, but patch 4 adds arm64 code to the samples (as it requires arch specific asm to handle the direct trampolines). > with arm64 at all and I'd prefer those to go via other trees (esp. as patch > 3 is an independent -stable candidate and the last one is a bpf selftest > change which conflicts in -next). > > So I'll queue the first two in arm64 on a branch (or-next/ftrace) based > on trace-direct-v6.3-rc3. Are 3-5 dependent on those changes? If not, I can pull them into my tree. -- Steve