Re: [oe-commits] Khem Raj : lttng-modules_2.3.3.bb: Fix build on ARM/gcc-4.9

Openembedded Core Discussions
 help / color / mirror / Atom feed

* Re: [oe-commits] Khem Raj : lttng-modules_2.3.3.bb: Fix build on ARM/gcc-4.9
       [not found] <20140504111629.5E32A504E8@opal.openembedded.org>
@ 2014-05-04 14:50 ` Martin Jansa
  2014-05-04 23:53   ` Khem Raj
  0 siblings, 1 reply; 4+ messages in thread
From: Martin Jansa @ 2014-05-04 14:50 UTC (permalink / raw)
  To: Khem Raj, openembedded-core; +Cc: openembedded-commits

[-- Attachment #1: Type: text/plain, Size: 6772 bytes --]

On Sun, May 04, 2014 at 11:16:29AM +0000, git@git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master-next
> Commit: 09d3d8f97d6c60707b8dfb3fa5b04fa2efe6f6f6
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=09d3d8f97d6c60707b8dfb3fa5b04fa2efe6f6f6
> 
> Author: Khem Raj <raj.khem@gmail.com>
> Date:   Fri May  2 22:32:58 2014 -0700
> 
> lttng-modules_2.3.3.bb: Fix build on ARM/gcc-4.9
> 
> Update the structure to work with immutable bio_vecs

Is this really 4.9 specific? It's failing with the same error message in
every qemuarm world build (even with daisy).

> 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(-)
> 
> 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}"
> 
> -- 
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [oe-commits] Khem Raj : lttng-modules_2.3.3.bb: Fix build on ARM/gcc-4.9
  2014-05-04 14:50 ` [oe-commits] Khem Raj : lttng-modules_2.3.3.bb: Fix build on ARM/gcc-4.9 Martin Jansa
@ 2014-05-04 23:53   ` Khem Raj
  2014-05-05  1:04     ` Martin Jansa
  0 siblings, 1 reply; 4+ messages in thread
From: Khem Raj @ 2014-05-04 23:53 UTC (permalink / raw)
  To: Martin Jansa
  Cc: openembedded-commits@lists.openembedded.org,
	Patches and discussions about the oe-core layer

On Sun, May 4, 2014 at 7:50 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> Update the structure to work with immutable bio_vecs
>
> Is this really 4.9 specific? It's failing with the same error message in
> every qemuarm world build (even with daisy).

its not specific to gcc 4.9, however thats where I discovered it. The
fix although is generic and should work
in any compiler.


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [oe-commits] Khem Raj : lttng-modules_2.3.3.bb: Fix build on ARM/gcc-4.9
  2014-05-04 23:53   ` Khem Raj
@ 2014-05-05  1:04     ` Martin Jansa
  2014-05-05  1:04       ` Khem Raj
  0 siblings, 1 reply; 4+ messages in thread
From: Martin Jansa @ 2014-05-05  1:04 UTC (permalink / raw)
  To: Khem Raj
  Cc: openembedded-commits@lists.openembedded.org,
	Patches and discussions about the oe-core layer

[-- Attachment #1: Type: text/plain, Size: 660 bytes --]

On Sun, May 04, 2014 at 04:53:14PM -0700, Khem Raj wrote:
> On Sun, May 4, 2014 at 7:50 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> >> Update the structure to work with immutable bio_vecs
> >
> > Is this really 4.9 specific? It's failing with the same error message in
> > every qemuarm world build (even with daisy).
> 
> its not specific to gcc 4.9, however thats where I discovered it. The
> fix although is generic and should work
> in any compiler.

I'm already testing it with daisy build to fix one world build issue, if
that works, can we drop 4.9 from commit message?

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [oe-commits] Khem Raj : lttng-modules_2.3.3.bb: Fix build on ARM/gcc-4.9
  2014-05-05  1:04     ` Martin Jansa
@ 2014-05-05  1:04       ` Khem Raj
  0 siblings, 0 replies; 4+ messages in thread
From: Khem Raj @ 2014-05-05  1:04 UTC (permalink / raw)
  To: Martin Jansa
  Cc: openembedded-commits@lists.openembedded.org,
	Patches and discussions about the oe-core layer

On Sun, May 4, 2014 at 6:04 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> I'm already testing it with daisy build to fix one world build issue, if
> that works, can we drop 4.9 from commit message?

OK, will do it in next rebase


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-05-05  1:05 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20140504111629.5E32A504E8@opal.openembedded.org>
2014-05-04 14:50 ` [oe-commits] Khem Raj : lttng-modules_2.3.3.bb: Fix build on ARM/gcc-4.9 Martin Jansa
2014-05-04 23:53   ` Khem Raj
2014-05-05  1:04     ` Martin Jansa
2014-05-05  1:04       ` Khem Raj

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox