100-revert-read-kernel-variants.patch 3.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394
  1. From 755220eb974708615b14bcdc6412319698e0485d Mon Sep 17 00:00:00 2001
  2. From: Tony Ambardar <[email protected]>
  3. Date: Thu, 22 Dec 2022 22:53:10 -0800
  4. Subject: [PATCH] Revert "ply: Use new read_kernel variants"
  5. This reverts commit 17864b9818cceca09f31a346908afe1c718c10c5.
  6. Fixes: 17864b98 ("ply: Use new read_kernel variants")
  7. Signed-off-by: Tony Ambardar <[email protected]>
  8. ---
  9. src/libply/built-in/memory.c | 10 +++++-----
  10. src/libply/ir.c | 10 +++++-----
  11. src/libply/provider/tracepoint.c | 2 +-
  12. 3 files changed, 11 insertions(+), 11 deletions(-)
  13. --- a/src/libply/built-in/memory.c
  14. +++ b/src/libply/built-in/memory.c
  15. @@ -140,7 +140,7 @@ static int str_ir_post(const struct func
  16. ir_emit_ldbp(pb->ir, BPF_REG_1, n->sym->irs.stack);
  17. ir_emit_insn(ir, MOV_IMM((int32_t)type_sizeof(n->sym->type)), BPF_REG_2, 0);
  18. ir_emit_sym_to_reg(ir, BPF_REG_3, ptr->sym);
  19. - ir_emit_insn(ir, CALL(BPF_FUNC_probe_read_kernel_str), 0, 0);
  20. + ir_emit_insn(ir, CALL(BPF_FUNC_probe_read_str), 0, 0);
  21. return 0;
  22. }
  23. @@ -305,7 +305,7 @@ static int struct_dot_ir_pre(const struc
  24. sou->sym->irs.hint.dot = 1;
  25. /* this also means we need to put ourselves on the
  26. - * stack since data will be loaded via probe_read_kernel */
  27. + * stack since data will be loaded via probe_read */
  28. n->sym->irs.hint.stack = 1;
  29. }
  30. return 0;
  31. @@ -334,7 +334,7 @@ static int struct_dot_ir_post(const stru
  32. ir_emit_sym_to_reg(pb->ir, BPF_REG_3, ptr->sym);
  33. ir_emit_insn(pb->ir, ALU64_IMM(BPF_ADD, offset), BPF_REG_3, 0);
  34. - goto probe_read_kernel;
  35. + goto probe_read;
  36. }
  37. offset += sou->sym->irs.stack;
  38. @@ -346,10 +346,10 @@ static int struct_dot_ir_post(const stru
  39. }
  40. ir_emit_insn(pb->ir, ALU_IMM(BPF_ADD, offset), BPF_REG_3, 0);
  41. -probe_read_kernel:
  42. +probe_read:
  43. ir_emit_insn(pb->ir, MOV_IMM((int32_t)dst->size), BPF_REG_2, 0);
  44. ir_emit_ldbp(pb->ir, BPF_REG_1, dst->stack);
  45. - ir_emit_insn(pb->ir, CALL(BPF_FUNC_probe_read_kernel), 0, 0);
  46. + ir_emit_insn(pb->ir, CALL(BPF_FUNC_probe_read), 0, 0);
  47. /* TODO if (r0) exit(r0); */
  48. return 0;
  49. }
  50. --- a/src/libply/ir.c
  51. +++ b/src/libply/ir.c
  52. @@ -38,10 +38,10 @@ static const char *bpf_func_name(enum bp
  53. return "map_update_elem";
  54. case BPF_FUNC_perf_event_output:
  55. return "perf_event_output";
  56. - case BPF_FUNC_probe_read_kernel:
  57. - return "probe_read_kernel";
  58. - case BPF_FUNC_probe_read_kernel_str:
  59. - return "probe_read_kernel_str";
  60. + case BPF_FUNC_probe_read:
  61. + return "probe_read";
  62. + case BPF_FUNC_probe_read_str:
  63. + return "probe_read_str";
  64. case BPF_FUNC_trace_printk:
  65. return "trace_printk";
  66. default:
  67. @@ -416,7 +416,7 @@ void ir_emit_read_to_sym(struct ir *ir,
  68. if (src != BPF_REG_3)
  69. ir_emit_insn(ir, MOV, BPF_REG_3, src);
  70. - ir_emit_insn(ir, CALL(BPF_FUNC_probe_read_kernel), 0, 0);
  71. + ir_emit_insn(ir, CALL(BPF_FUNC_probe_read), 0, 0);
  72. /* TODO if (r0) exit(r0); */
  73. }
  74. --- a/src/libply/provider/tracepoint.c
  75. +++ b/src/libply/provider/tracepoint.c
  76. @@ -68,7 +68,7 @@ static int tracepoint_dyn_ir_post(const
  77. ir_emit_insn(ir, ALU_IMM(BPF_AND, 0xffff), BPF_REG_4, 0);
  78. ir_emit_insn(ir, ALU64(BPF_ADD), BPF_REG_3, BPF_REG_4);
  79. - ir_emit_insn(ir, CALL(BPF_FUNC_probe_read_kernel), 0, 0);
  80. + ir_emit_insn(ir, CALL(BPF_FUNC_probe_read), 0, 0);
  81. return 0;
  82. }