Skip to content

Commit

Permalink
kernel/test_kprobes.c: use current logging functions
Browse files Browse the repository at this point in the history 
- Add pr_fmt
- Coalesce formats
- Use current pr_foo() functions instead of printk
- Remove unnecessary "failed" display (already in log level).

Signed-off-by: Fabian Frederick <[email protected]>
Cc: Ananth N Mavinakayanahalli <[email protected]>
Cc: Anil S Keshavamurthy <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Masami Hiramatsu <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
@torvalds
Fabian Frederick authored and torvalds committed Aug 8, 2014
1 parent 4dfe694 commit 4878b14
Showing 1 changed file with 31 additions and 56 deletions.
87 changes: 31 additions & 56 deletions kernel/test_kprobes.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* the GNU General Public License for more details.
*/

#define pr_fmt(fmt) "Kprobe smoke test: " fmt

#include <linux/kernel.h>
#include <linux/kprobes.h>
#include <linux/random.h>
Expand Down Expand Up @@ -41,8 +43,7 @@ static void kp_post_handler(struct kprobe *p, struct pt_regs *regs,
{
if (preh_val != (rand1 / div_factor)) {
handler_errors++;
printk(KERN_ERR "Kprobe smoke test failed: "
"incorrect value in post_handler\n");
pr_err("incorrect value in post_handler\n");
}
posth_val = preh_val + div_factor;
}
Expand All @@ -59,23 +60,20 @@ static int test_kprobe(void)

ret = register_kprobe(&kp);
if (ret < 0) {
printk(KERN_ERR "Kprobe smoke test failed: "
"register_kprobe returned %d\n", ret);
pr_err("register_kprobe returned %d\n", ret);
return ret;
}

ret = target(rand1);
unregister_kprobe(&kp);

if (preh_val == 0) {
printk(KERN_ERR "Kprobe smoke test failed: "
"kprobe pre_handler not called\n");
pr_err("kprobe pre_handler not called\n");
handler_errors++;
}

if (posth_val == 0) {
printk(KERN_ERR "Kprobe smoke test failed: "
"kprobe post_handler not called\n");
pr_err("kprobe post_handler not called\n");
handler_errors++;
}

Expand All @@ -98,8 +96,7 @@ static void kp_post_handler2(struct kprobe *p, struct pt_regs *regs,
{
if (preh_val != (rand1 / div_factor) + 1) {
handler_errors++;
printk(KERN_ERR "Kprobe smoke test failed: "
"incorrect value in post_handler2\n");
pr_err("incorrect value in post_handler2\n");
}
posth_val = preh_val + div_factor;
}
Expand All @@ -120,8 +117,7 @@ static int test_kprobes(void)
kp.flags = 0;
ret = register_kprobes(kps, 2);
if (ret < 0) {
printk(KERN_ERR "Kprobe smoke test failed: "
"register_kprobes returned %d\n", ret);
pr_err("register_kprobes returned %d\n", ret);
return ret;
}

Expand All @@ -130,14 +126,12 @@ static int test_kprobes(void)
ret = target(rand1);

if (preh_val == 0) {
printk(KERN_ERR "Kprobe smoke test failed: "
"kprobe pre_handler not called\n");
pr_err("kprobe pre_handler not called\n");
handler_errors++;
}

if (posth_val == 0) {
printk(KERN_ERR "Kprobe smoke test failed: "
"kprobe post_handler not called\n");
pr_err("kprobe post_handler not called\n");
handler_errors++;
}

Expand All @@ -146,14 +140,12 @@ static int test_kprobes(void)
ret = target2(rand1);

if (preh_val == 0) {
printk(KERN_ERR "Kprobe smoke test failed: "
"kprobe pre_handler2 not called\n");
pr_err("kprobe pre_handler2 not called\n");
handler_errors++;
}

if (posth_val == 0) {
printk(KERN_ERR "Kprobe smoke test failed: "
"kprobe post_handler2 not called\n");
pr_err("kprobe post_handler2 not called\n");
handler_errors++;
}

Expand All @@ -166,8 +158,7 @@ static u32 j_kprobe_target(u32 value)
{
if (value != rand1) {
handler_errors++;
printk(KERN_ERR "Kprobe smoke test failed: "
"incorrect value in jprobe handler\n");
pr_err("incorrect value in jprobe handler\n");
}

jph_val = rand1;
Expand All @@ -186,16 +177,14 @@ static int test_jprobe(void)

ret = register_jprobe(&jp);
if (ret < 0) {
printk(KERN_ERR "Kprobe smoke test failed: "
"register_jprobe returned %d\n", ret);
pr_err("register_jprobe returned %d\n", ret);
return ret;
}

ret = target(rand1);
unregister_jprobe(&jp);
if (jph_val == 0) {
printk(KERN_ERR "Kprobe smoke test failed: "
"jprobe handler not called\n");
pr_err("jprobe handler not called\n");
handler_errors++;
}

Expand All @@ -217,24 +206,21 @@ static int test_jprobes(void)
jp.kp.flags = 0;
ret = register_jprobes(jps, 2);
if (ret < 0) {
printk(KERN_ERR "Kprobe smoke test failed: "
"register_jprobes returned %d\n", ret);
pr_err("register_jprobes returned %d\n", ret);
return ret;
}

jph_val = 0;
ret = target(rand1);
if (jph_val == 0) {
printk(KERN_ERR "Kprobe smoke test failed: "
"jprobe handler not called\n");
pr_err("jprobe handler not called\n");
handler_errors++;
}

jph_val = 0;
ret = target2(rand1);
if (jph_val == 0) {
printk(KERN_ERR "Kprobe smoke test failed: "
"jprobe handler2 not called\n");
pr_err("jprobe handler2 not called\n");
handler_errors++;
}
unregister_jprobes(jps, 2);
Expand All @@ -256,13 +242,11 @@ static int return_handler(struct kretprobe_instance *ri, struct pt_regs *regs)

if (ret != (rand1 / div_factor)) {
handler_errors++;
printk(KERN_ERR "Kprobe smoke test failed: "
"incorrect value in kretprobe handler\n");
pr_err("incorrect value in kretprobe handler\n");
}
if (krph_val == 0) {
handler_errors++;
printk(KERN_ERR "Kprobe smoke test failed: "
"call to kretprobe entry handler failed\n");
pr_err("call to kretprobe entry handler failed\n");
}

krph_val = rand1;
Expand All @@ -281,16 +265,14 @@ static int test_kretprobe(void)

ret = register_kretprobe(&rp);
if (ret < 0) {
printk(KERN_ERR "Kprobe smoke test failed: "
"register_kretprobe returned %d\n", ret);
pr_err("register_kretprobe returned %d\n", ret);
return ret;
}

ret = target(rand1);
unregister_kretprobe(&rp);
if (krph_val != rand1) {
printk(KERN_ERR "Kprobe smoke test failed: "
"kretprobe handler not called\n");
pr_err("kretprobe handler not called\n");
handler_errors++;
}

Expand All @@ -303,13 +285,11 @@ static int return_handler2(struct kretprobe_instance *ri, struct pt_regs *regs)

if (ret != (rand1 / div_factor) + 1) {
handler_errors++;
printk(KERN_ERR "Kprobe smoke test failed: "
"incorrect value in kretprobe handler2\n");
pr_err("incorrect value in kretprobe handler2\n");
}
if (krph_val == 0) {
handler_errors++;
printk(KERN_ERR "Kprobe smoke test failed: "
"call to kretprobe entry handler failed\n");
pr_err("call to kretprobe entry handler failed\n");
}

krph_val = rand1;
Expand All @@ -332,24 +312,21 @@ static int test_kretprobes(void)
rp.kp.flags = 0;
ret = register_kretprobes(rps, 2);
if (ret < 0) {
printk(KERN_ERR "Kprobe smoke test failed: "
"register_kretprobe returned %d\n", ret);
pr_err("register_kretprobe returned %d\n", ret);
return ret;
}

krph_val = 0;
ret = target(rand1);
if (krph_val != rand1) {
printk(KERN_ERR "Kprobe smoke test failed: "
"kretprobe handler not called\n");
pr_err("kretprobe handler not called\n");
handler_errors++;
}

krph_val = 0;
ret = target2(rand1);
if (krph_val != rand1) {
printk(KERN_ERR "Kprobe smoke test failed: "
"kretprobe handler2 not called\n");
pr_err("kretprobe handler2 not called\n");
handler_errors++;
}
unregister_kretprobes(rps, 2);
Expand All @@ -368,7 +345,7 @@ int init_test_probes(void)
rand1 = prandom_u32();
} while (rand1 <= div_factor);

printk(KERN_INFO "Kprobe smoke test started\n");
pr_info("started\n");
num_tests++;
ret = test_kprobe();
if (ret < 0)
Expand Down Expand Up @@ -402,13 +379,11 @@ int init_test_probes(void)
#endif /* CONFIG_KRETPROBES */

if (errors)
printk(KERN_ERR "BUG: Kprobe smoke test: %d out of "
"%d tests failed\n", errors, num_tests);
pr_err("BUG: %d out of %d tests failed\n", errors, num_tests);
else if (handler_errors)
printk(KERN_ERR "BUG: Kprobe smoke test: %d error(s) "
"running handlers\n", handler_errors);
pr_err("BUG: %d error(s) running handlers\n", handler_errors);
else
printk(KERN_INFO "Kprobe smoke test passed successfully\n");
pr_info("passed successfully\n");

return 0;
}

0 comments on commit 4878b14

Please sign in to comment.