Path: csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod From: "Naveen N. Rao" Newsgroups: linux.kernel Subject: [PATCH v2 3/5] kprobes: Skip preparing optprobe if the probe is ftrace-based Date: Tue, 21 Feb 2017 17:30:02 +0100 Message-ID: References: X-Original-To: Michael Ellerman , Ananth N Mavinakayanahalli , Masami Hiramatsu X-Mailer: git-send-email 2.11.0 X-Tm-As-Mml: disable X-Content-Scanned: Fidelis XPS MAILER X-Cbid: 17022116-0016-0000-0000-0000021C3AB0 X-Ibm-Av-Detection: SAVI=unused REMOTE=unused XFE=unused X-Cbparentid: 17022116-0017-0000-0000-000006750FF7 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-02-21_13:,, 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-1612050000 definitions=main-1702210154 Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 48 Organization: linux.* mail to news gateway X-Original-Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org X-Original-Date: Tue, 21 Feb 2017 21:56:04 +0530 X-Original-Message-ID: X-Original-References: <657c6623953f6cce52f929a93cc250b7ee76d7cc.1487692624.git.naveen.n.rao@linux.vnet.ibm.com> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1585499 From: Masami Hiramatsu Skip preparing optprobe if the probe is ftrace-based, since anyway, it must not be optimized (or already optimized by ftrace). Tested-by: Naveen N. Rao Signed-off-by: Masami Hiramatsu --- kernel/kprobes.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index fbc7a70ff33e..7e93500dede7 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -708,13 +708,20 @@ static void kill_optimized_kprobe(struct kprobe *p) arch_remove_optimized_kprobe(op); } +static inline +void __prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *p) +{ + if (!kprobe_ftrace(p)) + arch_prepare_optimized_kprobe(op, p); +} + /* Try to prepare optimized instructions */ static void prepare_optimized_kprobe(struct kprobe *p) { struct optimized_kprobe *op; op = container_of(p, struct optimized_kprobe, kp); - arch_prepare_optimized_kprobe(op, p); + __prepare_optimized_kprobe(op, p); } /* Allocate new optimized_kprobe and try to prepare optimized instructions */ @@ -728,7 +735,7 @@ static struct kprobe *alloc_aggr_kprobe(struct kprobe *p) INIT_LIST_HEAD(&op->list); op->kp.addr = p->addr; - arch_prepare_optimized_kprobe(op, p); + __prepare_optimized_kprobe(op, p); return &op->kp; } -- 2.11.0