From e2ad25be95e01aa6532275e3df5b1a3390d411c3 Mon Sep 17 00:00:00 2001 From: nathan Date: Fri, 8 Apr 2005 18:16:35 +0000 Subject: [PATCH] Branch b1_4 b=4834 r=adilger (from adilger's b_cray fix) Change the dev_read_only patch to do set the device r/w only at block device shutdown, and not just when Lustre does a mntput (which may still be racy with threads accessing the superblock before the are stopped). --- .../patches/dev_read_only-2.6-lnxi.patch | 122 +++++++++++---------- .../patches/dev_read_only-2.6-suse.patch | 27 ++++- .../patches/dev_read_only_2.4.20-rh.patch | 31 +++++- .../patches/dev_read_only_2.4.21-chaos.patch | 39 +++++-- lustre/obdclass/class_obd.c | 5 + 5 files changed, 157 insertions(+), 67 deletions(-) diff --git a/lustre/kernel_patches/patches/dev_read_only-2.6-lnxi.patch b/lustre/kernel_patches/patches/dev_read_only-2.6-lnxi.patch index 75062ea..ba8472e 100644 --- a/lustre/kernel_patches/patches/dev_read_only-2.6-lnxi.patch +++ b/lustre/kernel_patches/patches/dev_read_only-2.6-lnxi.patch @@ -1,5 +1,5 @@ ---- linux-2.6.5.orig/drivers/block/ll_rw_blk.c 2005-03-16 10:09:28.000000000 -0800 -+++ linux-2.6.5/drivers/block/ll_rw_blk.c 2005-03-16 10:57:38.197357003 -0800 +--- linux-2.6.5-suse.orig/drivers/block/ll_rw_blk.c 2004-11-11 07:28:51.000000000 -0800 ++++ linux-2.6.5/drivers/block/ll_rw_blk.c 2005-03-16 10:57:38.000000000 -0800 @@ -2458,7 +2458,7 @@ static inline void blk_partition_remap(s } } @@ -9,19 +9,15 @@ /** * generic_make_request: hand a buffer to its device driver for I/O -@@ -2550,9 +2550,9 @@ end_io: +@@ -2550,7 +2550,7 @@ end_io: /* this is cfs's dev_rdonly check */ if (bio->bi_rw == WRITE && - dev_check_rdonly(bio->bi_bdev->bd_dev)) { -- bio_endio(bio, bio->bi_size, 0); -- break; + dev_check_rdonly(bio->bi_bdev)) { -+ bio_endio(bio, bio->bi_size, 0); -+ break; + bio_endio(bio, bio->bi_size, 0); + break; } - - /* @@ -3086,53 +3086,85 @@ void swap_io_context(struct io_context * *ioc2 = temp; } @@ -35,51 +31,20 @@ * silently). This is for filesystem crash/recovery testing. */ -void dev_set_rdonly(struct block_device *bdev, int no_write) --{ -- if (no_write >= MAX_RDONLY_DEVS) { -- printk(KERN_ALERT "%s:%d illegal arg %d (max %d)\n", -- __FILE__, __LINE__, no_write, MAX_RDONLY_DEVS); -- return; -- } -- -- if (bdev) { -- printk(KERN_WARNING "Turning device %s read-only at %d\n", -- bdev->bd_disk ? bdev->bd_disk->disk_name : "?", -- no_write); -- rdonly_devs[no_write] = bdev->bd_dev; -- } --} +struct deventry { + dev_t dev; + struct deventry *next; +}; - --void dev_clear_rdonly(int no_write) --{ -- if (no_write >= MAX_RDONLY_DEVS) { -- printk(KERN_ALERT "%s:%d illegal arg %d (max %d)\n", -- __FILE__, __LINE__, no_write, MAX_RDONLY_DEVS); -- return; -- } ++ +static struct deventry *devlist = NULL; +static spinlock_t devlock = SPIN_LOCK_UNLOCKED; - -- if (rdonly_devs[no_write] == 0) -- return; -- -- printk(KERN_WARNING "Clearing read-only at %d\n", no_write); -- rdonly_devs[no_write] = 0; --} -- --int dev_check_rdonly(dev_t dev) ++ +int dev_check_rdonly(struct block_device *bdev) { -- int i; -- -- for (i = 0; i < MAX_RDONLY_DEVS; i++) -- if (rdonly_devs[i] == dev) -- return 1; -- return 0; +- if (no_write >= MAX_RDONLY_DEVS) { +- printk(KERN_ALERT "%s:%d illegal arg %d (max %d)\n", +- __FILE__, __LINE__, no_write, MAX_RDONLY_DEVS); +- return; + struct deventry *cur; + if (!bdev) return 0; + spin_lock(&devlock); @@ -88,23 +53,38 @@ + if (bdev->bd_dev == cur->dev) { + spin_unlock(&devlock); + return 1; -+ } + } +- +- if (bdev) { +- printk(KERN_WARNING "Turning device %s read-only at %d\n", +- bdev->bd_disk ? bdev->bd_disk->disk_name : "?", +- no_write); +- rdonly_devs[no_write] = bdev->bd_dev; + cur = cur->next; -+ } + } + spin_unlock(&devlock); + return 0; -+} -+ + } + +-void dev_clear_rdonly(int no_write) +void dev_set_rdonly(struct block_device *bdev) -+{ + { +- if (no_write >= MAX_RDONLY_DEVS) { +- printk(KERN_ALERT "%s:%d illegal arg %d (max %d)\n", +- __FILE__, __LINE__, no_write, MAX_RDONLY_DEVS); +- return; +- } + struct deventry *newdev, *cur; -+ + +- if (rdonly_devs[no_write] == 0) + if (!bdev) + return; + newdev = kmalloc(sizeof(struct deventry), GFP_KERNEL); + if (!newdev) -+ return; -+ + return; + +- printk(KERN_WARNING "Clearing read-only at %d\n", no_write); +- rdonly_devs[no_write] = 0; + spin_lock(&devlock); + cur = devlist; + while(cur) { @@ -112,7 +92,16 @@ + spin_unlock(&devlock); + kfree(newdev); + return; -+ } + } +- +-int dev_check_rdonly(dev_t dev) +-{ +- int i; +- +- for (i = 0; i < MAX_RDONLY_DEVS; i++) +- if (rdonly_devs[i] == dev) +- return 1; +- return 0; + cur = cur->next; + } + newdev->dev = bdev->bd_dev; @@ -148,3 +137,26 @@ } EXPORT_SYMBOL(dev_set_rdonly); +--- linux-2.6.5-suse.orig/include/linux/fs.h 2004-11-11 07:28:45.000000000 -0800 ++++ linux-2.6.5/include/linux/fs.h 2005-04-07 18:12:42.772181591 -0700 +@@ -1385,6 +1385,10 @@ extern void file_kill(struct file *f); + struct bio; + extern int submit_bio(int, struct bio *); + extern int bdev_read_only(struct block_device *); ++#define HAVE_CLEAR_RDONLY_ON_PUT ++void dev_set_rdonly(kdev_t dev); ++int dev_check_rdonly(kdev_t dev); ++void dev_clear_rdonly(kdev_t dev); + extern int set_blocksize(struct block_device *, int); + extern int sb_set_blocksize(struct super_block *, int); + extern int sb_min_blocksize(struct super_block *, int); +--- linux-2.6.5-suse.orig/fs/block_dev.c 2004-11-11 07:28:30.000000000 -0800 ++++ linux-2.6.5/fs/block_dev.c 2005-04-07 18:14:27.948304347 -0700 +@@ -739,6 +739,7 @@ int blkdev_put(struct block_device *bdev + } + unlock_kernel(); + up(&bdev->bd_sem); ++ dev_clear_rdonly(to_kdev_t(bdev->bd_dev)); + bdput(bdev); + return ret; + } diff --git a/lustre/kernel_patches/patches/dev_read_only-2.6-suse.patch b/lustre/kernel_patches/patches/dev_read_only-2.6-suse.patch index db6b72d..264090d 100644 --- a/lustre/kernel_patches/patches/dev_read_only-2.6-suse.patch +++ b/lustre/kernel_patches/patches/dev_read_only-2.6-suse.patch @@ -1,5 +1,5 @@ ---- linux-2.6.5.orig/drivers/block/ll_rw_blk.c 2005-03-16 11:08:47.404935605 -0800 -+++ linux-2.6.5/drivers/block/ll_rw_blk.c 2005-03-16 10:57:38.197357003 -0800 +--- linux-2.6.5-suse.orig/drivers/block/ll_rw_blk.c.naked 2005-04-07 17:43:49.143050888 -0700 ++++ linux-2.6.5/drivers/block/ll_rw_blk.c 2005-03-16 10:57:38.000000000 -0800 @@ -2458,6 +2458,8 @@ static inline void blk_partition_remap(s } } @@ -115,3 +115,26 @@ * sysfs parts below */ struct queue_sysfs_entry { +--- linux-2.6.5-suse.orig/include/linux/fs.h 2004-11-11 07:28:45.000000000 -0800 ++++ linux-2.6.5/include/linux/fs.h 2005-04-07 18:12:42.772181591 -0700 +@@ -1385,6 +1385,10 @@ extern void file_kill(struct file *f); + struct bio; + extern int submit_bio(int, struct bio *); + extern int bdev_read_only(struct block_device *); ++#define HAVE_CLEAR_RDONLY_ON_PUT ++void dev_set_rdonly(kdev_t dev); ++int dev_check_rdonly(kdev_t dev); ++void dev_clear_rdonly(kdev_t dev); + extern int set_blocksize(struct block_device *, int); + extern int sb_set_blocksize(struct super_block *, int); + extern int sb_min_blocksize(struct super_block *, int); +--- linux-2.6.5-suse.orig/fs/block_dev.c 2004-11-11 07:28:30.000000000 -0800 ++++ linux-2.6.5/fs/block_dev.c 2005-04-07 18:14:27.948304347 -0700 +@@ -739,6 +739,7 @@ int blkdev_put(struct block_device *bdev + } + unlock_kernel(); + up(&bdev->bd_sem); ++ dev_clear_rdonly(to_kdev_t(bdev->bd_dev)); + bdput(bdev); + return ret; + } diff --git a/lustre/kernel_patches/patches/dev_read_only_2.4.20-rh.patch b/lustre/kernel_patches/patches/dev_read_only_2.4.20-rh.patch index b411c92..44f0ade 100644 --- a/lustre/kernel_patches/patches/dev_read_only_2.4.20-rh.patch +++ b/lustre/kernel_patches/patches/dev_read_only_2.4.20-rh.patch @@ -1,5 +1,6 @@ ---- linux-2.4.20-rh.orig/drivers/block/ll_rw_blk.c 2005-01-19 10:59:48.000000000 -0800 -+++ linux-2.4.20-rh/drivers/block/ll_rw_blk.c 2005-01-19 12:13:39.325347995 -0800 +diff -ur linux-2.4.20-rh.orig/drivers/block/ll_rw_blk.c linux-2.4.20-rh/drivers/block/ll_rw_blk.c +--- linux-2.4.20-rh.orig/drivers/block/ll_rw_blk.c 2004-05-27 11:25:09.000000000 -0700 ++++ linux-2.4.20-rh/drivers/block/ll_rw_blk.c 2005-04-08 09:02:14.734804881 -0700 @@ -645,6 +645,86 @@ void set_device_ro(kdev_t dev,int flag) else ro_bits[major][minor >> 5] &= ~(1 << (minor & 31)); } @@ -98,3 +99,29 @@ } while (q->make_request_fn(q, rw, bh)); } +diff -ur linux-2.4.20-rh.orig/fs/block_dev.c linux-2.4.20-rh/fs/block_dev.c +--- linux-2.4.20-rh.orig/fs/block_dev.c 2002-08-02 17:39:45.000000000 -0700 ++++ linux-2.4.20-rh/fs/block_dev.c 2005-04-08 09:02:15.005789333 -0700 +@@ -645,6 +645,7 @@ int blkdev_put(struct block_device *bdev + bdev->bd_op = NULL; + unlock_kernel(); + up(&bdev->bd_sem); ++ dev_clear_rdonly(to_kdev_t(bdev->bd_dev)); + bdput(bdev); + return ret; + } +diff -ur linux-2.4.20-rh.orig/include/linux/fs.h linux-2.4.20-rh/include/linux/fs.h +--- linux-2.4.20-rh.orig/include/linux/fs.h 2004-05-27 11:25:09.000000000 -0700 ++++ linux-2.4.20-rh/include/linux/fs.h 2005-04-08 09:02:14.915794496 -0700 +@@ -1425,6 +1425,10 @@ extern struct buffer_head * getblk(kdev_ + extern void ll_rw_block(int, int, struct buffer_head * bh[]); + extern void submit_bh(int, struct buffer_head *); + extern int is_read_only(kdev_t); ++#define HAVE_CLEAR_RDONLY_ON_PUT ++void dev_set_rdonly(kdev_t dev); ++int dev_check_rdonly(kdev_t dev); ++void dev_clear_rdonly(kdev_t dev); + extern void __brelse(struct buffer_head *); + static inline void brelse(struct buffer_head *buf) + { + diff --git a/lustre/kernel_patches/patches/dev_read_only_2.4.21-chaos.patch b/lustre/kernel_patches/patches/dev_read_only_2.4.21-chaos.patch index 5ec75ce..e37a15d 100644 --- a/lustre/kernel_patches/patches/dev_read_only_2.4.21-chaos.patch +++ b/lustre/kernel_patches/patches/dev_read_only_2.4.21-chaos.patch @@ -1,6 +1,6 @@ ---- linux-2.4.21-p4smp-75chaos/drivers/block/ll_rw_blk.c.orig 2004-10-28 14:41:07.000000000 -0700 -+++ linux-2.4.21-p4smp-75chaos/drivers/block/ll_rw_blk.c 2005-01-19 12:24:53.946853178 -0800 -@@ -679,6 +679,86 @@ void set_device_ro(kdev_t dev,int flag) +--- linux-2.4.24.orig/drivers/block/ll_rw_blk.c 2005-04-07 17:30:58.978035892 -0700 ++++ linux-2.4.24/drivers/block/ll_rw_blk.c 2005-04-07 17:22:04.354867801 -0700 +@@ -691,6 +691,86 @@ void set_device_ro(kdev_t dev,int flag) else ro_bits[major][minor >> 5] &= ~(1 << (minor & 31)); } @@ -87,14 +87,37 @@ inline void drive_stat_acct (kdev_t dev, int rw, unsigned long nr_sectors, int new_io) { -@@ -1257,6 +1337,10 @@ void generic_make_request (int rw, struc +@@ -1256,6 +1336,10 @@ void generic_make_request (int rw, struc break; } -+ if ((rw & WRITE)&&(dev_check_rdonly(bh->b_rdev))) { -+ bh->b_end_io(bh, 0); -+ break; -+ } ++ if ((rw & WRITE)&&(dev_check_rdonly(bh->b_rdev))) { ++ bh->b_end_io(bh, 0); ++ break; ++ } } while (q->make_request_fn(q, rw, bh)); } +--- linux-2.4.24.orig/include/linux/fs.h 2003-11-28 10:26:21.000000000 -0800 ++++ linux-2.4.24/include/linux/fs.h 2005-04-07 17:03:36.810595409 -0700 +@@ -1418,6 +1418,10 @@ extern struct buffer_head * getblk(kdev_ + extern void ll_rw_block(int, int, struct buffer_head * bh[]); + extern void submit_bh(int, struct buffer_head *); + extern int is_read_only(kdev_t); ++#define HAVE_CLEAR_RDONLY_ON_PUT ++void dev_set_rdonly(kdev_t dev); ++int dev_check_rdonly(kdev_t dev); ++void dev_clear_rdonly(kdev_t dev); + extern void __brelse(struct buffer_head *); + static inline void brelse(struct buffer_head *buf) + { +--- linux-2.4.24.orig/fs/block_dev.c 2003-06-13 07:51:37.000000000 -0700 ++++ linux-2.4.24/fs/block_dev.c 2005-04-07 14:01:49.000000000 -0700 +@@ -645,6 +645,7 @@ int blkdev_put(struct block_device *bdev + bdev->bd_op = NULL; + unlock_kernel(); + up(&bdev->bd_sem); ++ dev_clear_rdonly(to_kdev_t(bdev->bd_dev)); + bdput(bdev); + return ret; + } diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c index 13077d4..201bba5 100644 --- a/lustre/obdclass/class_obd.c +++ b/lustre/obdclass/class_obd.c @@ -115,6 +115,7 @@ void ll_set_rdonly(ll_sbdev_type dev) void ll_clear_rdonly(ll_sbdev_type dev) { +#ifndef HAVE_CLEAR_RDONLY_ON_PUT CDEBUG(D_IOCTL | D_HA, "unset dev %ld rdonly\n", (long)dev); if (ll_check_rdonly(dev)) { ll_sbdev_sync(dev); @@ -124,6 +125,10 @@ void ll_clear_rdonly(ll_sbdev_type dev) dev_clear_rdonly(dev); #endif } +#else + CDEBUG(D_IOCTL | D_HA, "(will unset dev %ld rdonly on put)\n", + (long)dev); +#endif } /* opening /dev/obd */ -- 1.8.3.1