Commit 2a5f14f2 authored by Abhi Das's avatar Abhi Das Committed by Andreas Gruenbacher
Browse files

gfs2: read journal in large chunks to locate the head 



Use bio(s) to read in the journal sequentially in large chunks and
locate the head of the journal.

This version addresses the issues Christoph pointed out w.r.t error handling
and using deprecated API.

Signed-off-by: default avatarAbhi Das <adas@redhat.com>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Cc: Christoph Hellwig <hch@infradead.org>
parent 40e0e61e

fs/gfs2/glops.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "util.h"

#include "trans.h"

#include "dir.h"

#include "lops.h"



struct workqueue_struct *gfs2_freeze_wq;

fs/gfs2/log.c

+2 −2
Original line number Diff line number Diff line
@@ -734,7 +734,7 @@ void gfs2_write_log_header(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd, 
	lh->lh_crc = cpu_to_be32(crc);



	gfs2_log_write(sdp, page, sb->s_blocksize, 0, addr);

	gfs2_log_submit_bio(&sdp->sd_log_bio, REQ_OP_WRITE, op_flags);

	gfs2_log_submit_bio(&sdp->sd_log_bio, REQ_OP_WRITE | op_flags);

	log_flush_wait(sdp);

}
@@ -811,7 +811,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags) 


	gfs2_ordered_write(sdp);

	lops_before_commit(sdp, tr);

	gfs2_log_submit_bio(&sdp->sd_log_bio, REQ_OP_WRITE, 0);

	gfs2_log_submit_bio(&sdp->sd_log_bio, REQ_OP_WRITE);



	if (sdp->sd_log_head != sdp->sd_log_flush_head) {

		log_flush_wait(sdp);

fs/gfs2/lops.c

+184 −6
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 
#include <linux/bio.h>

#include <linux/fs.h>

#include <linux/list_sort.h>

#include <linux/blkdev.h>



#include "bmap.h"

#include "dir.h"

#include "gfs2.h"

#include "incore.h"
@@ -193,7 +195,6 @@ static void gfs2_end_log_write_bh(struct gfs2_sbd *sdp, struct bio_vec *bvec, 
/**

 * gfs2_end_log_write - end of i/o to the log

 * @bio: The bio

 * @error: Status of i/o request

 *

 * Each bio_vec contains either data from the pagecache or data

 * relating to the log itself. Here we iterate over the bio_vec
@@ -230,20 +231,19 @@ static void gfs2_end_log_write(struct bio *bio) 
/**

 * gfs2_log_submit_bio - Submit any pending log bio

 * @biop: Address of the bio pointer

 * @op: REQ_OP

 * @op_flags: req_flag_bits

 * @opf: REQ_OP | op_flags

 *

 * Submit any pending part-built or full bio to the block device. If

 * there is no pending bio, then this is a no-op.

 */



void gfs2_log_submit_bio(struct bio **biop, int op, int op_flags)

void gfs2_log_submit_bio(struct bio **biop, int opf)

{

	struct bio *bio = *biop;

	if (bio) {

		struct gfs2_sbd *sdp = bio->bi_private;

		atomic_inc(&sdp->sd_log_in_flight);

		bio_set_op_attrs(bio, op, op_flags);

		bio->bi_opf = opf;

		submit_bio(bio);

		*biop = NULL;

	}
@@ -304,7 +304,7 @@ static struct bio *gfs2_log_get_bio(struct gfs2_sbd *sdp, u64 blkno, 
		nblk >>= sdp->sd_fsb2bb_shift;

		if (blkno == nblk && !flush)

			return bio;

		gfs2_log_submit_bio(biop, op, 0);

		gfs2_log_submit_bio(biop, op);

	}



	*biop = gfs2_log_alloc_bio(sdp, blkno, end_io);
@@ -375,6 +375,184 @@ void gfs2_log_write_page(struct gfs2_sbd *sdp, struct page *page) 
		       gfs2_log_bmap(sdp));

}



/**

 * gfs2_end_log_read - end I/O callback for reads from the log

 * @bio: The bio

 *

 * Simply unlock the pages in the bio. The main thread will wait on them and

 * process them in order as necessary.

 */



static void gfs2_end_log_read(struct bio *bio)

{

	struct page *page;

	struct bio_vec *bvec;

	int i;



	bio_for_each_segment_all(bvec, bio, i) {

		page = bvec->bv_page;

		if (bio->bi_status) {

			int err = blk_status_to_errno(bio->bi_status);



			SetPageError(page);

			mapping_set_error(page->mapping, err);

		}

		unlock_page(page);

	}



	bio_put(bio);

}



/**

 * gfs2_jhead_pg_srch - Look for the journal head in a given page.

 * @jd: The journal descriptor

 * @page: The page to look in

 *

 * Returns: 1 if found, 0 otherwise.

 */



static bool gfs2_jhead_pg_srch(struct gfs2_jdesc *jd,

			      struct gfs2_log_header_host *head,

			      struct page *page)

{

	struct gfs2_sbd *sdp = GFS2_SB(jd->jd_inode);

	struct gfs2_log_header_host uninitialized_var(lh);

	void *kaddr = kmap_atomic(page);

	unsigned int offset;

	bool ret = false;



	for (offset = 0; offset < PAGE_SIZE; offset += sdp->sd_sb.sb_bsize) {

		if (!__get_log_header(sdp, kaddr + offset, 0, &lh)) {

			if (lh.lh_sequence > head->lh_sequence)

				*head = lh;

			else {

				ret = true;

				break;

			}

		}

	}

	kunmap_atomic(kaddr);

	return ret;

}



/**

 * gfs2_jhead_process_page - Search/cleanup a page

 * @jd: The journal descriptor

 * @index: Index of the page to look into

 * @done: If set, perform only cleanup, else search and set if found.

 *

 * Find the page with 'index' in the journal's mapping. Search the page for

 * the journal head if requested (cleanup == false). Release refs on the

 * page so the page cache can reclaim it (put_page() twice). We grabbed a

 * reference on this page two times, first when we did a find_or_create_page()

 * to obtain the page to add it to the bio and second when we do a

 * find_get_page() here to get the page to wait on while I/O on it is being

 * completed.

 * This function is also used to free up a page we might've grabbed but not

 * used. Maybe we added it to a bio, but not submitted it for I/O. Or we

 * submitted the I/O, but we already found the jhead so we only need to drop

 * our references to the page.

 */



static void gfs2_jhead_process_page(struct gfs2_jdesc *jd, unsigned long index,

				    struct gfs2_log_header_host *head,

				    bool *done)

{

	struct page *page;



	page = find_get_page(jd->jd_inode->i_mapping, index);

	wait_on_page_locked(page);



	if (PageError(page))

		*done = true;



	if (!*done)

		*done = gfs2_jhead_pg_srch(jd, head, page);



	put_page(page); /* Once for find_get_page */

	put_page(page); /* Once more for find_or_create_page */

}



/**

 * gfs2_find_jhead - find the head of a log

 * @jd: The journal descriptor

 * @head: The log descriptor for the head of the log is returned here

 *

 * Do a search of a journal by reading it in large chunks using bios and find

 * the valid log entry with the highest sequence number.  (i.e. the log head)

 *

 * Returns: 0 on success, errno otherwise

 */



int gfs2_find_jhead(struct gfs2_jdesc *jd, struct gfs2_log_header_host *head)

{

	struct gfs2_sbd *sdp = GFS2_SB(jd->jd_inode);

	struct address_space *mapping = jd->jd_inode->i_mapping;

	struct gfs2_journal_extent *je;

	u32 block, read_idx = 0, submit_idx = 0, index = 0;

	int shift = PAGE_SHIFT - sdp->sd_sb.sb_bsize_shift;

	int blocks_per_page = 1 << shift, sz, ret = 0;

	struct bio *bio = NULL;

	struct page *page;

	bool done = false;

	errseq_t since;



	memset(head, 0, sizeof(*head));

	if (list_empty(&jd->extent_list))

		gfs2_map_journal_extents(sdp, jd);



	since = filemap_sample_wb_err(mapping);

	list_for_each_entry(je, &jd->extent_list, list) {

		for (block = 0; block < je->blocks; block += blocks_per_page) {

			index = (je->lblock + block) >> shift;



			page = find_or_create_page(mapping, index, GFP_NOFS);

			if (!page) {

				ret = -ENOMEM;

				done = true;

				goto out;

			}



			if (bio) {

				sz = bio_add_page(bio, page, PAGE_SIZE, 0);

				if (sz == PAGE_SIZE)

					goto page_added;

				submit_idx = index;

				submit_bio(bio);

				bio = NULL;

			}



			bio = gfs2_log_alloc_bio(sdp,

						 je->dblock + (index << shift),

						 gfs2_end_log_read);

			bio->bi_opf = REQ_OP_READ;

			sz = bio_add_page(bio, page, PAGE_SIZE, 0);

			gfs2_assert_warn(sdp, sz == PAGE_SIZE);



page_added:

			if (submit_idx <= read_idx + BIO_MAX_PAGES) {

				/* Keep at least one bio in flight */

				continue;

			}



			gfs2_jhead_process_page(jd, read_idx++, head, &done);

			if (done)

				goto out;  /* found */

		}

	}



out:

	if (bio)

		submit_bio(bio);

	while (read_idx <= index)

		gfs2_jhead_process_page(jd, read_idx++, head, &done);



	if (!ret)

		ret = filemap_check_wb_err(mapping, since);



	return ret;

}



static struct page *gfs2_get_log_desc(struct gfs2_sbd *sdp, u32 ld_type,

				      u32 ld_length, u32 ld_data1)

{

fs/gfs2/lops.h

+3 −1
Original line number Diff line number Diff line
@@ -30,8 +30,10 @@ extern u64 gfs2_log_bmap(struct gfs2_sbd *sdp); 
extern void gfs2_log_write(struct gfs2_sbd *sdp, struct page *page,

			   unsigned size, unsigned offset, u64 blkno);

extern void gfs2_log_write_page(struct gfs2_sbd *sdp, struct page *page);

extern void gfs2_log_submit_bio(struct bio **biop, int op, int op_flags);

extern void gfs2_log_submit_bio(struct bio **biop, int opf);

extern void gfs2_pin(struct gfs2_sbd *sdp, struct buffer_head *bh);

extern int gfs2_find_jhead(struct gfs2_jdesc *jd,

			   struct gfs2_log_header_host *head);



static inline unsigned int buf_limit(struct gfs2_sbd *sdp)

{

fs/gfs2/ops_fstype.c

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include "dir.h"

#include "meta_io.h"

#include "trace_gfs2.h"

#include "lops.h"



#define DO 0

#define UNDO 1

CRA Git | Maintained and supported by SUSTech CRA and CCSE