Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753755AbdCHQAJ (ORCPT ); Wed, 8 Mar 2017 11:00:09 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:41925 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752370AbdCHQAH (ORCPT ); Wed, 8 Mar 2017 11:00:07 -0500 Date: Wed, 8 Mar 2017 19:54:12 +0530 From: "Naveen N. Rao" To: Michael Ellerman Cc: Arnaldo Carvalho de Melo , Masami Hiramatsu , Steven Rostedt , Ingo Molnar , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Ananth N Mavinakayanahalli Subject: Re: [PATCH v5 2/5] powerpc: kretprobes: override default function entry offset References: <53bcae5a711eab803c9c3210110e8a464df34202.1488961018.git.naveen.n.rao@linux.vnet.ibm.com> <87o9xcujzi.fsf@concordia.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87o9xcujzi.fsf@concordia.ellerman.id.au> User-Agent: Mutt/1.6.2 (2016-07-01) X-TM-AS-MML: disable x-cbid: 17030814-0024-0000-0000-000003AF518B X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17030814-0025-0000-0000-0000112CAA28 Message-Id: <20170308142412.GI11046@naverao1-tp.localdomain> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-03-08_10:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1703080118 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1780 Lines: 52 Hi Michael, On 2017/03/08 09:43PM, Michael Ellerman wrote: > "Naveen N. Rao" writes: > > > With ABIv2, we offset 8 bytes into a function to get at the local entry > > point. > > > > Acked-by: Ananth N Mavinakayanahalli > > Acked-by: Michael Ellerman > > Signed-off-by: Naveen N. Rao > > --- > > arch/powerpc/kernel/kprobes.c | 9 +++++++++ > > 1 file changed, 9 insertions(+) > > I'm OK with this change, and I'm happy for it to go with the rest of the > series via acme's tree: > > Acked-by: Michael Ellerman > > > But, you've also sent a series to do KPROBES_ON_FTRACE, and that also > touches this function, see the 2nd to last hunk at: > > https://patchwork.ozlabs.org/patch/730675/ > > > If this goes via acme's tree it will be awkward for me to merge the > series above via the powerpc tree. Ah yes, indeed. > > So we could do topic branches and so on, or we could just drop this > patch from this series, and I'll merge it as part of the other series. > It won't do anything useful until it's merged with a tree that also has > the rest of this series. Or something else I haven't thought of. The arch-independent change that this depends on has been picked up by Arnaldo and pushed to Ingo: https://www.mail-archive.com/linuxppc-dev@lists.ozlabs.org/msg115211.html I'm guessing this will go into v4.11? In which case, this powerpc patch should also go in. Otherwise kretprobes will be broken on powerpc64le. I wasn't sure if you were planning on picking up KPROBES_ON_FTRACE for v4.11. If so, it would be good to take this patch through the powerpc tree. Otherwise, this can go via Ingo's tree. Thanks, Naveen