[tip:perf/core] kprobes/x86: Fix the description of __copy_instruction()

Path	csiph.com!news.mixmin.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod
From	tip-bot for Masami Hiramatsu <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:perf/core] kprobes/x86: Fix the description of __copy_instruction()
Date	Wed, 12 Apr 2017 09:40:01 +0200
Message-ID	<tvl2F-1FX-7@gated-at.bofh.it> (permalink)
References	<tqdS9-1Qy-1@gated-at.bofh.it>
Reply-To	torvalds@linux-foundation.org, anil.s.keshavamurthy@intel.com, tglx@linutronix.de, davem@davemloft.net, mhiramat@kernel.org, aryabinin@virtuozzo.com, jpoimboe@redhat.com, peterz@infradead.org, mingo@kernel.org, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, brgerst@gmail.com, ananth@linux.vnet.ibm.com, xiaolong.ye@intel.com, bp@alien8.de, hpa@zytor.com
Git-Commit-ID	129d17e8e8daf50f8aff4941fb4a9cda027ab9cf
X-Mailer	tip-git-log-daemon
Robot-ID	<tip-bot.git.kernel.org>
Robot-Unsubscribe	Contact <mailto:hpa@kernel.org> to get blacklisted from these emails
MIME-Version	1.0
Content-Transfer-Encoding	8bit
Content-Type	text/plain; charset=UTF-8
Content-Disposition	inline
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	61
Organization	linux.* mail to news gateway
X-Original-Cc	hpa@zytor.com, ananth@linux.vnet.ibm.com, bp@alien8.de, xiaolong.ye@intel.com, brgerst@gmail.com, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, peterz@infradead.org, jpoimboe@redhat.com, aryabinin@virtuozzo.com, mhiramat@kernel.org, tglx@linutronix.de, anil.s.keshavamurthy@intel.com, davem@davemloft.net, torvalds@linux-foundation.org
X-Original-Date	Wed, 12 Apr 2017 00:32:30 -0700
X-Original-Message-ID	<tip-129d17e8e8daf50f8aff4941fb4a9cda027ab9cf@git.kernel.org>
X-Original-References	<149076347582.22469.3775133607244923462.stgit@devbox>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1621880

Show key headers only | View raw

Commit-ID:  129d17e8e8daf50f8aff4941fb4a9cda027ab9cf
Gitweb:     http://git.kernel.org/tip/129d17e8e8daf50f8aff4941fb4a9cda027ab9cf
Author:     Masami Hiramatsu <mhiramat@kernel.org>
AuthorDate: Wed, 29 Mar 2017 13:58:06 +0900
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 12 Apr 2017 09:23:45 +0200

kprobes/x86: Fix the description of __copy_instruction()

Fix the description comment of __copy_instruction() function
since it has already been changed to return the length of the
copied instruction.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: David S . Miller <davem@davemloft.net>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ye Xiaolong <xiaolong.ye@intel.com>
Link: http://lkml.kernel.org/r/149076347582.22469.3775133607244923462.stgit@devbox
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/kprobes/core.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index 9eae5a6..81d4dc7 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -350,11 +350,10 @@ static int is_IF_modifier(kprobe_opcode_t *insn)
 }
 
 /*
- * Copy an instruction and adjust the displacement if the instruction
- * uses the %rip-relative addressing mode.
- * If it does, Return the address of the 32-bit displacement word.
- * If not, return null.
- * Only applicable to 64-bit x86.
+ * Copy an instruction with recovering modified instruction by kprobes
+ * and adjust the displacement if the instruction uses the %rip-relative
+ * addressing mode.
+ * This returns the length of copied instruction, or 0 if it has an error.
  */
 int __copy_instruction(u8 *dest, u8 *src)
 {
@@ -376,6 +375,7 @@ int __copy_instruction(u8 *dest, u8 *src)
 	memcpy(dest, insn.kaddr, length);
 
 #ifdef CONFIG_X86_64
+	/* Only x86_64 has RIP relative instructions */
 	if (insn_rip_relative(&insn)) {
 		s64 newdisp;
 		u8 *disp;

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[tip:perf/core] kprobes/x86: Fix the description of  __copy_instruction() tip-bot for Masami Hiramatsu <tipbot@zytor.com> - 2017-04-12 09:40 +0200

csiph-web