[PATCH 0/3 RESEND] BDI handling fixes

[PATCH 0/3 RESEND] BDI handling fixes

[Jan Kara]

  Hi,

  I resend this series because I've messed up Jens' address in the original
posting. Jens, would you please include these fixes in your tree? Thanks.
The series of these three patches fixes the warning in __mark_inode_dirty()
which happens when I do e.g. touch /dev/zero.

								Honza

[PATCH 1/3] bdi: Initialize noop_backing_dev_info properly

[Jan Kara]

Properly initialize this backing dev info so that writeback code does not
barf when getting to it e.g. via sb->s_bdi.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 mm/backing-dev.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index eaa4a5b..69ae8ca 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -30,6 +30,7 @@ EXPORT_SYMBOL_GPL(default_backing_dev_info);
 
 struct backing_dev_info noop_backing_dev_info = {
 	.name		= "noop",
+	.capabilities	= BDI_CAP_NO_ACCT_AND_WRITEBACK,
 };
 EXPORT_SYMBOL_GPL(noop_backing_dev_info);
 
@@ -243,6 +244,7 @@ static int __init default_bdi_init(void)
 	err = bdi_init(&default_backing_dev_info);
 	if (!err)
 		bdi_register(&default_backing_dev_info, NULL, "default");
+	err = bdi_init(&noop_backing_dev_info);
 
 	return err;
 }
-- 
1.6.4.2

[PATCH 2/3] char: Mark /dev/zero and /dev/kmem as not capable of writeback

[Jan Kara]

These devices don't do any writeback but their device inodes still can get
dirty so mark bdi appropriately so that bdi code does the right thing and files
inodes to lists of bdi carrying the device inodes.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 drivers/char/mem.c |    3 ++-
 fs/char_dev.c      |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index a398ecd..1f528fa 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -788,10 +788,11 @@ static const struct file_operations zero_fops = {
 /*
  * capabilities for /dev/zero
  * - permits private mappings, "copies" are taken of the source of zeros
+ * - no writeback happens
  */
 static struct backing_dev_info zero_bdi = {
 	.name		= "char/mem",
-	.capabilities	= BDI_CAP_MAP_COPY,
+	.capabilities	= BDI_CAP_MAP_COPY | BDI_CAP_NO_ACCT_AND_WRITEBACK,
 };
 
 static const struct file_operations full_fops = {
diff --git a/fs/char_dev.c b/fs/char_dev.c
index f80a4f2..143d393 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -40,7 +40,9 @@ struct backing_dev_info directly_mappable_cdev_bdi = {
 #endif
 		/* permit direct mmap, for read, write or exec */
 		BDI_CAP_MAP_DIRECT |
-		BDI_CAP_READ_MAP | BDI_CAP_WRITE_MAP | BDI_CAP_EXEC_MAP),
+		BDI_CAP_READ_MAP | BDI_CAP_WRITE_MAP | BDI_CAP_EXEC_MAP |
+		/* no writeback happens */
+		BDI_CAP_NO_ACCT_AND_WRITEBACK),
 };
 
 static struct kobj_map *cdev_map;
-- 
1.6.4.2

[PATCH 3/3] bdi: Fix warnings in __mark_inode_dirty for /dev/zero and friends

[Jan Kara]

Inodes of devices such as /dev/zero can get dirty for example via utime(2)
syscall or due to atime update. Backing device of such inodes (zero_bdi, etc.)
is however unable to handle dirty inodes and thus __mark_inode_dirty complains.
In fact, inode should be rather dirtied against backing device of the
filesystem holding it. This is generally a good rule except for filesystems
such as 'bdev' or 'mtd_inodefs'. Inodes in these pseudofilesystems are
referenced from ordinary filesystem inodes and carry mapping with real data of
the device. Thus for these inodes we have to use
inode->i_mapping->backing_dev_info as we did so far. We distinguish these
filesystems by checking whether sb->s_bdi points to a non-trivial backing
device or not.

Example: Assume we have an ext3 filesystem on /dev/sda1 mounted on /. There's a
device inode A described by a path "/dev/sdb" on this filesystem. This inode
will be dirtied against backing device "8:0" after this patch. bdev filesystem
contains block device inode B coupled with our inode A. When someone modifies a
page of /dev/sdb, it's B that gets dirtied and the dirtying happens against the
backing device "8:16". Thus both inodes get filed to a correct bdi list.

Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/fs-writeback.c |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 49fd41a..7dad208 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -52,8 +52,6 @@ struct wb_writeback_work {
 #define CREATE_TRACE_POINTS
 #include <trace/events/writeback.h>
 
-#define inode_to_bdi(inode)	((inode)->i_mapping->backing_dev_info)
-
 /*
  * We don't actually have pdflush, but this one is exported though /proc...
  */
@@ -71,6 +69,27 @@ int writeback_in_progress(struct backing_dev_info *bdi)
 	return test_bit(BDI_writeback_running, &bdi->state);
 }
 
+static inline struct backing_dev_info *inode_to_bdi(struct inode *inode)
+{
+	struct super_block *sb = inode->i_sb;
+	struct backing_dev_info *bdi = inode->i_mapping->backing_dev_info;
+
+	/*
+	 * For inodes on standard filesystems, we use superblock's bdi. For
+	 * inodes on virtual filesystems, we want to use inode mapping's bdi
+	 * because they can possibly point to something useful (think about
+	 * block_dev filesystem).
+	 */
+	if (sb->s_bdi && sb->s_bdi != &noop_backing_dev_info) {
+		/* Some device inodes could play dirty tricks. Catch them... */
+		WARN(bdi != sb->s_bdi && bdi_cap_writeback_dirty(bdi),
+			"Dirtiable inode bdi %s != sb bdi %s\n",
+			bdi->name, sb->s_bdi->name);
+		return sb->s_bdi;
+	}
+	return bdi;
+}
+
 /* Wakeup flusher thread or forker thread to fork it. Requires bdi->wb_lock. */
 static void _bdi_wakeup_flusher(struct backing_dev_info *bdi)
 {
-- 
1.6.4.2

Re: [PATCH 0/3 RESEND] BDI handling fixes

[Jens Axboe]

On 2010-09-20 17:44, Jan Kara wrote:
>   Hi,
> 
>   I resend this series because I've messed up Jens' address in the original
> posting. Jens, would you please include these fixes in your tree? Thanks.
> The series of these three patches fixes the warning in __mark_inode_dirty()
> which happens when I do e.g. touch /dev/zero.

Thanks, I'll commit for .37 and tag the for stable.

-- 
Jens Axboe

Re: [PATCH 0/3 RESEND] BDI handling fixes

[Jens Axboe]

On 2010-09-20 19:23, Jens Axboe wrote:
> On 2010-09-20 17:44, Jan Kara wrote:
>>   Hi,
>>
>>   I resend this series because I've messed up Jens' address in the original
>> posting. Jens, would you please include these fixes in your tree? Thanks.
>> The series of these three patches fixes the warning in __mark_inode_dirty()
>> which happens when I do e.g. touch /dev/zero.
> 
> Thanks, I'll commit for .37 and tag the for stable.

Actually, I think they are fine for .36 directly. Agree?

-- 
Jens Axboe

Re: [PATCH 0/3 RESEND] BDI handling fixes

[Jan Kara]

On Mon 20-09-10 19:24:33, Jens Axboe wrote:
> On 2010-09-20 19:23, Jens Axboe wrote:
> > On 2010-09-20 17:44, Jan Kara wrote:
> >>   Hi,
> >>
> >>   I resend this series because I've messed up Jens' address in the original
> >> posting. Jens, would you please include these fixes in your tree? Thanks.
> >> The series of these three patches fixes the warning in __mark_inode_dirty()
> >> which happens when I do e.g. touch /dev/zero.
> > 
> > Thanks, I'll commit for .37 and tag the for stable.
> 
> Actually, I think they are fine for .36 directly. Agree?
  Yes, I think they should be OK for .36.

								Honza
-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR