Commit 60268940 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-5.6-rc8' of git://github.com/ceph/ceph-client 

Pull ceph fixes from Ilya Dryomov:
 "A patch for a rather old regression in fullness handling and two
  memory leak fixes, marked for stable"

* tag 'ceph-for-5.6-rc8' of git://github.com/ceph/ceph-client:
  ceph: fix memory leak in ceph_cleanup_snapid_map()
  libceph: fix alloc_msg_with_page_vector() memory leaks
  ceph: check POOL_FLAG_FULL/NEARFULL in addition to OSDMAP_FULL/NEARFULL
parents a53071bd c8d6ee01

fs/ceph/file.c

+11 −3
Original line number Diff line number Diff line
@@ -1415,10 +1415,13 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	struct inode *inode = file_inode(file);

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);

	struct ceph_osd_client *osdc = &fsc->client->osdc;

	struct ceph_cap_flush *prealloc_cf;

	ssize_t count, written = 0;

	int err, want, got;

	bool direct_lock = false;

	u32 map_flags;

	u64 pool_flags;

	loff_t pos;

	loff_t limit = max(i_size_read(inode), fsc->max_file_size);
@@ -1481,8 +1484,12 @@ retry_snap: 
			goto out;

	}



	/* FIXME: not complete since it doesn't account for being at quota */

	if (ceph_osdmap_flag(&fsc->client->osdc, CEPH_OSDMAP_FULL)) {

	down_read(&osdc->lock);

	map_flags = osdc->osdmap->flags;

	pool_flags = ceph_pg_pool_flags(osdc->osdmap, ci->i_layout.pool_id);

	up_read(&osdc->lock);

	if ((map_flags & CEPH_OSDMAP_FULL) ||

	    (pool_flags & CEPH_POOL_FLAG_FULL)) {

		err = -ENOSPC;

		goto out;

	}
@@ -1575,7 +1582,8 @@ retry_snap: 
	}



	if (written >= 0) {

		if (ceph_osdmap_flag(&fsc->client->osdc, CEPH_OSDMAP_NEARFULL))

		if ((map_flags & CEPH_OSDMAP_NEARFULL) ||

		    (pool_flags & CEPH_POOL_FLAG_NEARFULL))

			iocb->ki_flags |= IOCB_DSYNC;

		written = generic_write_sync(iocb, written);

	}

fs/ceph/snap.c

+1 −0
Original line number Diff line number Diff line
@@ -1155,5 +1155,6 @@ void ceph_cleanup_snapid_map(struct ceph_mds_client *mdsc) 
			pr_err("snapid map %llx -> %x still in use\n",

			       sm->snap, sm->dev);

		}

		kfree(sm);

	}

}

include/linux/ceph/messenger.h

+4 −3
Original line number Diff line number Diff line
@@ -175,9 +175,10 @@ struct ceph_msg_data { 
#endif /* CONFIG_BLOCK */

		struct ceph_bvec_iter	bvec_pos;

		struct {

			struct page	**pages;	/* NOT OWNER. */

			struct page	**pages;

			size_t		length;		/* total # bytes */

			unsigned int	alignment;	/* first page */

			bool		own_pages;

		};

		struct ceph_pagelist	*pagelist;

	};
@@ -356,8 +357,8 @@ extern void ceph_con_keepalive(struct ceph_connection *con); 
extern bool ceph_con_keepalive_expired(struct ceph_connection *con,

				       unsigned long interval);



extern void ceph_msg_data_add_pages(struct ceph_msg *msg, struct page **pages,

				size_t length, size_t alignment);

void ceph_msg_data_add_pages(struct ceph_msg *msg, struct page **pages,

			     size_t length, size_t alignment, bool own_pages);

extern void ceph_msg_data_add_pagelist(struct ceph_msg *msg,

				struct ceph_pagelist *pagelist);

#ifdef CONFIG_BLOCK

include/linux/ceph/osdmap.h

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ int ceph_spg_compare(const struct ceph_spg *lhs, const struct ceph_spg *rhs); 
#define CEPH_POOL_FLAG_HASHPSPOOL	(1ULL << 0) /* hash pg seed and pool id

						       together */

#define CEPH_POOL_FLAG_FULL		(1ULL << 1) /* pool is full */

#define CEPH_POOL_FLAG_FULL_QUOTA	(1ULL << 10) /* pool ran out of quota,

							will set FULL too */

#define CEPH_POOL_FLAG_NEARFULL		(1ULL << 11) /* pool is nearfull */



struct ceph_pg_pool_info {

	struct rb_node node;
@@ -304,5 +307,6 @@ extern struct ceph_pg_pool_info *ceph_pg_pool_by_id(struct ceph_osdmap *map, 


extern const char *ceph_pg_pool_name_by_id(struct ceph_osdmap *map, u64 id);

extern int ceph_pg_poolid_by_name(struct ceph_osdmap *map, const char *name);

u64 ceph_pg_pool_flags(struct ceph_osdmap *map, u64 id);



#endif

include/linux/ceph/rados.h

+4 −2
Original line number Diff line number Diff line
@@ -143,8 +143,10 @@ extern const char *ceph_osd_state_name(int s); 
/*

 * osd map flag bits

 */

#define CEPH_OSDMAP_NEARFULL (1<<0)  /* sync writes (near ENOSPC) */

#define CEPH_OSDMAP_FULL     (1<<1)  /* no data writes (ENOSPC) */

#define CEPH_OSDMAP_NEARFULL (1<<0)  /* sync writes (near ENOSPC),

					not set since ~luminous */

#define CEPH_OSDMAP_FULL     (1<<1)  /* no data writes (ENOSPC),

					not set since ~luminous */

#define CEPH_OSDMAP_PAUSERD  (1<<2)  /* pause all reads */

#define CEPH_OSDMAP_PAUSEWR  (1<<3)  /* pause all writes */

#define CEPH_OSDMAP_PAUSEREC (1<<4)  /* pause recovery */

CRA Git | Maintained and supported by SUSTech CRA and CCSE