X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fprobes%2FKbuild;h=eb0de4a87493841ee9817fd35ac9ba240d178a8d;hb=6687229729b31254fa5774f39ee2d768618b3172;hp=54784477d3e08b2ccc9338417e24b3c87d7860d8;hpb=f9208dc00756dfa0a2f191799722030bdf3f793d;p=lttng-modules.git

diff --git a/src/probes/Kbuild b/src/probes/Kbuild
index 54784477..eb0de4a8 100644
--- a/src/probes/Kbuild
+++ b/src/probes/Kbuild
@@ -9,16 +9,30 @@ ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)/include
 obj-$(CONFIG_LTTNG) += lttng-probe-sched.o
 obj-$(CONFIG_LTTNG) += lttng-probe-irq.o
 obj-$(CONFIG_LTTNG) += lttng-probe-timer.o
-obj-$(CONFIG_LTTNG) += lttng-probe-kmem.o
+
+# A dependency on internal header 'mm/slab.h' was introduced in v6.0
+kmem_dep = $(srctree)/mm/slab.h
+kmem_dep_wildcard = $(wildcard $(kmem_dep))
+kmem_dep_check = $(shell \
+if [ \( $(VERSION) -ge 7 \
+   -o \( $(VERSION) -eq 6 -a $(PATCHLEVEL) -ge 0 \) \) -a \
+   -z "$(kmem_dep_wildcard)" ] ; then \
+  echo "warn" ; \
+else \
+  echo "ok" ; \
+fi ;)
+ifeq ($(kmem_dep_check),ok)
+  obj-$(CONFIG_LTTNG) += lttng-probe-kmem.o
+else
+  $(warning File $(kmem_dep) not found. Probe "kmem" is disabled. Use full kernel source tree to enable it.)
+endif
+
 obj-$(CONFIG_LTTNG) += lttng-probe-module.o
 obj-$(CONFIG_LTTNG) += lttng-probe-power.o
 obj-$(CONFIG_LTTNG) += lttng-probe-statedump.o
 
 ifneq ($(CONFIG_NET_9P),)
-  obj-$(CONFIG_LTTNG) +=  $(shell \
-    if [ $(VERSION) -ge 4 \
-      -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 10 \) ] ; then \
-      echo "lttng-probe-9p.o" ; fi;)
+  obj-$(CONFIG_LTTNG) += lttng-probe-9p.o
 endif # CONFIG_NET_9P
 
 i2c_dep = $(srctree)/include/trace/events/i2c.h
@@ -29,38 +43,41 @@ endif
 ifneq ($(CONFIG_KVM),)
   obj-$(CONFIG_LTTNG) += lttng-probe-kvm.o
   ifneq ($(CONFIG_X86),)
-    kvm_dep_lapic = $(srctree)/arch/x86/kvm/lapic.h
-    kvm_dep_lapic_check = $(wildcard $(kvm_dep_lapic))
-    ifneq ($(kvm_dep_lapic_check),)
-      # search for iodev.h in any of its known locations
-      kvm_dep_iodev = $(srctree)/virt/kvm/iodev.h $(srctree)/include/kvm/iodev.h
-      kvm_dep_iodev_check = $(wildcard $(kvm_dep_iodev))
-      ifneq ($(kvm_dep_iodev_check),)
-        kvm_dep_emulate = $(srctree)/arch/x86/kvm/kvm_emulate.h
-        kvm_dep_emulate_wildcard = $(wildcard $(kvm_dep_emulate))
-        kvm_dep_emulate_check = $(shell \
-        if [ \( $(VERSION) -ge 6 \
-           -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -eq 7 \) \) -a \
-           -z "$(kvm_dep_emulate_wildcard)" ] ; then \
-          echo "warn" ; \
-        else \
-          echo "ok" ; \
-        fi ;)
-        ifeq ($(kvm_dep_emulate_check),ok)
-          CFLAGS_lttng-probe-kvm-x86.o += -I$(srctree)/virt/kvm \
-                     -I$(srctree)/arch/x86/kvm
-          CFLAGS_lttng-probe-kvm-x86-mmu.o += -I$(srctree)/virt/kvm
-          obj-$(CONFIG_LTTNG) += lttng-probe-kvm-x86.o
-          obj-$(CONFIG_LTTNG) += lttng-probe-kvm-x86-mmu.o
-        else # ($(kvm_dep_emulate_check),ok)
-          $(warning File $(kvm_dep_emulate) not found. Probe "kvm" x86-specific is disabled. Use full kernel source tree to enable it.)
-        endif # ($(kvm_dep_emulate_check),ok)
-      else # $(kvm_dep_iodev_check)
-        $(warning File $(kvm_dep_iodev) not found. Probe "kvm" x86-specific is disabled. Use full kernel source tree to enable it.)
-      endif # $(kvm_dep_iodev_check)
-    else # $(kvm_dep_lapic_check)
-      $(warning File $(kvm_dep_lapic) not found. Probe "kvm" x86-specific is disabled. Use full kernel source tree to enable it.)
-    endif # $(kvm_dep_lapic_check)
+    ifneq ($(CONFIG_KALLSYMS_ALL),)
+      kvm_dep_lapic = $(srctree)/arch/x86/kvm/lapic.h
+      kvm_dep_lapic_check = $(wildcard $(kvm_dep_lapic))
+      ifneq ($(kvm_dep_lapic_check),)
+        kvm_dep_iodev = $(srctree)/include/kvm/iodev.h
+        kvm_dep_iodev_check = $(wildcard $(kvm_dep_iodev))
+        ifneq ($(kvm_dep_iodev_check),)
+          kvm_dep_emulate = $(srctree)/arch/x86/kvm/kvm_emulate.h
+          kvm_dep_emulate_wildcard = $(wildcard $(kvm_dep_emulate))
+          kvm_dep_emulate_check = $(shell \
+          if [ \( $(VERSION) -ge 6 \
+             -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -eq 7 \) \) -a \
+             -z "$(kvm_dep_emulate_wildcard)" ] ; then \
+            echo "warn" ; \
+          else \
+            echo "ok" ; \
+          fi ;)
+          ifeq ($(kvm_dep_emulate_check),ok)
+            CFLAGS_lttng-probe-kvm-x86.o += -I$(srctree)/virt/kvm \
+                       -I$(srctree)/arch/x86/kvm
+            CFLAGS_lttng-probe-kvm-x86-mmu.o += -I$(srctree)/virt/kvm
+            obj-$(CONFIG_LTTNG) += lttng-probe-kvm-x86.o
+            obj-$(CONFIG_LTTNG) += lttng-probe-kvm-x86-mmu.o
+          else # ($(kvm_dep_emulate_check),ok)
+            $(warning File $(kvm_dep_emulate) not found. Probe "kvm" x86-specific is disabled. Use full kernel source tree to enable it.)
+          endif # ($(kvm_dep_emulate_check),ok)
+        else # $(kvm_dep_iodev_check)
+          $(warning File $(kvm_dep_iodev) not found. Probe "kvm" x86-specific is disabled. Use full kernel source tree to enable it.)
+        endif # $(kvm_dep_iodev_check)
+      else # $(kvm_dep_lapic_check)
+        $(warning File $(kvm_dep_lapic) not found. Probe "kvm" x86-specific is disabled. Use full kernel source tree to enable it.)
+      endif # $(kvm_dep_lapic_check)
+    else
+      $(warning CONFIG_KALLSYMS_ALL is disabled. Probe "kvm" x86-specific is disabled. Rebuild your kernel with this configuration option enabled in order to trace this subsystem.)
+    endif # CONFIG_KALLSYMS_ALL
   endif # CONFIG_X86
 endif # CONFIG_KVM
 
@@ -80,6 +97,13 @@ endif # CONFIG_X86
 
 obj-$(CONFIG_LTTNG) += lttng-probe-signal.o
 
+ifneq ($(CONFIG_DMA_SHARED_BUFFER),)
+  obj-$(CONFIG_LTTNG) += $(shell \
+    if [ $(VERSION) -ge 5 \
+       -o \( $(VERSION) -eq 4 -a $(PATCHLEVEL) -ge 10 \) ] ; then \
+      echo "lttng-probe-dma-fence.o" ; fi;)
+endif # CONFIG_DMA_SHARED_BUFFER
+
 ifneq ($(CONFIG_BLOCK),)
   # need blk_cmd_buf_len
   ifneq ($(CONFIG_EVENT_TRACING),)
@@ -91,45 +115,16 @@ ifneq ($(CONFIG_NET),)
   obj-$(CONFIG_LTTNG) += lttng-probe-napi.o
   obj-$(CONFIG_LTTNG) += lttng-probe-skb.o
   obj-$(CONFIG_LTTNG) += lttng-probe-net.o
-  obj-$(CONFIG_LTTNG) +=  $(shell \
-    if [ $(VERSION) -ge 4 \
-      -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 1 \) ] ; then \
-      echo "lttng-probe-sock.o" ; fi;)
-  obj-$(CONFIG_LTTNG) +=  $(shell \
-    if [ $(VERSION) -ge 4 \
-      -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 1 \) ] ; then \
-      echo "lttng-probe-udp.o" ; fi;)
+  obj-$(CONFIG_LTTNG) += lttng-probe-sock.o
+  obj-$(CONFIG_LTTNG) += lttng-probe-udp.o
 endif # CONFIG_NET
 
 ifneq ($(CONFIG_SND_SOC),)
   obj-$(CONFIG_LTTNG) += lttng-probe-asoc.o
 endif # CONFIG_SND_SOC
 
-ifneq ($(CONFIG_EXT3_FS),)
-  ext3_dep = $(srctree)/fs/ext3/*.h
-  ext3_dep_check = $(wildcard $(ext3_dep))
-  ext3 = $(shell \
-    if [ $(VERSION) -lt 4 -o \( $(VERSION) -eq 4 -a $(PATCHLEVEL) -lt 3 \) ] ; then \
-      if [ $(VERSION) -ge 4 -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 1 \) ] ; then \
-        if [ \( $(VERSION) -ge 4 -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 4 \) \) -a \
-          -z "$(ext3_dep_check)" ] ; then \
-          echo "warn" ; \
-          exit ; \
-        fi; \
-        echo "lttng-probe-ext3.o" ; \
-      fi; \
-    fi;)
-  ifeq ($(ext3),warn)
-    $(warning Files $(ext3_dep) not found. Probe "ext3" is disabled. Use full kernel source tree to enable it.)
-    ext3 =
-  endif # $(ext3),warn
-  obj-$(CONFIG_LTTNG) += $(ext3)
-endif # CONFIG_EXT3_FS
-
 ifneq ($(CONFIG_GPIOLIB),)
-  obj-$(CONFIG_LTTNG) +=  $(shell \
-    if [ $(VERSION) -ge 3 ] ; then \
-      echo "lttng-probe-gpio.o" ; fi;)
+  obj-$(CONFIG_LTTNG) += lttng-probe-gpio.o
 endif # CONFIG_GPIOLIB
 
 ifneq ($(CONFIG_JBD2),)
@@ -137,10 +132,7 @@ ifneq ($(CONFIG_JBD2),)
 endif # CONFIG_JBD2
 
 ifneq ($(CONFIG_JBD),)
-  obj-$(CONFIG_LTTNG) +=  $(shell \
-    if [ $(VERSION) -ge 4 \
-      -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 1 \) ] ; then \
-      echo "lttng-probe-jbd.o" ; fi;)
+  obj-$(CONFIG_LTTNG) += lttng-probe-jbd.o
 endif # CONFIG_JBD
 
 ifneq ($(CONFIG_REGULATOR),)
@@ -167,22 +159,24 @@ ifneq ($(CONFIG_BTRFS_FS),)
   endif # $(wildcard $(btrfs_dep))
 endif # CONFIG_BTRFS_FS
 
-# A dependency on internal header 'mm/internal.h' was introduced in v5.18
-compaction_dep = $(srctree)/mm/internal.h
-compaction_dep_wildcard = $(wildcard $(compaction_dep))
-compaction_dep_check = $(shell \
-if [ \( $(VERSION) -ge 6 \
-   -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) -a \
-   -z "$(compaction_dep_wildcard)" ] ; then \
-  echo "warn" ; \
-else \
-  echo "ok" ; \
-fi ;)
-ifeq ($(compaction_dep_check),ok)
-  obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o
-else
-  $(warning Files $(compaction_dep) not found. Probe "compaction" is disabled. Use full kernel source tree to enable it.)
-endif # $(wildcard $(compaction_dep))
+ifneq ($(CONFIG_COMPACTION),)
+  # A dependency on internal header 'mm/internal.h' was introduced in v5.18
+  compaction_dep = $(srctree)/mm/internal.h
+  compaction_dep_wildcard = $(wildcard $(compaction_dep))
+  compaction_dep_check = $(shell \
+  if [ \( $(VERSION) -ge 6 \
+     -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) -a \
+     -z "$(compaction_dep_wildcard)" ] ; then \
+    echo "warn" ; \
+  else \
+    echo "ok" ; \
+  fi ;)
+  ifeq ($(compaction_dep_check),ok)
+    obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o
+  else
+    $(warning Files $(compaction_dep) not found. Probe "compaction" is disabled. Use full kernel source tree to enable it.)
+  endif # $(wildcard $(compaction_dep))
+endif # CONFIG_COMPACTION
 
 ifneq ($(CONFIG_EXT4_FS),)
   ext4_dep = $(srctree)/fs/ext4/*.h
@@ -193,59 +187,39 @@ ifneq ($(CONFIG_EXT4_FS),)
   endif # $(wildcard $(ext4_dep))
 endif # CONFIG_EXT4_FS
 
-obj-$(CONFIG_LTTNG) +=  $(shell \
-  if [ $(VERSION) -ge 4 \
-    -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 4 \) ] ; then \
-    echo "lttng-probe-printk.o" ; fi;)
+obj-$(CONFIG_LTTNG) += lttng-probe-printk.o
 
 ifneq ($(CONFIG_FRAME_WARN),0)
   CFLAGS_lttng-probe-printk.o += -Wframe-larger-than=2200
 endif
 
 # Introduced in v3.6, remove in v5.18
-obj-$(CONFIG_LTTNG) +=  $(shell \
-    if [ \( ! \( $(VERSION) -ge 6 -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) \) \
-      -a \
-      $(VERSION) -ge 4 \
-      -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 6 \) \
-      -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 5 -a $(SUBLEVEL) -ge 2 \) \
-      -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 4 -a $(SUBLEVEL) -ge 9 \) \
-      -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 0 -a $(SUBLEVEL) -ge 41 \) ] ; then \
-      echo "lttng-probe-random.o" ; fi;)
-
-obj-$(CONFIG_LTTNG) +=  $(shell \
-  if [ $(VERSION) -ge 4 \
-    -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 2 \) ] ; then \
-    echo "lttng-probe-rcu.o" ; fi;)
+random_dep = $(srctree)/include/trace/events/random.h
+ifneq ($(wildcard $(random_dep)),)
+  obj-$(CONFIG_LTTNG) += lttng-probe-random.o
+endif
+
+obj-$(CONFIG_LTTNG) += lttng-probe-rcu.o
 
 ifneq ($(CONFIG_REGMAP),)
-  regmap_dep_4_1 = $(srctree)/drivers/base/regmap/trace.h
-  ifneq ($(wildcard $(regmap_dep_4_1)),)
+  regmap_dep = $(srctree)/drivers/base/regmap/trace.h
+  ifneq ($(wildcard $(regmap_dep)),)
     obj-$(CONFIG_LTTNG) += lttng-probe-regmap.o
   else
-    $(warning File $(regmap_dep_4_1) not found. Probe "regmap" is disabled. Need Linux 4.1+ kernel source tree to enable it.)
-  endif # $(wildcard $(regmap_dep_4_1)),
+    $(warning File $(regmap_dep) not found. Probe "regmap" is disabled. Use full kernel source tree to enable it.)
+  endif # $(wildcard $(regmap_dep)),
 endif # CONFIG_REGMAP
 
 ifneq ($(CONFIG_PM_RUNTIME),)
-  obj-$(CONFIG_LTTNG) +=  $(shell \
-    if [ $(VERSION) -ge 4 \
-      -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 2 \) ] ; then \
-      echo "lttng-probe-rpm.o" ; fi;)
+  obj-$(CONFIG_LTTNG) += lttng-probe-rpm.o
 endif # CONFIG_PM_RUNTIME
 
 ifneq ($(CONFIG_SUNRPC),)
-  obj-$(CONFIG_LTTNG) +=  $(shell \
-    if [ $(VERSION) -ge 4 \
-      -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 4 \) ] ; then \
-      echo "lttng-probe-sunrpc.o" ; fi;)
+  obj-$(CONFIG_LTTNG) += lttng-probe-sunrpc.o
 endif # CONFIG_SUNRPC
 
 ifneq ($(CONFIG_VIDEO_V4L2),)
-  obj-$(CONFIG_LTTNG) += $(shell \
-    if [ $(VERSION) -ge 4 \
-      -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 14 \) ] ; then \
-      echo "lttng-probe-v4l2.o" ; fi;)
+  obj-$(CONFIG_LTTNG) += lttng-probe-v4l2.o
 endif # CONFIG_VIDEO_V4L2
 
 obj-$(CONFIG_LTTNG) += lttng-probe-workqueue.o