diff for duplicates of <20050606174058.934378000@csdlinux-2.jf.intel.com> diff --git a/a/1.txt b/N1/1.txt index 0a57a9a..7b8be5e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ The current Kprobes when patching the original instruction with the break instruction tries to retain the original qualifying predicate(qp), however for cmp.crel.ctype where -ctype = unc, which is a special instruction always needs to be +ctype == unc, which is a special instruction always needs to be executed irrespective of qp. Hence, if the instruction we are patching is of this type, then we should not copy the original qp to the break instruction, this is because we always want the @@ -10,12 +10,14 @@ break fault to happen so that we can emulate the instruction. This patch is based on the feedback given by David Mosberger Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> -================================= arch/ia64/kernel/kprobes.c | 43 +++++++++++++++++++++++++++++++++++++++++-- +=================================================================== + arch/ia64/kernel/kprobes.c | 43 +++++++++++++++++++++++++++++++++++++++++-- include/asm-ia64/kprobes.h | 17 +++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) Index: linux-2.6.12-rc5/arch/ia64/kernel/kprobes.c -=================================--- linux-2.6.12-rc5.orig/arch/ia64/kernel/kprobes.c +=================================================================== +--- linux-2.6.12-rc5.orig/arch/ia64/kernel/kprobes.c +++ linux-2.6.12-rc5/arch/ia64/kernel/kprobes.c @@ -137,6 +137,41 @@ static void update_kprobe_inst_flag(uint } @@ -32,23 +34,23 @@ Index: linux-2.6.12-rc5/arch/ia64/kernel/kprobes.c + cmp_inst_t cmp_inst; + uint ctype_unc = 0; + -+ if (!((bundle_encoding[template][slot] = I) || -+ (bundle_encoding[template][slot] = M))) ++ if (!((bundle_encoding[template][slot] == I) || ++ (bundle_encoding[template][slot] == M))) + goto out; + -+ if (!((major_opcode = 0xC) || (major_opcode = 0xD) || -+ (major_opcode = 0xE))) ++ if (!((major_opcode == 0xC) || (major_opcode == 0xD) || ++ (major_opcode == 0xE))) + goto out; + + cmp_inst.l = kprobe_inst; -+ if ((cmp_inst.f.x2 = 0) || (cmp_inst.f.x2 = 1)) { ++ if ((cmp_inst.f.x2 == 0) || (cmp_inst.f.x2 == 1)) { + /* Integere compare - Register Register (A6 type)*/ -+ if ((cmp_inst.f.tb = 0) && (cmp_inst.f.ta = 0) -+ &&(cmp_inst.f.c = 1)) ++ if ((cmp_inst.f.tb == 0) && (cmp_inst.f.ta == 0) ++ &&(cmp_inst.f.c == 1)) + ctype_unc = 1; -+ } else if ((cmp_inst.f.x2 = 2)||(cmp_inst.f.x2 = 3)) { ++ } else if ((cmp_inst.f.x2 == 2)||(cmp_inst.f.x2 == 3)) { + /* Integere compare - Immediate Register (A8 type)*/ -+ if ((cmp_inst.f.ta = 0) &&(cmp_inst.f.c = 1)) ++ if ((cmp_inst.f.ta == 0) &&(cmp_inst.f.c == 1)) + ctype_unc = 1; + } +out: @@ -76,7 +78,8 @@ Index: linux-2.6.12-rc5/arch/ia64/kernel/kprobes.c switch (slot) { case 0: Index: linux-2.6.12-rc5/include/asm-ia64/kprobes.h -=================================--- linux-2.6.12-rc5.orig/include/asm-ia64/kprobes.h +=================================================================== +--- linux-2.6.12-rc5.orig/include/asm-ia64/kprobes.h +++ linux-2.6.12-rc5/include/asm-ia64/kprobes.h @@ -30,6 +30,23 @@ diff --git a/a/content_digest b/N1/content_digest index fd90b4d..fa1d49b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020050606173652.059047000@csdlinux-2.jf.intel.com\0" "From\0Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>\0" "Subject\0[patch 2/3] Kprobes IA64 cmp ctype unc support\0" - "Date\0Mon, 06 Jun 2005 17:36:54 +0000\0" + "Date\0Mon, 06 Jun 2005 10:36:54 -0700\0" "To\0akpm@osdl.org\0" "Cc\0linux-kernel@vger.kernel.org" linux-ia64@vger.kernel.org @@ -11,11 +11,12 @@ alen.brunelle@hp.com " anil.s.keshavamurthy@intel.com\0" "\00:1\0" + "fn\0kprobes-ia64-qp-fix2.patch\0" "b\0" "The current Kprobes when patching the original instruction\n" "with the break instruction tries to retain the original\n" "qualifying predicate(qp), however for cmp.crel.ctype where\n" - "ctype = unc, which is a special instruction always needs to be\n" + "ctype == unc, which is a special instruction always needs to be\n" "executed irrespective of qp. Hence, if the instruction we are patching\n" "is of this type, then we should not copy the original qp to \n" "the break instruction, this is because we always want the\n" @@ -24,12 +25,14 @@ "This patch is based on the feedback given by David Mosberger\n" "\n" "Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>\n" - "================================= arch/ia64/kernel/kprobes.c | 43 +++++++++++++++++++++++++++++++++++++++++--\n" + "===================================================================\n" + " arch/ia64/kernel/kprobes.c | 43 +++++++++++++++++++++++++++++++++++++++++--\n" " include/asm-ia64/kprobes.h | 17 +++++++++++++++++\n" " 2 files changed, 58 insertions(+), 2 deletions(-)\n" "\n" "Index: linux-2.6.12-rc5/arch/ia64/kernel/kprobes.c\n" - "=================================--- linux-2.6.12-rc5.orig/arch/ia64/kernel/kprobes.c\n" + "===================================================================\n" + "--- linux-2.6.12-rc5.orig/arch/ia64/kernel/kprobes.c\n" "+++ linux-2.6.12-rc5/arch/ia64/kernel/kprobes.c\n" "@@ -137,6 +137,41 @@ static void update_kprobe_inst_flag(uint\n" " }\n" @@ -46,23 +49,23 @@ "+\tcmp_inst_t cmp_inst;\n" "+\tuint ctype_unc = 0;\n" "+\n" - "+\tif (!((bundle_encoding[template][slot] = I) ||\n" - "+\t\t(bundle_encoding[template][slot] = M)))\n" + "+\tif (!((bundle_encoding[template][slot] == I) ||\n" + "+\t\t(bundle_encoding[template][slot] == M)))\n" "+\t\tgoto out;\n" "+\n" - "+\tif (!((major_opcode = 0xC) || (major_opcode = 0xD) ||\n" - "+\t\t(major_opcode = 0xE)))\n" + "+\tif (!((major_opcode == 0xC) || (major_opcode == 0xD) ||\n" + "+\t\t(major_opcode == 0xE)))\n" "+\t\tgoto out;\n" "+\n" "+\tcmp_inst.l = kprobe_inst;\n" - "+\tif ((cmp_inst.f.x2 = 0) || (cmp_inst.f.x2 = 1)) {\n" + "+\tif ((cmp_inst.f.x2 == 0) || (cmp_inst.f.x2 == 1)) {\n" "+\t\t/* Integere compare - Register Register (A6 type)*/\n" - "+\t\tif ((cmp_inst.f.tb = 0) && (cmp_inst.f.ta = 0)\n" - "+\t\t\t\t&&(cmp_inst.f.c = 1))\n" + "+\t\tif ((cmp_inst.f.tb == 0) && (cmp_inst.f.ta == 0)\n" + "+\t\t\t\t&&(cmp_inst.f.c == 1))\n" "+\t\t\tctype_unc = 1;\n" - "+\t} else if ((cmp_inst.f.x2 = 2)||(cmp_inst.f.x2 = 3)) {\n" + "+\t} else if ((cmp_inst.f.x2 == 2)||(cmp_inst.f.x2 == 3)) {\n" "+\t\t/* Integere compare - Immediate Register (A8 type)*/\n" - "+\t\tif ((cmp_inst.f.ta = 0) &&(cmp_inst.f.c = 1))\n" + "+\t\tif ((cmp_inst.f.ta == 0) &&(cmp_inst.f.c == 1))\n" "+\t\t\tctype_unc = 1;\n" "+\t}\n" "+out:\n" @@ -90,7 +93,8 @@ " \tswitch (slot) {\n" " \t case 0:\n" "Index: linux-2.6.12-rc5/include/asm-ia64/kprobes.h\n" - "=================================--- linux-2.6.12-rc5.orig/include/asm-ia64/kprobes.h\n" + "===================================================================\n" + "--- linux-2.6.12-rc5.orig/include/asm-ia64/kprobes.h\n" "+++ linux-2.6.12-rc5/include/asm-ia64/kprobes.h\n" "@@ -30,6 +30,23 @@\n" " \n" @@ -119,4 +123,4 @@ "\n" -- -76a8d1f4e041a16dd958dae07740ef89bf4ea41a92122194274270df1f3701cd +e6326ee0e2bfaab27404d9e4b4b73423c3f7c43b8201a59dd5bc29322fe9123d
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.