* linux-next: drbd tree build failure
@ 2009-07-27 5:48 Stephen Rothwell
2009-07-27 8:09 ` Lars Ellenberg
0 siblings, 1 reply; 26+ messages in thread
From: Stephen Rothwell @ 2009-07-27 5:48 UTC (permalink / raw)
To: Philipp Reisner; +Cc: linux-next, linux-kernel, Rusty Russell, Lars Ellenberg
[-- Attachment #1: Type: text/plain, Size: 766 bytes --]
Hi Philipp,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/block/drbd/drbd_main.c: In function 'drbd_thread_current_set_cpu':
drivers/block/drbd/drbd_main.c:1592: error: implicit declaration of function 'set_cpus_allowed'
Introduced by commit 8a4ebc3fbd90072ac870064a930fe612eea6d9a1 ("DRBD:
main") from the drbd interacting with commit
84cf7f02712e3491fb9776f950a8c4f413204c8b
("cpumask:remove-set_cpus_allowed") from the rr tree.
I am not sure what the transformation to the new infrastructure is here -
maybe Rusty can help?
For today, I have reverted the rr tree commit above but we need a better
solution.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: linux-next: drbd tree build failure
2009-07-27 5:48 linux-next: drbd tree build failure Stephen Rothwell
@ 2009-07-27 8:09 ` Lars Ellenberg
2009-07-27 17:17 ` Philipp Reisner
0 siblings, 1 reply; 26+ messages in thread
From: Lars Ellenberg @ 2009-07-27 8:09 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Philipp Reisner, linux-next, linux-kernel, Rusty Russell
On Mon, Jul 27, 2009 at 03:48:16PM +1000, Stephen Rothwell wrote:
> Hi Philipp,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> drivers/block/drbd/drbd_main.c: In function 'drbd_thread_current_set_cpu':
> drivers/block/drbd/drbd_main.c:1592: error: implicit declaration of function 'set_cpus_allowed'
>
> Introduced by commit 8a4ebc3fbd90072ac870064a930fe612eea6d9a1 ("DRBD:
> main") from the drbd interacting with commit
> 84cf7f02712e3491fb9776f950a8c4f413204c8b
> ("cpumask:remove-set_cpus_allowed") from the rr tree.
>
> I am not sure what the transformation to the new infrastructure is here -
> maybe Rusty can help?
>
> For today, I have reverted the rr tree commit above but we need a better
> solution.
I think we can easily use set_cpus_allowed_ptr() instead,
as in fact, we do not have the cpu mask on the stack.
But embeded in struct drbd_conf.
--
: Lars Ellenberg
: LINBIT | Your Way to High Availability
: DRBD/HA support and consulting http://www.linbit.com
DRBD® and LINBIT® are registered trademarks of LINBIT, Austria.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: linux-next: drbd tree build failure
2009-07-27 8:09 ` Lars Ellenberg
@ 2009-07-27 17:17 ` Philipp Reisner
2009-07-28 4:20 ` Stephen Rothwell
0 siblings, 1 reply; 26+ messages in thread
From: Philipp Reisner @ 2009-07-27 17:17 UTC (permalink / raw)
To: Lars Ellenberg; +Cc: Stephen Rothwell, linux-next, linux-kernel, Rusty Russell
On Monday 27 July 2009 10:09:57 Lars Ellenberg wrote:
> On Mon, Jul 27, 2009 at 03:48:16PM +1000, Stephen Rothwell wrote:
> > Hi Philipp,
> >
> > Today's linux-next build (x86_64 allmodconfig) failed like this:
> >
> > drivers/block/drbd/drbd_main.c: In function
> > 'drbd_thread_current_set_cpu': drivers/block/drbd/drbd_main.c:1592:
> > error: implicit declaration of function 'set_cpus_allowed'
> >
> > Introduced by commit 8a4ebc3fbd90072ac870064a930fe612eea6d9a1 ("DRBD:
> > main") from the drbd interacting with commit
> > 84cf7f02712e3491fb9776f950a8c4f413204c8b
> > ("cpumask:remove-set_cpus_allowed") from the rr tree.
> >
> > I am not sure what the transformation to the new infrastructure is here -
> > maybe Rusty can help?
> >
> > For today, I have reverted the rr tree commit above but we need a better
> > solution.
>
> I think we can easily use set_cpus_allowed_ptr() instead,
> as in fact, we do not have the cpu mask on the stack.
> But embeded in struct drbd_conf.
Ok. Lars' patch is now complete and arrived in the git tree...
It should build now with Rusty's paches.
-phil
--
: Dipl-Ing Philipp Reisner
: LINBIT | Your Way to High Availability
: Tel: +43-1-8178292-50, Fax: +43-1-8178292-82
: http://www.linbit.com
DRBD(R) and LINBIT(R) are registered trademarks of LINBIT, Austria.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: linux-next: drbd tree build failure
2009-07-27 17:17 ` Philipp Reisner
@ 2009-07-28 4:20 ` Stephen Rothwell
2009-07-29 1:40 ` Rusty Russell
0 siblings, 1 reply; 26+ messages in thread
From: Stephen Rothwell @ 2009-07-28 4:20 UTC (permalink / raw)
To: Philipp Reisner; +Cc: Lars Ellenberg, linux-next, linux-kernel, Rusty Russell
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
Hi Philipp, Lars,
On Mon, 27 Jul 2009 19:17:55 +0200 Philipp Reisner <philipp.reisner@linbit.com> wrote:
>
> Ok. Lars' patch is now complete and arrived in the git tree...
>
> It should build now with Rusty's paches.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: linux-next: drbd tree build failure
2009-07-28 4:20 ` Stephen Rothwell
@ 2009-07-29 1:40 ` Rusty Russell
2009-07-29 15:11 ` Philipp Reisner
0 siblings, 1 reply; 26+ messages in thread
From: Rusty Russell @ 2009-07-29 1:40 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Philipp Reisner, Lars Ellenberg, linux-next, linux-kernel
On Tue, 28 Jul 2009 01:50:40 pm Stephen Rothwell wrote:
> Hi Philipp, Lars,
>
> On Mon, 27 Jul 2009 19:17:55 +0200 Philipp Reisner <philipp.reisner@linbit.com> wrote:
> >
> > Ok. Lars' patch is now complete and arrived in the git tree...
> >
> > It should build now with Rusty's paches.
>
> Thanks.
>
This is untested, but fairly trivial transform to avoid cpumask_t in the struct
as well:
Subject: drdb: use cpumask_var_t in struct drdb_conf
Any code which can be compiled on x86 should try to avoid cpumask_t
(or even struct cpumask) declarations; we are heading towards struct
cpumask being undefined if CONFIG_CPUMASK_OFFSTACK.
The code is the same for CONFIG_CPUMASK_OFFSTACK=n.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 5813d7d..10fa153 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -1006,7 +1006,7 @@ struct drbd_conf {
spinlock_t peer_seq_lock;
unsigned int minor;
unsigned long comm_bm_set; /* communicated number of set bits. */
- cpumask_t cpu_mask;
+ cpumask_var_t cpu_mask;
struct bm_io_work bm_io_work;
u64 ed_uuid; /* UUID of the exposed data */
struct mutex state_mutex;
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 20f4d40..9c85a4b 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1550,18 +1550,18 @@ void drbd_calc_cpu_mask(struct drbd_conf *mdev)
int ord, cpu;
/* user override. */
- if (cpumask_weight(&mdev->cpu_mask))
+ if (cpumask_weight(mdev->cpu_mask))
return;
ord = mdev_to_minor(mdev) % cpumask_weight(cpu_online_mask);
for_each_online_cpu(cpu) {
if (ord-- == 0) {
- cpumask_set_cpu(cpu, &mdev->cpu_mask);
+ cpumask_set_cpu(cpu, mdev->cpu_mask);
return;
}
}
/* should not be reached */
- cpumask_setall(&mdev->cpu_mask);
+ cpumask_setall(mdev->cpu_mask);
}
/**
@@ -1584,7 +1584,7 @@ void drbd_thread_current_set_cpu(struct drbd_conf *mdev)
if (!thi->reset_cpu_mask)
return;
thi->reset_cpu_mask = 0;
- set_cpus_allowed_ptr(p, &mdev->cpu_mask);
+ set_cpus_allowed_ptr(p, mdev->cpu_mask);
}
#endif
@@ -3001,6 +3001,8 @@ struct drbd_conf *drbd_new_device(unsigned int minor)
mdev = kzalloc(sizeof(struct drbd_conf), GFP_KERNEL);
if (!mdev)
return NULL;
+ if (!zalloc_cpumask_var(&mdev->cpu_mask, GFP_KERNEL))
+ goto out_no_cpumask;
mdev->minor = minor;
@@ -3079,6 +3081,8 @@ out_no_io_page:
out_no_disk:
blk_cleanup_queue(q);
out_no_q:
+ free_cpumask_var(mdev->cpu_mask);
+out_no_cpumask:
kfree(mdev);
return NULL;
}
@@ -3095,6 +3099,7 @@ void drbd_free_mdev(struct drbd_conf *mdev)
__free_page(mdev->md_io_page);
put_disk(mdev->vdisk);
blk_cleanup_queue(mdev->rq_queue);
+ free_cpumask_var(mdev->cpu_mask);
kfree(mdev);
}
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 936ec73..ede19be 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1657,8 +1657,8 @@ static int drbd_nl_syncer_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *n
if (mdev->state.conn >= C_CONNECTED)
drbd_send_sync_param(mdev, &sc);
- if (!cpumask_equal(&mdev->cpu_mask, new_cpu_mask)) {
- cpumask_copy(&mdev->cpu_mask, new_cpu_mask);
+ if (!cpumask_equal(mdev->cpu_mask, new_cpu_mask)) {
+ cpumask_copy(mdev->cpu_mask, new_cpu_mask);
drbd_calc_cpu_mask(mdev);
mdev->receiver.reset_cpu_mask = 1;
mdev->asender.reset_cpu_mask = 1;
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: linux-next: drbd tree build failure
2009-07-29 1:40 ` Rusty Russell
@ 2009-07-29 15:11 ` Philipp Reisner
0 siblings, 0 replies; 26+ messages in thread
From: Philipp Reisner @ 2009-07-29 15:11 UTC (permalink / raw)
To: Rusty Russell; +Cc: Stephen Rothwell, Lars Ellenberg, linux-next, linux-kernel
On Wednesday 29 July 2009 03:40:55 Rusty Russell wrote:
> On Tue, 28 Jul 2009 01:50:40 pm Stephen Rothwell wrote:
> > Hi Philipp, Lars,
> >
> > On Mon, 27 Jul 2009 19:17:55 +0200 Philipp Reisner
<philipp.reisner@linbit.com> wrote:
> > > Ok. Lars' patch is now complete and arrived in the git tree...
> > >
> > > It should build now with Rusty's paches.
> >
> > Thanks.
>
> This is untested, but fairly trivial transform to avoid cpumask_t in the
> struct as well:
>
Thanks,
I have commited that patch to the DRBD git tree.
-phil
--
: Dipl-Ing Philipp Reisner
: LINBIT | Your Way to High Availability
: Tel: +43-1-8178292-50, Fax: +43-1-8178292-82
: http://www.linbit.com
DRBD(R) and LINBIT(R) are registered trademarks of LINBIT, Austria.
^ permalink raw reply [flat|nested] 26+ messages in thread
* linux-next: drbd tree build failure
@ 2009-07-27 7:37 Stephen Rothwell
2009-07-27 9:09 ` Philipp Reisner
0 siblings, 1 reply; 26+ messages in thread
From: Stephen Rothwell @ 2009-07-27 7:37 UTC (permalink / raw)
To: Philipp Reisner; +Cc: linux-next, linux-kernel
Hi Philipp,
Today's linux-next build (powerpc allyesconfig) failed like this:
drivers/block/drbd/drbd_trace.o: In function `.roles_to_name':
(.text+0x64): multiple definition of `.roles_to_name'
drivers/block/drbd/drbd.o:(.text+0x28eb8): first defined here
drivers/block/drbd/drbd_trace.o: In function `disks_to_name':
(.opd+0x30): multiple definition of `disks_to_name'
drivers/block/drbd/drbd.o:(.opd+0x1b78): first defined here
drivers/block/drbd/drbd_trace.o: In function `roles_to_name':
(.opd+0x18): multiple definition of `roles_to_name'
drivers/block/drbd/drbd.o:(.opd+0x1b60): first defined here
drivers/block/drbd/drbd_trace.o: In function `.conns_to_name':
(.text+0x0): multiple definition of `.conns_to_name'
drivers/block/drbd/drbd.o:(.text+0x28e54): first defined here
drivers/block/drbd/drbd_trace.o: In function `set_st_err_name':
(.opd+0x48): multiple definition of `set_st_err_name'
drivers/block/drbd/drbd.o:(.opd+0x1b90): first defined here
drivers/block/drbd/drbd_trace.o: In function `.disks_to_name':
(.text+0xcc): multiple definition of `.disks_to_name'
drivers/block/drbd/drbd.o:(.text+0x28f20): first defined here
drivers/block/drbd/drbd_trace.o: In function `conns_to_name':
(.opd+0x0): multiple definition of `conns_to_name'
drivers/block/drbd/drbd.o:(.opd+0x1b48): first defined here
drivers/block/drbd/drbd_trace.o: In function `.set_st_err_name':
(.text+0x134): multiple definition of `.set_st_err_name'
drivers/block/drbd/drbd.o:(.text+0x28f88): first defined here
I applied the following patch to mark DRBD_TRACE broken for now.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 27 Jul 2009 17:27:39 +1000
Subject: [PATCH] drbd: tracing is broken
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/block/drbd/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/block/drbd/Kconfig b/drivers/block/drbd/Kconfig
index 8b14ea2..b047662 100644
--- a/drivers/block/drbd/Kconfig
+++ b/drivers/block/drbd/Kconfig
@@ -41,6 +41,7 @@ config BLK_DEV_DRBD
config DRBD_TRACE
tristate "DRBD tracing"
depends on BLK_DEV_DRBD
+ depends on BROKEN
select TRACEPOINTS
default m
help
--
1.6.3.3
^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: linux-next: drbd tree build failure
2009-07-27 7:37 Stephen Rothwell
@ 2009-07-27 9:09 ` Philipp Reisner
2009-07-27 11:38 ` Alexander Beregalov
2009-07-28 4:20 ` Stephen Rothwell
0 siblings, 2 replies; 26+ messages in thread
From: Philipp Reisner @ 2009-07-27 9:09 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
On Monday 27 July 2009 09:37:54 Stephen Rothwell wrote:
> Hi Philipp,
>
> Today's linux-next build (powerpc allyesconfig) failed like this:
>
> drivers/block/drbd/drbd_trace.o: In function `.roles_to_name':
> (.text+0x64): multiple definition of `.roles_to_name'
> drivers/block/drbd/drbd.o:(.text+0x28eb8): first defined here
> drivers/block/drbd/drbd_trace.o: In function `disks_to_name':
> (.opd+0x30): multiple definition of `disks_to_name'
> drivers/block/drbd/drbd.o:(.opd+0x1b78): first defined here
> drivers/block/drbd/drbd_trace.o: In function `roles_to_name':
> (.opd+0x18): multiple definition of `roles_to_name'
> drivers/block/drbd/drbd.o:(.opd+0x1b60): first defined here
> drivers/block/drbd/drbd_trace.o: In function `.conns_to_name':
> (.text+0x0): multiple definition of `.conns_to_name'
> drivers/block/drbd/drbd.o:(.text+0x28e54): first defined here
> drivers/block/drbd/drbd_trace.o: In function `set_st_err_name':
> (.opd+0x48): multiple definition of `set_st_err_name'
> drivers/block/drbd/drbd.o:(.opd+0x1b90): first defined here
> drivers/block/drbd/drbd_trace.o: In function `.disks_to_name':
> (.text+0xcc): multiple definition of `.disks_to_name'
> drivers/block/drbd/drbd.o:(.text+0x28f20): first defined here
> drivers/block/drbd/drbd_trace.o: In function `conns_to_name':
> (.opd+0x0): multiple definition of `conns_to_name'
> drivers/block/drbd/drbd.o:(.opd+0x1b48): first defined here
> drivers/block/drbd/drbd_trace.o: In function `.set_st_err_name':
> (.text+0x134): multiple definition of `.set_st_err_name'
> drivers/block/drbd/drbd.o:(.text+0x28f88): first defined here
>
> I applied the following patch to mark DRBD_TRACE broken for now.
I have fixed that issue. With the next pull, drbd_tracing should
compile on PPC.
BTW, we are working on making our stuff compatible with Rusty's
cpu set changes. I expect that this will be finished soon...
-Phil
--
: Dipl-Ing Philipp Reisner
: LINBIT | Your Way to High Availability
: Tel: +43-1-8178292-50, Fax: +43-1-8178292-82
: http://www.linbit.com
DRBD(R) and LINBIT(R) are registered trademarks of LINBIT, Austria.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: linux-next: drbd tree build failure
2009-07-27 9:09 ` Philipp Reisner
@ 2009-07-27 11:38 ` Alexander Beregalov
2009-07-27 15:07 ` Philipp Reisner
2009-07-28 4:20 ` Stephen Rothwell
1 sibling, 1 reply; 26+ messages in thread
From: Alexander Beregalov @ 2009-07-27 11:38 UTC (permalink / raw)
To: Philipp Reisner; +Cc: Stephen Rothwell, linux-next, linux-kernel
One more issue
drivers/block/drbd/drbd_main.c: In function 'drbd_buildtag':
drivers/block/drbd/drbd_main.c:3738: error: dereferencing pointer to
incomplete type
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: linux-next: drbd tree build failure
2009-07-27 11:38 ` Alexander Beregalov
@ 2009-07-27 15:07 ` Philipp Reisner
2009-07-28 4:19 ` Stephen Rothwell
0 siblings, 1 reply; 26+ messages in thread
From: Philipp Reisner @ 2009-07-27 15:07 UTC (permalink / raw)
To: Alexander Beregalov; +Cc: Stephen Rothwell, linux-next, linux-kernel
On Monday 27 July 2009 13:38:44 Alexander Beregalov wrote:
> One more issue
>
> drivers/block/drbd/drbd_main.c: In function 'drbd_buildtag':
> drivers/block/drbd/drbd_main.c:3738: error: dereferencing pointer to
> incomplete type
Ohh, right. I have never tried to build a kernel with the DRBD patch
without CONFIG_MODULES set.
It is fixed now.
-Phil
--
: Dipl-Ing Philipp Reisner
: LINBIT | Your Way to High Availability
: Tel: +43-1-8178292-50, Fax: +43-1-8178292-82
: http://www.linbit.com
DRBD(R) and LINBIT(R) are registered trademarks of LINBIT, Austria.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: linux-next: drbd tree build failure
2009-07-27 9:09 ` Philipp Reisner
2009-07-27 11:38 ` Alexander Beregalov
@ 2009-07-28 4:20 ` Stephen Rothwell
1 sibling, 0 replies; 26+ messages in thread
From: Stephen Rothwell @ 2009-07-28 4:20 UTC (permalink / raw)
To: Philipp Reisner; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2219 bytes --]
Hi Philipp,
On Mon, 27 Jul 2009 11:09:32 +0200 Philipp Reisner <philipp.reisner@linbit.com> wrote:
>
> On Monday 27 July 2009 09:37:54 Stephen Rothwell wrote:
> >
> > Today's linux-next build (powerpc allyesconfig) failed like this:
> >
> > drivers/block/drbd/drbd_trace.o: In function `.roles_to_name':
> > (.text+0x64): multiple definition of `.roles_to_name'
> > drivers/block/drbd/drbd.o:(.text+0x28eb8): first defined here
> > drivers/block/drbd/drbd_trace.o: In function `disks_to_name':
> > (.opd+0x30): multiple definition of `disks_to_name'
> > drivers/block/drbd/drbd.o:(.opd+0x1b78): first defined here
> > drivers/block/drbd/drbd_trace.o: In function `roles_to_name':
> > (.opd+0x18): multiple definition of `roles_to_name'
> > drivers/block/drbd/drbd.o:(.opd+0x1b60): first defined here
> > drivers/block/drbd/drbd_trace.o: In function `.conns_to_name':
> > (.text+0x0): multiple definition of `.conns_to_name'
> > drivers/block/drbd/drbd.o:(.text+0x28e54): first defined here
> > drivers/block/drbd/drbd_trace.o: In function `set_st_err_name':
> > (.opd+0x48): multiple definition of `set_st_err_name'
> > drivers/block/drbd/drbd.o:(.opd+0x1b90): first defined here
> > drivers/block/drbd/drbd_trace.o: In function `.disks_to_name':
> > (.text+0xcc): multiple definition of `.disks_to_name'
> > drivers/block/drbd/drbd.o:(.text+0x28f20): first defined here
> > drivers/block/drbd/drbd_trace.o: In function `conns_to_name':
> > (.opd+0x0): multiple definition of `conns_to_name'
> > drivers/block/drbd/drbd.o:(.opd+0x1b48): first defined here
> > drivers/block/drbd/drbd_trace.o: In function `.set_st_err_name':
> > (.text+0x134): multiple definition of `.set_st_err_name'
> > drivers/block/drbd/drbd.o:(.text+0x28f88): first defined here
> >
> > I applied the following patch to mark DRBD_TRACE broken for now.
>
> I have fixed that issue. With the next pull, drbd_tracing should
> compile on PPC.
Thanks.
> BTW, we are working on making our stuff compatible with Rusty's
> cpu set changes. I expect that this will be finished soon...
Excellent.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* linux-next: drbd tree build failure
@ 2009-07-29 5:29 Stephen Rothwell
2009-07-29 6:20 ` Jens Axboe
0 siblings, 1 reply; 26+ messages in thread
From: Stephen Rothwell @ 2009-07-29 5:29 UTC (permalink / raw)
To: Philipp Reisner; +Cc: linux-next, linux-kernel, Jens Axboe
Hi Philipp,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/block/drbd/drbd_req.c: In function 'drbd_make_request_26':
drivers/block/drbd/drbd_req.c:1023: error: implicit declaration of function 'bio_barrier'
drivers/block/drbd/drbd_actlog.c: In function '_drbd_md_sync_page_io':
drivers/block/drbd/drbd_actlog.c:120: error: implicit declaration of function 'bio_barrier'
drivers/block/drbd/drbd_main.c: In function 'drbd_send_dblock':
drivers/block/drbd/drbd_main.c:2373: error: implicit declaration of function 'bio_barrier'
drivers/block/drbd/drbd_main.c:2375: error: implicit declaration of function 'bio_sync'
Caused by commit d206aaff0c5ee065f382c626ea21c5166a3047a7 ("bio: first
step in sanitizing the bio->bi_rw flag testing") from the block tree.
I applied the following patch for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 29 Jul 2009 15:13:31 +1000
Subject: [PATCH] drbd: fixups for block api changes
bio_barrier() and bio_sync() are going away.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/block/drbd/drbd_actlog.c | 2 +-
drivers/block/drbd/drbd_main.c | 4 ++--
drivers/block/drbd/drbd_req.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/block/drbd/drbd_actlog.c b/drivers/block/drbd/drbd_actlog.c
index 1e53d16..3851869 100644
--- a/drivers/block/drbd/drbd_actlog.c
+++ b/drivers/block/drbd/drbd_actlog.c
@@ -117,7 +117,7 @@ static int _drbd_md_sync_page_io(struct drbd_conf *mdev,
/* check for unsupported barrier op.
* would rather check on EOPNOTSUPP, but that is not reliable.
* don't try again for ANY return value != 0 */
- if (unlikely(bio_barrier(bio) && !ok)) {
+ if (unlikely(bio_rw_flagged(bio, BIO_RW_BARRIER) && !ok)) {
/* Try again with no barrier */
dev_warn(DEV, "Barriers not supported on meta data device - disabling\n");
set_bit(MD_NO_BARRIER, &mdev->flags);
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 20f4d40..9e051a8 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2370,9 +2370,9 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
/* NOTE: no need to check if barriers supported here as we would
* not pass the test in make_request_common in that case
*/
- if (bio_barrier(req->master_bio))
+ if (bio_rw_flagged(req->master_bio, BIO_RW_BARRIER))
dp_flags |= DP_HARDBARRIER;
- if (bio_sync(req->master_bio))
+ if (bio_rw_flagged(req->master_bio, BIO_RW_SYNCIO))
dp_flags |= DP_RW_SYNC;
if (mdev->state.conn >= C_SYNC_SOURCE &&
mdev->state.conn <= C_PAUSED_SYNC_T)
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index d2b941c..fc8d835 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -1020,7 +1020,7 @@ int drbd_make_request_26(struct request_queue *q, struct bio *bio)
* because of those XXX, this is not yet enabled,
* i.e. in drbd_init_set_defaults we set the NO_BARRIER_SUPP bit.
*/
- if (unlikely(bio_barrier(bio) && test_bit(NO_BARRIER_SUPP, &mdev->flags))) {
+ if (unlikely(bio_rw_flagged(bio, BIO_RW_BARRIER) && test_bit(NO_BARRIER_SUPP, &mdev->flags))) {
/* dev_warn(DEV, "Rejecting barrier request as underlying device does not support\n"); */
bio_endio(bio, -EOPNOTSUPP);
return 0;
--
1.6.3.3
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: linux-next: drbd tree build failure
2009-07-29 5:29 Stephen Rothwell
@ 2009-07-29 6:20 ` Jens Axboe
2009-07-29 15:13 ` Philipp Reisner
0 siblings, 1 reply; 26+ messages in thread
From: Jens Axboe @ 2009-07-29 6:20 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Philipp Reisner, linux-next, linux-kernel
On Wed, Jul 29 2009, Stephen Rothwell wrote:
> Hi Philipp,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> drivers/block/drbd/drbd_req.c: In function 'drbd_make_request_26':
> drivers/block/drbd/drbd_req.c:1023: error: implicit declaration of function 'bio_barrier'
> drivers/block/drbd/drbd_actlog.c: In function '_drbd_md_sync_page_io':
> drivers/block/drbd/drbd_actlog.c:120: error: implicit declaration of function 'bio_barrier'
> drivers/block/drbd/drbd_main.c: In function 'drbd_send_dblock':
> drivers/block/drbd/drbd_main.c:2373: error: implicit declaration of function 'bio_barrier'
> drivers/block/drbd/drbd_main.c:2375: error: implicit declaration of function 'bio_sync'
>
> Caused by commit d206aaff0c5ee065f382c626ea21c5166a3047a7 ("bio: first
> step in sanitizing the bio->bi_rw flag testing") from the block tree.
>
> I applied the following patch for today.
That fixup looks good, thanks Stephen.
--
Jens Axboe
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: linux-next: drbd tree build failure
2009-07-29 6:20 ` Jens Axboe
@ 2009-07-29 15:13 ` Philipp Reisner
0 siblings, 0 replies; 26+ messages in thread
From: Philipp Reisner @ 2009-07-29 15:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jens Axboe, linux-next, linux-kernel
On Wednesday 29 July 2009 08:20:58 Jens Axboe wrote:
> On Wed, Jul 29 2009, Stephen Rothwell wrote:
> > Hi Philipp,
> >
> > Today's linux-next build (x86_64 allmodconfig) failed like this:
> >
> > drivers/block/drbd/drbd_req.c: In function 'drbd_make_request_26':
> > drivers/block/drbd/drbd_req.c:1023: error: implicit declaration of
> > function 'bio_barrier' drivers/block/drbd/drbd_actlog.c: In function
> > '_drbd_md_sync_page_io': drivers/block/drbd/drbd_actlog.c:120: error:
> > implicit declaration of function 'bio_barrier'
> > drivers/block/drbd/drbd_main.c: In function 'drbd_send_dblock':
> > drivers/block/drbd/drbd_main.c:2373: error: implicit declaration of
> > function 'bio_barrier' drivers/block/drbd/drbd_main.c:2375: error:
> > implicit declaration of function 'bio_sync'
> >
> > Caused by commit d206aaff0c5ee065f382c626ea21c5166a3047a7 ("bio: first
> > step in sanitizing the bio->bi_rw flag testing") from the block tree.
> >
> > I applied the following patch for today.
>
> That fixup looks good, thanks Stephen.
Thanks,
I have commited that patch also to the drbd git tree. I think we have
now fixed all open issues (currently).
-phil
--
: Dipl-Ing Philipp Reisner
: LINBIT | Your Way to High Availability
: Tel: +43-1-8178292-50, Fax: +43-1-8178292-82
: http://www.linbit.com
DRBD(R) and LINBIT(R) are registered trademarks of LINBIT, Austria.
^ permalink raw reply [flat|nested] 26+ messages in thread
* linux-next: drbd tree build failure
@ 2009-07-29 5:29 Stephen Rothwell
2009-07-29 5:47 ` Martin K. Petersen
0 siblings, 1 reply; 26+ messages in thread
From: Stephen Rothwell @ 2009-07-29 5:29 UTC (permalink / raw)
To: Philipp Reisner
Cc: Jens Axboe, linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Petersen,
Martin-63ez5xqkn6DQT0dZR+AlfA
Hi Philipp,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/block/drbd/drbd_nl.c: In function 'drbd_setup_queue_param':
drivers/block/drbd/drbd_nl.c:707: error: implicit declaration of function 'blk_queue_stack_limits'
Caused by commit 6dc986e736ca1e76a45d025a920f3a66855fc2aa ("block:
Deprecate blk_queue_stack_limits") from the block tree.
I have applied the following patch for today.
--
Cheers,
Stephen Rothwell sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org
From: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
Date: Wed, 29 Jul 2009 15:25:23 +1000
Subject: [PATCH] drbd: fix for removal of blk_queue_stack_limits
Signed-off-by: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
---
drivers/block/drbd/drbd_nl.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 1e87ad0..0ec86e8 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -704,7 +704,7 @@ void drbd_setup_queue_param(struct drbd_conf *mdev, unsigned int max_seg_s) __mu
blk_queue_max_segment_size(q, max_seg_s);
blk_queue_logical_block_size(q, 512);
blk_queue_segment_boundary(q, PAGE_SIZE-1);
- blk_queue_stack_limits(q, b);
+ blk_stack_limits(&q->limits, &b->limits, 0);
if (b->merge_bvec_fn)
dev_warn(DEV, "Backing device's merge_bvec_fn() = %p\n",
--
1.6.3.3
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: linux-next: drbd tree build failure
2009-07-29 5:29 Stephen Rothwell
@ 2009-07-29 5:47 ` Martin K. Petersen
2009-07-29 6:17 ` Stephen Rothwell
2009-08-18 5:32 ` Stephen Rothwell
0 siblings, 2 replies; 26+ messages in thread
From: Martin K. Petersen @ 2009-07-29 5:47 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Philipp Reisner, linux-next, linux-kernel, Martin K. Petersen,
Jens Axboe
>>>>> "Stephen" == Stephen Rothwell <sfr@canb.auug.org.au> writes:
Stephen> drivers/block/drbd/drbd_nl.c: In function
Stephen> 'drbd_setup_queue_param': drivers/block/drbd/drbd_nl.c:707:
Stephen> error: implicit declaration of function
Stephen> 'blk_queue_stack_limits'
We've decided to keep blk_queue_stack_limits as a wrapper to ease the
transition. I sent Jens a patch earlier today that does this.
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: linux-next: drbd tree build failure
2009-07-29 5:47 ` Martin K. Petersen
@ 2009-07-29 6:17 ` Stephen Rothwell
2009-08-18 5:32 ` Stephen Rothwell
1 sibling, 0 replies; 26+ messages in thread
From: Stephen Rothwell @ 2009-07-29 6:17 UTC (permalink / raw)
To: Martin K. Petersen; +Cc: Philipp Reisner, linux-next, linux-kernel, Jens Axboe
[-- Attachment #1: Type: text/plain, Size: 666 bytes --]
Hi Martin,
On Wed, 29 Jul 2009 01:47:48 -0400 "Martin K. Petersen" <martin.petersen@oracle.com> wrote:
>
> >>>>> "Stephen" == Stephen Rothwell <sfr@canb.auug.org.au> writes:
>
> Stephen> drivers/block/drbd/drbd_nl.c: In function
> Stephen> 'drbd_setup_queue_param': drivers/block/drbd/drbd_nl.c:707:
> Stephen> error: implicit declaration of function
> Stephen> 'blk_queue_stack_limits'
>
> We've decided to keep blk_queue_stack_limits as a wrapper to ease the
> transition. I sent Jens a patch earlier today that does this.
OK, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: linux-next: drbd tree build failure
2009-07-29 5:47 ` Martin K. Petersen
2009-07-29 6:17 ` Stephen Rothwell
@ 2009-08-18 5:32 ` Stephen Rothwell
2009-08-18 6:01 ` Martin K. Petersen
1 sibling, 1 reply; 26+ messages in thread
From: Stephen Rothwell @ 2009-08-18 5:32 UTC (permalink / raw)
To: Martin K. Petersen; +Cc: Philipp Reisner, linux-next, linux-kernel, Jens Axboe
[-- Attachment #1: Type: text/plain, Size: 778 bytes --]
Hi Martin, Jens,
On Wed, 29 Jul 2009 01:47:48 -0400 "Martin K. Petersen" <martin.petersen@oracle.com> wrote:
>
> >>>>> "Stephen" == Stephen Rothwell <sfr@canb.auug.org.au> writes:
>
> Stephen> drivers/block/drbd/drbd_nl.c: In function
> Stephen> 'drbd_setup_queue_param': drivers/block/drbd/drbd_nl.c:707:
> Stephen> error: implicit declaration of function
> Stephen> 'blk_queue_stack_limits'
>
> We've decided to keep blk_queue_stack_limits as a wrapper to ease the
> transition. I sent Jens a patch earlier today that does this.
I am still getting this error (3 weeks later) ... :-(
Maybe my original patch should be applied to the drbd tree?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: linux-next: drbd tree build failure
2009-08-18 5:32 ` Stephen Rothwell
@ 2009-08-18 6:01 ` Martin K. Petersen
0 siblings, 0 replies; 26+ messages in thread
From: Martin K. Petersen @ 2009-08-18 6:01 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Martin K. Petersen, Philipp Reisner, linux-next, linux-kernel,
Jens Axboe
>>>>> "Stephen" == Stephen Rothwell <sfr@canb.auug.org.au> writes:
>> We've decided to keep blk_queue_stack_limits as a wrapper to ease the
>> transition. I sent Jens a patch earlier today that does this.
Stephen> I am still getting this error (3 weeks later) ... :-(
Jens applied it to for-linus and it's been upstream for a while. But it
looks like the block for-next tree has stale bits...
Jens?
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 26+ messages in thread
* linux-next: drbd tree build failure
@ 2009-09-15 6:07 Stephen Rothwell
2009-09-15 6:23 ` Jens Axboe
0 siblings, 1 reply; 26+ messages in thread
From: Stephen Rothwell @ 2009-09-15 6:07 UTC (permalink / raw)
To: Philipp Reisner, drbd-dev
Cc: linux-next, linux-kernel, Nikanth Karthikesan, Jens Axboe
Hi Philipp,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/block/drbd/drbd_req.c: In function '_drbd_start_io_acct':
drivers/block/drbd/drbd_req.c:45: error: lvalue required as increment operand
drivers/block/drbd/drbd_req.c: In function '_drbd_end_io_acct':
drivers/block/drbd/drbd_req.c:58: error: lvalue required as decrement operand
Caused by commit 954749162c98ca45c42cbc00c9ed6d5d6c0b8bb7 ("DRBD:
request") from the drbd tree interacting with commit
a9327cac440be4d8333bba975cbbf76045096275 ("Seperate read and write
statistics of in_flight requests") from the block tree.
I have applied the following merge fix for today, but there may be a
better fix.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Sep 2009 16:03:50 +1000
Subject: [PATCH] drbd: fix for in_flight change in block tree
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/block/drbd/drbd_req.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index cbdc257..0656cf1 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -42,7 +42,7 @@ static void _drbd_start_io_acct(struct drbd_conf *mdev, struct drbd_request *req
part_stat_inc(cpu, &mdev->vdisk->part0, ios[rw]);
part_stat_add(cpu, &mdev->vdisk->part0, sectors[rw], bio_sectors(bio));
part_stat_unlock();
- mdev->vdisk->part0.in_flight++;
+ mdev->vdisk->part0.in_flight[rw]++;
}
/* Update disk stats when completing request upwards */
@@ -55,7 +55,7 @@ static void _drbd_end_io_acct(struct drbd_conf *mdev, struct drbd_request *req)
part_stat_add(cpu, &mdev->vdisk->part0, ticks[rw], duration);
part_round_stats(cpu, &mdev->vdisk->part0);
part_stat_unlock();
- mdev->vdisk->part0.in_flight--;
+ mdev->vdisk->part0.in_flight[rw]--;
}
static void _req_is_done(struct drbd_conf *mdev, struct drbd_request *req, const int rw)
--
1.6.3.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: linux-next: drbd tree build failure
2009-09-15 6:07 Stephen Rothwell
@ 2009-09-15 6:23 ` Jens Axboe
2009-09-15 6:53 ` Stephen Rothwell
0 siblings, 1 reply; 26+ messages in thread
From: Jens Axboe @ 2009-09-15 6:23 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Philipp Reisner, drbd-dev, linux-next, linux-kernel, Nikanth Karthikesan
On Tue, Sep 15 2009, Stephen Rothwell wrote:
> Hi Philipp,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> drivers/block/drbd/drbd_req.c: In function '_drbd_start_io_acct':
> drivers/block/drbd/drbd_req.c:45: error: lvalue required as increment operand
> drivers/block/drbd/drbd_req.c: In function '_drbd_end_io_acct':
> drivers/block/drbd/drbd_req.c:58: error: lvalue required as decrement operand
>
> Caused by commit 954749162c98ca45c42cbc00c9ed6d5d6c0b8bb7 ("DRBD:
> request") from the drbd tree interacting with commit
> a9327cac440be4d8333bba975cbbf76045096275 ("Seperate read and write
> statistics of in_flight requests") from the block tree.
>
> I have applied the following merge fix for today, but there may be a
> better fix.
Fix looks correct.
--
Jens Axboe
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: linux-next: drbd tree build failure
2009-09-15 6:23 ` Jens Axboe
@ 2009-09-15 6:53 ` Stephen Rothwell
[not found] ` <20090915165309.f07381ec.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
0 siblings, 1 reply; 26+ messages in thread
From: Stephen Rothwell @ 2009-09-15 6:53 UTC (permalink / raw)
To: Jens Axboe
Cc: Philipp Reisner, drbd-dev, linux-next, linux-kernel, Nikanth Karthikesan
[-- Attachment #1: Type: text/plain, Size: 357 bytes --]
Hi Jens,
On Tue, 15 Sep 2009 08:23:06 +0200 Jens Axboe <jens.axboe@oracle.com> wrote:
>
> Fix looks correct.
Thanks for the confirmation. So hopefully one of these trees will be
merged by Linus soon an this can be fixed up in the other.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
end of thread, other threads:[~2009-09-15 14:03 UTC | newest]
Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-07-27 5:48 linux-next: drbd tree build failure Stephen Rothwell
2009-07-27 8:09 ` Lars Ellenberg
2009-07-27 17:17 ` Philipp Reisner
2009-07-28 4:20 ` Stephen Rothwell
2009-07-29 1:40 ` Rusty Russell
2009-07-29 15:11 ` Philipp Reisner
2009-07-27 7:37 Stephen Rothwell
2009-07-27 9:09 ` Philipp Reisner
2009-07-27 11:38 ` Alexander Beregalov
2009-07-27 15:07 ` Philipp Reisner
2009-07-28 4:19 ` Stephen Rothwell
2009-07-28 4:20 ` Stephen Rothwell
2009-07-29 5:29 Stephen Rothwell
2009-07-29 6:20 ` Jens Axboe
2009-07-29 15:13 ` Philipp Reisner
2009-07-29 5:29 Stephen Rothwell
2009-07-29 5:47 ` Martin K. Petersen
2009-07-29 6:17 ` Stephen Rothwell
2009-08-18 5:32 ` Stephen Rothwell
2009-08-18 6:01 ` Martin K. Petersen
2009-09-15 6:07 Stephen Rothwell
2009-09-15 6:23 ` Jens Axboe
2009-09-15 6:53 ` Stephen Rothwell
[not found] ` <20090915165309.f07381ec.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2009-09-15 6:57 ` Jens Axboe
2009-09-15 7:45 ` Stephen Rothwell
2009-09-15 14:03 ` Philipp Reisner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).