Merge pull request #1688 from iovisor/yhs_dev

fix profile.py with latest net-next

tools/profile.py

@@ -151,13 +151,26 @@ int do_perf_event(struct bpf_perf_event_data *ctx) {
         struct pt_regs regs = {};
         bpf_probe_read(&regs, sizeof(regs), (void *)&ctx->regs);
         u64 ip = PT_REGS_IP(&regs);
+        u64 page_offset;
 
         // if ip isn't sane, leave key ips as zero for later checking
-#ifdef CONFIG_RANDOMIZE_MEMORY
-        if (ip > __PAGE_OFFSET_BASE) {
+#if defined(CONFIG_X86_64) && defined(__PAGE_OFFSET_BASE)
+        // x64, 4.16, ..., 4.11, etc., but some earlier kernel didn't have it
+        page_offset = __PAGE_OFFSET_BASE;
+#elif defined(CONFIG_X86_64) && defined(__PAGE_OFFSET_BASE_L4)
+        // x64, 4.17, and later
+#if defined(CONFIG_DYNAMIC_MEMORY_LAYOUT) && defined(CONFIG_X86_5LEVEL)
+        page_offset = __PAGE_OFFSET_BASE_L5;
 #else
-        if (ip > PAGE_OFFSET) {
+        page_offset = __PAGE_OFFSET_BASE_L4;
 #endif
+#else
+        // earlier x86_64 kernels, e.g., 4.6, comes here
+        // arm64, s390, powerpc, x86_32
+        page_offset = PAGE_OFFSET;
+#endif
+
+        if (ip > page_offset) {
             key.kernel_ip = ip;
         }
     }