This commit is contained in:
Alexei Sorokin
committed by
Git OBS Bridge
Git OBS Bridge
parent
bbfe4607d2
commit
c620fce8dc
191
lttng-modules-2.13.4-linux-5.19.patch
Normal file
191
lttng-modules-2.13.4-linux-5.19.patch
Normal file
@@ -0,0 +1,191 @@
|
||||
--- a/include/instrumentation/events/ext4.h
|
||||
+++ b/include/instrumentation/events/ext4.h
|
||||
@@ -122,6 +122,35 @@ LTTNG_TRACEPOINT_EVENT(ext4_begin_ordere
|
||||
)
|
||||
)
|
||||
|
||||
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0))
|
||||
+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_begin,
|
||||
+
|
||||
+ TP_PROTO(struct inode *inode, loff_t pos, unsigned int len),
|
||||
+
|
||||
+ TP_ARGS(inode, pos, len),
|
||||
+
|
||||
+ TP_FIELDS(
|
||||
+ ctf_integer(dev_t, dev, inode->i_sb->s_dev)
|
||||
+ ctf_integer(ino_t, ino, inode->i_ino)
|
||||
+ ctf_integer(loff_t, pos, pos)
|
||||
+ ctf_integer(unsigned int, len, len)
|
||||
+ )
|
||||
+)
|
||||
+
|
||||
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_write_begin,
|
||||
+
|
||||
+ TP_PROTO(struct inode *inode, loff_t pos, unsigned int len),
|
||||
+
|
||||
+ TP_ARGS(inode, pos, len)
|
||||
+)
|
||||
+
|
||||
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_da_write_begin,
|
||||
+
|
||||
+ TP_PROTO(struct inode *inode, loff_t pos, unsigned int len),
|
||||
+
|
||||
+ TP_ARGS(inode, pos, len)
|
||||
+)
|
||||
+#else
|
||||
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_begin,
|
||||
|
||||
TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
|
||||
@@ -153,6 +182,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__wr
|
||||
|
||||
TP_ARGS(inode, pos, len, flags)
|
||||
)
|
||||
+#endif
|
||||
|
||||
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_end,
|
||||
TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
|
||||
--- a/include/instrumentation/events/kmem.h
|
||||
+++ b/include/instrumentation/events/kmem.h
|
||||
@@ -218,6 +218,50 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc
|
||||
)
|
||||
)
|
||||
|
||||
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0))
|
||||
+LTTNG_TRACEPOINT_EVENT_CLASS(kmem_mm_page,
|
||||
+
|
||||
+ TP_PROTO(struct page *page, unsigned int order, int migratetype,
|
||||
+ int percpu_refill),
|
||||
+
|
||||
+ TP_ARGS(page, order, migratetype, percpu_refill),
|
||||
+
|
||||
+ TP_FIELDS(
|
||||
+ ctf_integer_hex(struct page *, page, page)
|
||||
+ ctf_integer(unsigned long, pfn,
|
||||
+ page ? page_to_pfn(page) : -1UL)
|
||||
+ ctf_integer(unsigned int, order, order)
|
||||
+ ctf_integer(int, migratetype, migratetype)
|
||||
+ ctf_integer(int, percpu_refill, percpu_refill)
|
||||
+ )
|
||||
+)
|
||||
+
|
||||
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_alloc_zone_locked,
|
||||
+
|
||||
+ kmem_mm_page_alloc_zone_locked,
|
||||
+
|
||||
+ TP_PROTO(struct page *page, unsigned int order, int migratetype,
|
||||
+ int percpu_refill),
|
||||
+
|
||||
+ TP_ARGS(page, order, migratetype, percpu_refill)
|
||||
+)
|
||||
+
|
||||
+LTTNG_TRACEPOINT_EVENT_MAP(mm_page_pcpu_drain,
|
||||
+
|
||||
+ kmem_mm_page_pcpu_drain,
|
||||
+
|
||||
+ TP_PROTO(struct page *page, unsigned int order, int migratetype),
|
||||
+
|
||||
+ TP_ARGS(page, order, migratetype),
|
||||
+
|
||||
+ TP_FIELDS(
|
||||
+ ctf_integer(unsigned long, pfn,
|
||||
+ page ? page_to_pfn(page) : -1UL)
|
||||
+ ctf_integer(unsigned int, order, order)
|
||||
+ ctf_integer(int, migratetype, migratetype)
|
||||
+ )
|
||||
+)
|
||||
+#else
|
||||
LTTNG_TRACEPOINT_EVENT_CLASS(kmem_mm_page,
|
||||
|
||||
TP_PROTO(struct page *page, unsigned int order, int migratetype),
|
||||
@@ -250,6 +294,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem
|
||||
|
||||
TP_ARGS(page, order, migratetype)
|
||||
)
|
||||
+#endif
|
||||
|
||||
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,19,2) \
|
||||
|| LTTNG_KERNEL_RANGE(3,14,36, 3,15,0) \
|
||||
--- a/include/instrumentation/events/workqueue.h
|
||||
+++ b/include/instrumentation/events/workqueue.h
|
||||
@@ -28,10 +28,35 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_w
|
||||
)
|
||||
)
|
||||
|
||||
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0))
|
||||
/**
|
||||
* workqueue_queue_work - called when a work gets queued
|
||||
* @req_cpu: the requested cpu
|
||||
- * @cwq: pointer to struct cpu_workqueue_struct
|
||||
+ * @pwq: pointer to struct pool_workqueue
|
||||
+ * @work: pointer to struct work_struct
|
||||
+ *
|
||||
+ * This event occurs when a work is queued immediately or once a
|
||||
+ * delayed work is actually queued on a workqueue (ie: once the delay
|
||||
+ * has been reached).
|
||||
+ */
|
||||
+LTTNG_TRACEPOINT_EVENT(workqueue_queue_work,
|
||||
+
|
||||
+ TP_PROTO(int req_cpu, struct pool_workqueue *pwq,
|
||||
+ struct work_struct *work),
|
||||
+
|
||||
+ TP_ARGS(req_cpu, pwq, work),
|
||||
+
|
||||
+ TP_FIELDS(
|
||||
+ ctf_integer_hex(void *, work, work)
|
||||
+ ctf_integer_hex(void *, function, work->func)
|
||||
+ ctf_integer(int, req_cpu, req_cpu)
|
||||
+ )
|
||||
+)
|
||||
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0))
|
||||
+/**
|
||||
+ * workqueue_queue_work - called when a work gets queued
|
||||
+ * @req_cpu: the requested cpu
|
||||
+ * @pwq: pointer to struct pool_workqueue
|
||||
* @work: pointer to struct work_struct
|
||||
*
|
||||
* This event occurs when a work is queued immediately or once a
|
||||
@@ -40,17 +65,34 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_w
|
||||
*/
|
||||
LTTNG_TRACEPOINT_EVENT(workqueue_queue_work,
|
||||
|
||||
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0))
|
||||
TP_PROTO(unsigned int req_cpu, struct pool_workqueue *pwq,
|
||||
struct work_struct *work),
|
||||
|
||||
TP_ARGS(req_cpu, pwq, work),
|
||||
+
|
||||
+ TP_FIELDS(
|
||||
+ ctf_integer_hex(void *, work, work)
|
||||
+ ctf_integer_hex(void *, function, work->func)
|
||||
+ ctf_integer(unsigned int, req_cpu, req_cpu)
|
||||
+ )
|
||||
+)
|
||||
#else
|
||||
+/**
|
||||
+ * workqueue_queue_work - called when a work gets queued
|
||||
+ * @req_cpu: the requested cpu
|
||||
+ * @cwq: pointer to struct cpu_workqueue_struct
|
||||
+ * @work: pointer to struct work_struct
|
||||
+ *
|
||||
+ * This event occurs when a work is queued immediately or once a
|
||||
+ * delayed work is actually queued on a workqueue (ie: once the delay
|
||||
+ * has been reached).
|
||||
+ */
|
||||
+LTTNG_TRACEPOINT_EVENT(workqueue_queue_work,
|
||||
+
|
||||
TP_PROTO(unsigned int req_cpu, struct cpu_workqueue_struct *cwq,
|
||||
struct work_struct *work),
|
||||
|
||||
TP_ARGS(req_cpu, cwq, work),
|
||||
-#endif
|
||||
|
||||
TP_FIELDS(
|
||||
ctf_integer_hex(void *, work, work)
|
||||
@@ -58,6 +100,7 @@ LTTNG_TRACEPOINT_EVENT(workqueue_queue_w
|
||||
ctf_integer(unsigned int, req_cpu, req_cpu)
|
||||
)
|
||||
)
|
||||
+#endif
|
||||
|
||||
/**
|
||||
* workqueue_activate_work - called when a work gets activated
|
||||
@@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 19 12:42:33 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>
|
||||
|
||||
- Add lttng-modules-2.13.4-linux-5.19.patch: back-port commits
|
||||
6229bbaa423832f6b7c7a658ad11e1d4242752ff,
|
||||
5e2f832d59d51589ab69479c7db43c7581fb9346,
|
||||
c6da9604b1666780ea4725b3b3d1bfa1548f9c89
|
||||
for Linux 5.19 compatibility.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 3 20:12:25 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>
|
||||
|
||||
|
||||
@@ -28,6 +28,8 @@ Source1: https://lttng.org/files/lttng-modules/%{name}-%{version}.tar.bz2
|
||||
Source2: %{name}.keyring
|
||||
Source3: %{name}-preamble
|
||||
Source4: Module.supported
|
||||
# PATCH-FIX-UPSTREAM lttng-modules-2.13.4-linux-5.19.patch -- Linux 5.19 compatibility.
|
||||
Patch0: lttng-modules-2.13.4-linux-5.19.patch
|
||||
BuildRequires: %{kernel_module_package_buildreqs}
|
||||
ExclusiveArch: %ix86 x86_64 armv7l aarch64 riscv64 ppc64 ppc64le
|
||||
|
||||
@@ -37,7 +39,7 @@ This package provides licensing documentation for the lttng kmp packages.
|
||||
%kernel_module_package -p %{name}-preamble -x ec2 xen xenpae vmi um
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%autosetup -p1
|
||||
|
||||
set -- *
|
||||
mkdir source obj
|
||||
|
||||
Reference in New Issue
Block a user