Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa187926 authored by Yan, Zheng's avatar Yan, Zheng Committed by Ilya Dryomov
Browse files

ceph: limit osd read size to CEPH_MSG_MAX_DATA_LEN 

libceph returns -EIO when read size > CEPH_MSG_MAX_DATA_LEN.

Link: http://tracker.ceph.com/issues/20528


Signed-off-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 2ae409dc

fs/ceph/addr.c

+3 −7
Original line number Diff line number Diff line
@@ -455,13 +455,9 @@ static int ceph_readpages(struct file *file, struct address_space *mapping, 
	if (rc == 0)

		goto out;



	if (fsc->mount_options->rsize >= PAGE_SIZE)

		max = (fsc->mount_options->rsize + PAGE_SIZE - 1)

			>> PAGE_SHIFT;



	dout("readpages %p file %p nr_pages %d max %d\n", inode,

		file, nr_pages,

	     max);

	max = fsc->mount_options->rsize >> PAGE_SHIFT;

	dout("readpages %p file %p nr_pages %d max %d\n",

	     inode, file, nr_pages, max);

	while (!list_empty(page_list)) {

		rc = start_read(inode, page_list, max);

		if (rc < 0)

fs/ceph/file.c

+3 −0
Original line number Diff line number Diff line
@@ -887,6 +887,9 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter, 
			break;

		}



		if (!write)

			size = min_t(u64, size, fsc->mount_options->rsize);



		len = size;

		pages = dio_get_pages_alloc(iter, len, &start, &num_pages);

		if (IS_ERR(pages)) {

fs/ceph/super.c

+7 −10
Original line number Diff line number Diff line
@@ -236,7 +236,9 @@ static int parse_fsopt_token(char *c, void *private) 
		fsopt->wsize = intval;

		break;

	case Opt_rsize:

		fsopt->rsize = intval;

		if (intval < PAGE_SIZE || intval > CEPH_MAX_READ_SIZE)

			return -EINVAL;

		fsopt->rsize = ALIGN(intval, PAGE_SIZE);

		break;

	case Opt_rasize:

		fsopt->rasize = intval;
@@ -390,7 +392,7 @@ static int parse_mount_options(struct ceph_mount_options **pfsopt, 
	fsopt->sb_flags = flags;

	fsopt->flags = CEPH_MOUNT_OPT_DEFAULT;



	fsopt->rsize = CEPH_RSIZE_DEFAULT;

	fsopt->rsize = CEPH_MAX_READ_SIZE;

	fsopt->rasize = CEPH_RASIZE_DEFAULT;

	fsopt->snapdir_name = kstrdup(CEPH_SNAPDIRNAME_DEFAULT, GFP_KERNEL);

	if (!fsopt->snapdir_name) {
@@ -505,7 +507,7 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root) 
		seq_printf(m, ",mds_namespace=%s", fsopt->mds_namespace);

	if (fsopt->wsize)

		seq_printf(m, ",wsize=%d", fsopt->wsize);

	if (fsopt->rsize != CEPH_RSIZE_DEFAULT)

	if (fsopt->rsize != CEPH_MAX_READ_SIZE)

		seq_printf(m, ",rsize=%d", fsopt->rsize);

	if (fsopt->rasize != CEPH_RASIZE_DEFAULT)

		seq_printf(m, ",rasize=%d", fsopt->rasize);
@@ -948,13 +950,8 @@ static int ceph_setup_bdi(struct super_block *sb, struct ceph_fs_client *fsc) 
	else

		sb->s_bdi->ra_pages = VM_MAX_READAHEAD * 1024 / PAGE_SIZE;



	if (fsc->mount_options->rsize > fsc->mount_options->rasize &&

	    fsc->mount_options->rsize >= PAGE_SIZE)

		sb->s_bdi->io_pages =

			(fsc->mount_options->rsize + PAGE_SIZE - 1)

			>> PAGE_SHIFT;

	else if (fsc->mount_options->rsize == 0)

		sb->s_bdi->io_pages = ULONG_MAX;

	/* set io_pages based on max osd read size */

	sb->s_bdi->io_pages = fsc->mount_options->rsize >> PAGE_SHIFT;



	return 0;

}

fs/ceph/super.h

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ 
#define ceph_test_mount_opt(fsc, opt) \

	(!!((fsc)->mount_options->flags & CEPH_MOUNT_OPT_##opt))



#define CEPH_RSIZE_DEFAULT              (64*1024*1024) /* max read size */

/* max size of osd read request, limited by libceph */

#define CEPH_MAX_READ_SIZE              CEPH_MSG_MAX_DATA_LEN

#define CEPH_RASIZE_DEFAULT             (8192*1024)    /* max readahead */

#define CEPH_MAX_READDIR_DEFAULT        1024

#define CEPH_MAX_READDIR_BYTES_DEFAULT  (512*1024)