Merge pull request #105 from OpenCloudOS/dev

bpf: fix skb_clone trace exception

Author: menglongdong

src/progs/kprobe.c

@@ -95,11 +95,7 @@ static inline int default_handle_entry(context_info_t *info);
 
 static __always_inline int get_ret_key(int func)
 {
-#ifndef BPF_MAP_TYPE_PERCPU_ARRAY
-	return func * bpf_get_smp_processor_id();
-#else
 	return func;
-#endif
 }
 
 static inline void get_ret(context_info_t *info)

src/trace.c

@@ -721,7 +721,7 @@ static void trace_print_enabled()
 		} else {
 			fmt = "tracepoint";
 		}
-		pr_verb("\t%s: %s, prog: %s, status: %x\n", fmt, trace->name,
+		pr_verb("\t%s: %s, prog: %s, status: 0x%x\n", fmt, trace->name,
 			trace->prog, trace_get_status(trace->index));
 	}
 }

src/trace.h

@@ -225,8 +225,14 @@ static inline bool trace_is_usable(trace_t *t)
 	return trace_is_enable(t) && !trace_is_invalid(t);
 }
 
+static inline void trace_set_status(int func, int status)
+{
+	trace_ctx.bpf_args.trace_status[func] |= status;
+}
+
 static inline void trace_set_ret(trace_t *t)
 {
+	trace_set_status(t->index, FUNC_STATUS_RET);
 	t->status |= TRACE_RET;
 }
 
@@ -245,11 +251,6 @@ static inline bool trace_is_retonly(trace_t *t)
 	return t->status & TRACE_RET_ONLY;
 }
 
-static inline void trace_set_status(int func, int status)
-{
-	trace_ctx.bpf_args.trace_status[func] |= status;
-}
-
 static inline u8 trace_get_status(int func)
 {
 	return trace_ctx.bpf_args.trace_status[func];