Commit 3645e6d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'md/4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md 

Pull MD updates from Shaohua Li:
 "This update mainly fixes bugs:

   - Make raid5 ppl support several ppl from Pawel

   - Several raid5-cache bug fixes from Song

   - Bitmap fixes from Neil and Me

   - One raid1/10 regression fix since 4.12 from Me

   - Other small fixes and cleanup"

* tag 'md/4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md:
  md/bitmap: disable bitmap_resize for file-backed bitmaps.
  raid5-ppl: Recovery support for multiple partial parity logs
  md: Runtime support for multiple ppls
  md/raid0: attach correct cgroup info in bio
  lib/raid6: align AVX512 constants to 512 bits, not bytes
  raid5: remove raid5_build_block
  md/r5cache: call mddev_lock/unlock() in r5c_journal_mode_show
  md: replace seq_release_private with seq_release
  md: notify about new spare disk in the container
  md/raid1/10: reset bio allocated from mempool
  md/raid5: release/flush io in raid5_do_work()
  md/bitmap: copy correct data for bitmap super
parents 15d8ffc9 e8a27f83

block/bio.c

+1 −1
Original line number Diff line number Diff line
@@ -2089,7 +2089,7 @@ void bio_clone_blkcg_association(struct bio *dst, struct bio *src) 
	if (src->bi_css)

		WARN_ON(bio_associate_blkcg(dst, src->bi_css));

}



EXPORT_SYMBOL_GPL(bio_clone_blkcg_association);

#endif /* CONFIG_BLK_CGROUP */



static void __init biovec_init_slabs(void)

drivers/md/bitmap.c

+7 −2
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ re_read: 
		err = read_sb_page(bitmap->mddev,

				   offset,

				   sb_page,

				   0, sizeof(bitmap_super_t));

				   0, PAGE_SIZE);

	}

	if (err)

		return err;
@@ -2058,6 +2058,11 @@ int bitmap_resize(struct bitmap *bitmap, sector_t blocks, 
	long pages;

	struct bitmap_page *new_bp;



	if (bitmap->storage.file && !init) {

		pr_info("md: cannot resize file-based bitmap\n");

		return -EINVAL;

	}



	if (chunksize == 0) {

		/* If there is enough space, leave the chunk size unchanged,

		 * else increase by factor of two until there is enough space.
@@ -2118,7 +2123,7 @@ int bitmap_resize(struct bitmap *bitmap, sector_t blocks, 
	if (store.sb_page && bitmap->storage.sb_page)

		memcpy(page_address(store.sb_page),

		       page_address(bitmap->storage.sb_page),

		       sizeof(bitmap_super_t));

		       PAGE_SIZE);

	bitmap_file_unmap(&bitmap->storage);

	bitmap->storage = store;

drivers/md/md.c

+16 −4
Original line number Diff line number Diff line
@@ -1538,7 +1538,8 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_ 
	} else if (sb->bblog_offset != 0)

		rdev->badblocks.shift = 0;



	if (le32_to_cpu(sb->feature_map) & MD_FEATURE_PPL) {

	if ((le32_to_cpu(sb->feature_map) &

	    (MD_FEATURE_PPL | MD_FEATURE_MULTIPLE_PPLS))) {

		rdev->ppl.offset = (__s16)le16_to_cpu(sb->ppl.offset);

		rdev->ppl.size = le16_to_cpu(sb->ppl.size);

		rdev->ppl.sector = rdev->sb_start + rdev->ppl.offset;
@@ -1657,10 +1658,15 @@ static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev) 
		if (le32_to_cpu(sb->feature_map) & MD_FEATURE_JOURNAL)

			set_bit(MD_HAS_JOURNAL, &mddev->flags);



		if (le32_to_cpu(sb->feature_map) & MD_FEATURE_PPL) {

		if (le32_to_cpu(sb->feature_map) &

		    (MD_FEATURE_PPL | MD_FEATURE_MULTIPLE_PPLS)) {

			if (le32_to_cpu(sb->feature_map) &

			    (MD_FEATURE_BITMAP_OFFSET | MD_FEATURE_JOURNAL))

				return -EINVAL;

			if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_PPL) &&

			    (le32_to_cpu(sb->feature_map) &

					    MD_FEATURE_MULTIPLE_PPLS))

				return -EINVAL;

			set_bit(MD_HAS_PPL, &mddev->flags);

		}

	} else if (mddev->pers == NULL) {
@@ -1877,6 +1883,10 @@ retry: 
		sb->feature_map |= cpu_to_le32(MD_FEATURE_JOURNAL);



	if (test_bit(MD_HAS_PPL, &mddev->flags)) {

		if (test_bit(MD_HAS_MULTIPLE_PPLS, &mddev->flags))

			sb->feature_map |=

			    cpu_to_le32(MD_FEATURE_MULTIPLE_PPLS);

		else

			sb->feature_map |= cpu_to_le32(MD_FEATURE_PPL);

		sb->ppl.offset = cpu_to_le16(rdev->ppl.offset);

		sb->ppl.size = cpu_to_le16(rdev->ppl.size);
@@ -4285,6 +4295,8 @@ new_dev_store(struct mddev *mddev, const char *buf, size_t len) 
	if (err)

		export_rdev(rdev);

	mddev_unlock(mddev);

	if (!err)

		md_new_event(mddev);

	return err ? err : len;

}
@@ -7838,7 +7850,7 @@ static const struct file_operations md_seq_fops = { 
	.open           = md_seq_open,

	.read           = seq_read,

	.llseek         = seq_lseek,

	.release	= seq_release_private,

	.release	= seq_release,

	.poll		= mdstat_poll,

};

drivers/md/md.h

+1 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ enum mddev_flags { 
				 * never cause the array to become failed.

				 */

	MD_HAS_PPL,		/* The raid array has PPL feature set */

	MD_HAS_MULTIPLE_PPLS,	/* The raid array has multiple PPLs feature set */

};



enum mddev_sb_flags {

drivers/md/raid0.c

+3 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ 
	((1L << MD_HAS_JOURNAL) |	\

	 (1L << MD_JOURNAL_CLEAN) |	\

	 (1L << MD_FAILFAST_SUPPORTED) |\

	 (1L << MD_HAS_PPL))

	 (1L << MD_HAS_PPL) |		\

	 (1L << MD_HAS_MULTIPLE_PPLS))



static int raid0_congested(struct mddev *mddev, int bits)

{
@@ -539,6 +540,7 @@ static void raid0_handle_discard(struct mddev *mddev, struct bio *bio) 
		    !discard_bio)

			continue;

		bio_chain(discard_bio, bio);

		bio_clone_blkcg_association(discard_bio, bio);

		if (mddev->gendisk)

			trace_block_bio_remap(bdev_get_queue(rdev->bdev),

				discard_bio, disk_devt(mddev->gendisk),

CRA Git | Maintained and supported by SUSTech CRA and CCSE