From patchwork Sat Nov 5 05:31:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pratyush Anand X-Patchwork-Id: 9413607 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 038E86022E for ; Sat, 5 Nov 2016 05:33:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA93E2ABBA for ; Sat, 5 Nov 2016 05:33:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC52A2ABC2; Sat, 5 Nov 2016 05:33:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 52A2B2ABBA for ; Sat, 5 Nov 2016 05:33:41 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c2taD-0006Eb-J7; Sat, 05 Nov 2016 05:32:01 +0000 Received: from mail-pf0-f181.google.com ([209.85.192.181]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c2taA-0006DI-2p for linux-arm-kernel@lists.infradead.org; Sat, 05 Nov 2016 05:31:59 +0000 Received: by mail-pf0-f181.google.com with SMTP id 189so62920567pfz.3 for ; Fri, 04 Nov 2016 22:31:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=dGUYFZNeiCgOWV0aw85bXuv7o/K7vVXejtTBNRLAVmc=; b=kXdpFUm5vsaiaGwTcu7WxHWkIfVUjVqUm5R+QZnSAX+71O2GHW+8SCYcZCnfjQXEyL /g/r3YFeDNeUXSiq7DJtHBJKtt3qq9FzcNi/UM14b3jf7aQbDxdTMCBC2gtGR4PVBUpf rJ3Ass2qVR6SrBsVVq+wpiTIezTpjqIWb2DRb24MmP6jqSsvnc9bWEfDUGlAAL/SE4ma 2M/+wdeoCMQW1OwyCZ01ux3e7ZHu8y+IBp+SQo2OA7c/P1F5ym7mohx0Cmii58JTaIZK h7wKXpZxQPU8bmNJFoKxixjPDZ09I9SEO3mGwCOT6rALvxOgXpPUVOW+gKoZnDeY1753 tXcQ== X-Gm-Message-State: ABUngvedDOGypkMWcMnDQ9agkTRk8Fg3ITQnwpMQBNZmovuZYIm1NgWiVqoXr/2J3mud5p+a X-Received: by 10.98.71.218 with SMTP id p87mr31803143pfi.125.1478323896793; Fri, 04 Nov 2016 22:31:36 -0700 (PDT) Received: from localhost.localdomain ([122.180.204.166]) by smtp.gmail.com with ESMTPSA id p6sm24124024pae.16.2016.11.04.22.31.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Nov 2016 22:31:36 -0700 (PDT) Subject: Re: [PATCH V3 0/6] ARM64: Uprobe support added To: Catalin Marinas References: <20161104174951.vj4il3xkdy7a2ln7@localhost> <20161104184652.rxllldll4qfe7qdn@localhost> From: Pratyush Anand Message-ID: Date: Sat, 5 Nov 2016 11:01:31 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <20161104184652.rxllldll4qfe7qdn@localhost> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161104_223158_149805_E10311C3 X-CRM114-Status: GOOD ( 16.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: steve.capper@linaro.org, srikar@linux.vnet.ibm.com, vijaya.kumar@caviumnetworks.com, will.deacon@arm.com, oleg@redhat.com, linux-kernel@vger.kernel.org, wcohen@redhat.com, linux-arm-kernel@lists.infradead.org, dave.long@redhat.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On Saturday 05 November 2016 12:16 AM, Catalin Marinas wrote: > On Fri, Nov 04, 2016 at 11:49:51AM -0600, Catalin Marinas wrote: >> On Wed, Nov 02, 2016 at 02:40:40PM +0530, Pratyush Anand wrote: >>> Pratyush Anand (6): >>> arm64: kprobe: protect/rename few definitions to be reused by uprobe >>> arm64: kgdb_step_brk_fn: ignore other's exception >>> arm64: Handle TRAP_TRACE for user mode as well >>> arm64: Handle TRAP_BRKPT for user mode as well >>> arm64: introduce mm context flag to keep 32 bit task information >>> arm64: Add uprobe support >> >> I queued the patches for 4.10. I will push them into -next sometime next >> week once I do some testing (I'm currently at the LPC). > > I spoke too soon. With these patches on top of 4.9-rc3, defconfig > together with FTRACE and UPROBE_EVENT enabled I get: > > In file included from /work/Linux/linux-2.6-aarch64/arch/arm64/kernel/probes/decode-insn.c:20:0: > /work/Linux/linux-2.6-aarch64/arch/arm64/include/asm/kprobes.h:52:5: error: conflicting types for 'kprobe_fault_handler' > int kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr); > ^~~~~~~~~~~~~~~~~~~~ > In file included from /work/Linux/linux-2.6-aarch64/arch/arm64/kernel/probes/decode-insn.c:17:0: > /work/Linux/linux-2.6-aarch64/include/linux/kprobes.h:398:90: note: previous definition of 'kprobe_fault_handler' was here > static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr) > ^ > /work/Linux/linux-2.6-aarch64/scripts/Makefile.build:290: recipe for target 'arch/arm64/kernel/probes/decode-insn.o' failed > Hummmm...CONFIG_KPROBE was defined in my setup and did not notice it :( . We need to remove #include from /arch/arm64/kernel/probes/decode-insn.c. is already included from under #ifdef CONFIG_KPROBE. So, do you want me to send V4 or a separate topup fixup patch. Please let me know, will do accordingly. ~Pratyush diff --git a/arch/arm64/kernel/probes/decode-insn.c b/arch/arm64/kernel/probes/decode-insn.c index 8a29d29..6bf6657 100644 --- a/arch/arm64/kernel/probes/decode-insn.c +++ b/arch/arm64/kernel/probes/decode-insn.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include