Patchwork [daisy,05/10] lttng-modules-2.3.3: Fix build on ARM

login
register
mail settings
Submitter Martin Jansa
Date May 12, 2014, 11:34 a.m.
Message ID <74c36af3ac7c4bfc0e4573a3b3106dabc4df1d31.1399894447.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/71937/
State Accepted
Commit 03ce8a7ba0566dc98c418ed78f4102e795f665d5
Headers show

Comments

Martin Jansa - May 12, 2014, 11:34 a.m.
From: Khem Raj <raj.khem@gmail.com>

Update the structure to work with immutable bio_vecs

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../lttng/lttng-modules/fixup_block_driver.patch   | 122 +++++++++++++++++++++
 meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb   |   4 +-
 2 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch
Martin Jansa - May 15, 2014, 12:10 p.m.
On Mon, May 12, 2014 at 01:34:54PM +0200, Martin Jansa wrote:
> From: Khem Raj <raj.khem@gmail.com>
> 
> Update the structure to work with immutable bio_vecs

Please don't merge this patch to daisy, there is different one already!

It's actually master which should be updated with patch from daisy:
http://lists.openembedded.org/pipermail/openembedded-core/2014-May/092591.html

> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../lttng/lttng-modules/fixup_block_driver.patch   | 122 +++++++++++++++++++++
>  meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb   |   4 +-
>  2 files changed, 125 insertions(+), 1 deletion(-)
>  create mode 100644 meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch
> 
> diff --git a/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch b/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch
> new file mode 100644
> index 0000000..3644a47
> --- /dev/null
> +++ b/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch
> @@ -0,0 +1,122 @@
> +Fix errors like
> +
> +block.h:344:24: error: 'struct bio' has no member named 'bi_sector'
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +Upstream-Status: Pending
> +
> +Index: git/instrumentation/events/lttng-module/block.h
> +===================================================================
> +--- git.orig/instrumentation/events/lttng-module/block.h	2014-05-02 22:20:01.814125429 -0700
> ++++ git/instrumentation/events/lttng-module/block.h	2014-05-02 22:28:48.927455709 -0700
> +@@ -341,9 +341,9 @@
> + 	TP_fast_assign(
> + 		tp_assign(dev, bio->bi_bdev ?
> + 					  bio->bi_bdev->bd_dev : 0)
> +-		tp_assign(sector, bio->bi_sector)
> +-		tp_assign(nr_sector, bio->bi_size >> 9)
> +-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
> ++		tp_assign(sector, bio->bi_iter.bi_sector)
> ++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
> ++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
> + 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
> + 	),
> + 
> +@@ -385,14 +385,14 @@
> + 
> + 	TP_fast_assign(
> + 		tp_assign(dev, bio->bi_bdev->bd_dev)
> +-		tp_assign(sector, bio->bi_sector)
> +-		tp_assign(nr_sector, bio->bi_size >> 9)
> ++		tp_assign(sector, bio->bi_iter.bi_sector)
> ++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
> + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
> + 		tp_assign(error, error)
> + #else
> + 		tp_assign(error, 0)
> + #endif
> +-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
> ++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
> + 	),
> + 
> + 	TP_printk("%d,%d %s %llu + %u [%d]",
> +@@ -419,9 +419,9 @@
> + 
> + 	TP_fast_assign(
> + 		tp_assign(dev, bio->bi_bdev->bd_dev)
> +-		tp_assign(sector, bio->bi_sector)
> +-		tp_assign(nr_sector, bio->bi_size >> 9)
> +-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
> ++		tp_assign(sector, bio->bi_iter.bi_sector)
> ++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
> ++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
> + 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
> + 	),
> + 
> +@@ -485,9 +485,9 @@
> + 
> + 	TP_fast_assign(
> + 		tp_assign(dev, bio->bi_bdev->bd_dev)
> +-		tp_assign(sector, bio->bi_sector)
> +-		tp_assign(nr_sector, bio->bi_size >> 9)
> +-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
> ++		tp_assign(sector, bio->bi_iter.bi_sector)
> ++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
> ++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
> + 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
> + 	),
> + 
> +@@ -513,9 +513,9 @@
> + 
> + 	TP_fast_assign(
> + 		tp_assign(dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0)
> +-		tp_assign(sector, bio->bi_sector)
> +-		tp_assign(nr_sector, bio->bi_size >> 9)
> +-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
> ++		tp_assign(sector, bio->bi_iter.bi_sector)
> ++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
> ++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
> + 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
> + 	),
> + 
> +@@ -587,10 +587,10 @@
> + 
> + 	TP_fast_assign(
> + 		tp_assign(dev, bio ? bio->bi_bdev->bd_dev : 0)
> +-		tp_assign(sector, bio ? bio->bi_sector : 0)
> +-		tp_assign(nr_sector, bio ? bio->bi_size >> 9 : 0)
> ++		tp_assign(sector, bio ? bio->bi_iter.bi_sector : 0)
> ++		tp_assign(nr_sector, bio ? bio->bi_iter.bi_size >> 9 : 0)
> + 		blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0,
> +-			      bio ? bio->bi_size >> 9 : 0)
> ++			      bio ? bio->bi_iter.bi_size >> 9 : 0)
> + 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
> +         ),
> + 
> +@@ -759,9 +759,9 @@
> + 
> + 	TP_fast_assign(
> + 		tp_assign(dev, bio->bi_bdev->bd_dev)
> +-		tp_assign(sector, bio->bi_sector)
> ++		tp_assign(sector, bio->bi_iter.bi_sector)
> + 		tp_assign(new_sector, new_sector)
> +-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
> ++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
> + 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
> + 	),
> + 
> +@@ -805,11 +805,11 @@
> + 
> + 	TP_fast_assign(
> + 		tp_assign(dev, bio->bi_bdev->bd_dev)
> +-		tp_assign(sector, bio->bi_sector)
> +-		tp_assign(nr_sector, bio->bi_size >> 9)
> ++		tp_assign(sector, bio->bi_iter.bi_sector)
> ++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
> + 		tp_assign(old_dev, dev)
> + 		tp_assign(old_sector, from)
> +-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
> ++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
> + 	),
> + 
> + 	TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu",
> diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb
> index dd06546..94e18b2 100644
> --- a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb
> +++ b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb
> @@ -14,7 +14,9 @@ SRCREV = "eef112db0e63feff6cbf0a98cda9af607cefb377"
>  PV = "2.3.3"
>  
>  SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.3 \
> -           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch"
> +           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
> +           file://fixup_block_driver.patch \
> +          "
>  
>  export INSTALL_MOD_DIR="kernel/lttng-modules"
>  export KERNEL_SRC="${STAGING_KERNEL_DIR}"
> -- 
> 1.9.2
>

Patch

diff --git a/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch b/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch
new file mode 100644
index 0000000..3644a47
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch
@@ -0,0 +1,122 @@ 
+Fix errors like
+
+block.h:344:24: error: 'struct bio' has no member named 'bi_sector'
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
+Index: git/instrumentation/events/lttng-module/block.h
+===================================================================
+--- git.orig/instrumentation/events/lttng-module/block.h	2014-05-02 22:20:01.814125429 -0700
++++ git/instrumentation/events/lttng-module/block.h	2014-05-02 22:28:48.927455709 -0700
+@@ -341,9 +341,9 @@
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev ?
+ 					  bio->bi_bdev->bd_dev : 0)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -385,14 +385,14 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
+ 		tp_assign(error, error)
+ #else
+ 		tp_assign(error, 0)
+ #endif
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 	),
+ 
+ 	TP_printk("%d,%d %s %llu + %u [%d]",
+@@ -419,9 +419,9 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -485,9 +485,9 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -513,9 +513,9 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -587,10 +587,10 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio ? bio->bi_bdev->bd_dev : 0)
+-		tp_assign(sector, bio ? bio->bi_sector : 0)
+-		tp_assign(nr_sector, bio ? bio->bi_size >> 9 : 0)
++		tp_assign(sector, bio ? bio->bi_iter.bi_sector : 0)
++		tp_assign(nr_sector, bio ? bio->bi_iter.bi_size >> 9 : 0)
+ 		blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0,
+-			      bio ? bio->bi_size >> 9 : 0)
++			      bio ? bio->bi_iter.bi_size >> 9 : 0)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+         ),
+ 
+@@ -759,9 +759,9 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
++		tp_assign(sector, bio->bi_iter.bi_sector)
+ 		tp_assign(new_sector, new_sector)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 		tp_memcpy(comm, current->comm, TASK_COMM_LEN)
+ 	),
+ 
+@@ -805,11 +805,11 @@
+ 
+ 	TP_fast_assign(
+ 		tp_assign(dev, bio->bi_bdev->bd_dev)
+-		tp_assign(sector, bio->bi_sector)
+-		tp_assign(nr_sector, bio->bi_size >> 9)
++		tp_assign(sector, bio->bi_iter.bi_sector)
++		tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
+ 		tp_assign(old_dev, dev)
+ 		tp_assign(old_sector, from)
+-		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
++		blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
+ 	),
+ 
+ 	TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu",
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb
index dd06546..94e18b2 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb
@@ -14,7 +14,9 @@  SRCREV = "eef112db0e63feff6cbf0a98cda9af607cefb377"
 PV = "2.3.3"
 
 SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.3 \
-           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch"
+           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
+           file://fixup_block_driver.patch \
+          "
 
 export INSTALL_MOD_DIR="kernel/lttng-modules"
 export KERNEL_SRC="${STAGING_KERNEL_DIR}"