md/r5cache: handle R5LOG_PAYLOAD_FLUSH in recovery (2d4f4687) · Commits · 戴 / test

drivers/md/raid5-cache.c

+41 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1959,6 +1959,7 @@ r5l_recovery_verify_data_checksum_for_mb(struct r5l_log *log,
	sector_t log_offset = r5l_ring_add(log, ctx->pos, BLOCK_SECTORS);		sector_t log_offset = r5l_ring_add(log, ctx->pos, BLOCK_SECTORS);
	struct page *page;		struct page *page;
	struct r5l_payload_data_parity *payload;		struct r5l_payload_data_parity *payload;
			struct r5l_payload_flush *payload_flush;

	page = alloc_page(GFP_KERNEL);		page = alloc_page(GFP_KERNEL);
	if (!page)		if (!page)
	@@ -1966,6 +1967,7 @@ r5l_recovery_verify_data_checksum_for_mb(struct r5l_log *log,

	while (mb_offset < le32_to_cpu(mb->meta_size)) {		while (mb_offset < le32_to_cpu(mb->meta_size)) {
	payload = (void *)mb + mb_offset;		payload = (void *)mb + mb_offset;
			payload_flush = (void *)mb + mb_offset;

	if (payload->header.type == R5LOG_PAYLOAD_DATA) {		if (payload->header.type == R5LOG_PAYLOAD_DATA) {
	if (r5l_recovery_verify_data_checksum(		if (r5l_recovery_verify_data_checksum(
	@@ -1984,17 +1986,25 @@ r5l_recovery_verify_data_checksum_for_mb(struct r5l_log *log,
	BLOCK_SECTORS),		BLOCK_SECTORS),
	payload->checksum[1]) < 0)		payload->checksum[1]) < 0)
	goto mismatch;		goto mismatch;
	} else /* not R5LOG_PAYLOAD_DATA or R5LOG_PAYLOAD_PARITY */		} else if (payload->header.type == R5LOG_PAYLOAD_FLUSH) {
			/* nothing to do for R5LOG_PAYLOAD_FLUSH here */
			} else /* not R5LOG_PAYLOAD_DATA/PARITY/FLUSH */
	goto mismatch;		goto mismatch;

			if (payload->header.type == R5LOG_PAYLOAD_FLUSH) {
			mb_offset += sizeof(struct r5l_payload_flush) +
			le32_to_cpu(payload_flush->size);
			} else {
			/* DATA or PARITY payload */
	log_offset = r5l_ring_add(log, log_offset,		log_offset = r5l_ring_add(log, log_offset,
	le32_to_cpu(payload->size));		le32_to_cpu(payload->size));

	mb_offset += sizeof(struct r5l_payload_data_parity) +		mb_offset += sizeof(struct r5l_payload_data_parity) +
	sizeof(__le32) *		sizeof(__le32) *
	(le32_to_cpu(payload->size) >> (PAGE_SHIFT - 9));		(le32_to_cpu(payload->size) >> (PAGE_SHIFT - 9));
	}		}

			}

	put_page(page);		put_page(page);
	return 0;		return 0;

	@@ -2020,6 +2030,7 @@ r5c_recovery_analyze_meta_block(struct r5l_log *log,
	struct r5conf *conf = mddev->private;		struct r5conf *conf = mddev->private;
	struct r5l_meta_block *mb;		struct r5l_meta_block *mb;
	struct r5l_payload_data_parity *payload;		struct r5l_payload_data_parity *payload;
			struct r5l_payload_flush *payload_flush;
	int mb_offset;		int mb_offset;
	sector_t log_offset;		sector_t log_offset;
	sector_t stripe_sect;		sector_t stripe_sect;
	@@ -2045,6 +2056,30 @@ r5c_recovery_analyze_meta_block(struct r5l_log *log,
	int dd;		int dd;

	payload = (void *)mb + mb_offset;		payload = (void *)mb + mb_offset;
			payload_flush = (void *)mb + mb_offset;

			if (payload->header.type == R5LOG_PAYLOAD_FLUSH) {
			int i, count;

			count = le32_to_cpu(payload_flush->size) / sizeof(__le64);
			for (i = 0; i < count; ++i) {
			stripe_sect = le64_to_cpu(payload_flush->flush_stripes[i]);
			sh = r5c_recovery_lookup_stripe(cached_stripe_list,
			stripe_sect);
			if (sh) {
			WARN_ON(test_bit(STRIPE_R5C_CACHING, &sh->state));
			r5l_recovery_reset_stripe(sh);
			list_del_init(&sh->lru);
			raid5_release_stripe(sh);
			}
			}

			mb_offset += sizeof(struct r5l_payload_flush) +
			le32_to_cpu(payload_flush->size);
			continue;
			}

			/* DATA or PARITY payload */
	stripe_sect = (payload->header.type == R5LOG_PAYLOAD_DATA) ?		stripe_sect = (payload->header.type == R5LOG_PAYLOAD_DATA) ?
	raid5_compute_sector(		raid5_compute_sector(
	conf, le64_to_cpu(payload->location), 0, &dd,		conf, le64_to_cpu(payload->location), 0, &dd,

Admin message