Commit 7c2a69f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-5.9-rc1' of git://github.com/ceph/ceph-client 

Pull ceph updates from Ilya Dryomov:
 "Xiubo has completed his work on filesystem client metrics, they are
  sent to all available MDSes once per second now.

  Other than that, we have a lot of fixes and cleanups all around the
  filesystem, including a tweak to cut down on MDS request resends in
  multi-MDS setups from Yanhu and fixups for SELinux symlink labeling
  and MClientSession message decoding from Jeff"

* tag 'ceph-for-5.9-rc1' of git://github.com/ceph/ceph-client: (22 commits)
  ceph: handle zero-length feature mask in session messages
  ceph: use frag's MDS in either mode
  ceph: move sb->wb_pagevec_pool to be a global mempool
  ceph: set sec_context xattr on symlink creation
  ceph: remove redundant initialization of variable mds
  ceph: fix use-after-free for fsc->mdsc
  ceph: remove unused variables in ceph_mdsmap_decode()
  ceph: delete repeated words in fs/ceph/
  ceph: send client provided metric flags in client metadata
  ceph: periodically send perf metrics to MDSes
  ceph: check the sesion state and return false in case it is closed
  libceph: replace HTTP links with HTTPS ones
  ceph: remove unnecessary cast in kfree()
  libceph: just have osd_req_op_init() return a pointer
  ceph: do not access the kiocb after aio requests
  ceph: clean up and optimize ceph_check_delayed_caps()
  ceph: fix potential mdsc use-after-free crash
  ceph: switch to WARN_ON_ONCE in encode_supported_features()
  ceph: add global total_caps to count the mdsc's total caps number
  ceph: add check_session_state() helper and make it global
  ...
parents 7a02c8d4 02e37571

fs/ceph/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ config CEPH_FS 
	  scalable file system designed to provide high performance,

	  reliable access to petabytes of storage.



	  More information at http://ceph.newdream.net/.

	  More information at https://ceph.io/.



	  If unsure, say N.

fs/ceph/addr.c

+11 −12
Original line number Diff line number Diff line
@@ -862,8 +862,7 @@ static void writepages_finish(struct ceph_osd_request *req) 


	osd_data = osd_req_op_extent_osd_data(req, 0);

	if (osd_data->pages_from_pool)

		mempool_free(osd_data->pages,

			     ceph_sb_to_client(inode->i_sb)->wb_pagevec_pool);

		mempool_free(osd_data->pages, ceph_wb_pagevec_pool);

	else

		kfree(osd_data->pages);

	ceph_osdc_put_request(req);
@@ -955,10 +954,10 @@ retry: 
		int num_ops = 0, op_idx;

		unsigned i, pvec_pages, max_pages, locked_pages = 0;

		struct page **pages = NULL, **data_pages;

		mempool_t *pool = NULL;	/* Becomes non-null if mempool used */

		struct page *page;

		pgoff_t strip_unit_end = 0;

		u64 offset = 0, len = 0;

		bool from_pool = false;



		max_pages = wsize >> PAGE_SHIFT;
@@ -1057,15 +1056,15 @@ get_more_pages: 
						      sizeof(*pages),

						      GFP_NOFS);

				if (!pages) {

					pool = fsc->wb_pagevec_pool;

					pages = mempool_alloc(pool, GFP_NOFS);

					from_pool = true;

					pages = mempool_alloc(ceph_wb_pagevec_pool, GFP_NOFS);

					BUG_ON(!pages);

				}



				len = 0;

			} else if (page->index !=

				   (offset + len) >> PAGE_SHIFT) {

				if (num_ops >= (pool ?  CEPH_OSD_SLAB_OPS :

				if (num_ops >= (from_pool ?  CEPH_OSD_SLAB_OPS :

							     CEPH_OSD_MAX_OPS)) {

					redirty_page_for_writepage(wbc, page);

					unlock_page(page);
@@ -1161,7 +1160,7 @@ new_request: 
				     offset, len);

				osd_req_op_extent_osd_data_pages(req, op_idx,

							data_pages, len, 0,

							!!pool, false);

							from_pool, false);

				osd_req_op_extent_update(req, op_idx, len);



				len = 0;
@@ -1188,12 +1187,12 @@ new_request: 
		dout("writepages got pages at %llu~%llu\n", offset, len);



		osd_req_op_extent_osd_data_pages(req, op_idx, data_pages, len,

						 0, !!pool, false);

						 0, from_pool, false);

		osd_req_op_extent_update(req, op_idx, len);



		BUG_ON(op_idx + 1 != req->r_num_ops);



		pool = NULL;

		from_pool = false;

		if (i < locked_pages) {

			BUG_ON(num_ops <= req->r_num_ops);

			num_ops -= req->r_num_ops;
@@ -1204,8 +1203,8 @@ new_request: 
			pages = kmalloc_array(locked_pages, sizeof(*pages),

					      GFP_NOFS);

			if (!pages) {

				pool = fsc->wb_pagevec_pool;

				pages = mempool_alloc(pool, GFP_NOFS);

				from_pool = true;

				pages = mempool_alloc(ceph_wb_pagevec_pool, GFP_NOFS);

				BUG_ON(!pages);

			}

			memcpy(pages, data_pages + i,

fs/ceph/caps.c

+6 −6
Original line number Diff line number Diff line
@@ -668,6 +668,7 @@ void ceph_add_cap(struct inode *inode, 
		spin_lock(&session->s_cap_lock);

		list_add_tail(&cap->session_caps, &session->s_caps);

		session->s_nr_caps++;

		atomic64_inc(&mdsc->metric.total_caps);

		spin_unlock(&session->s_cap_lock);

	} else {

		spin_lock(&session->s_cap_lock);
@@ -1161,6 +1162,7 @@ void __ceph_remove_cap(struct ceph_cap *cap, bool queue_release) 
	} else {

		list_del_init(&cap->session_caps);

		session->s_nr_caps--;

		atomic64_dec(&mdsc->metric.total_caps);

		cap->session = NULL;

		removed = 1;

	}
@@ -4187,10 +4189,8 @@ void ceph_check_delayed_caps(struct ceph_mds_client *mdsc) 
	struct ceph_inode_info *ci;



	dout("check_delayed_caps\n");

	while (1) {

	spin_lock(&mdsc->cap_delay_lock);

		if (list_empty(&mdsc->cap_delay_list))

			break;

	while (!list_empty(&mdsc->cap_delay_list)) {

		ci = list_first_entry(&mdsc->cap_delay_list,

				      struct ceph_inode_info,

				      i_cap_delay_list);
@@ -4200,13 +4200,13 @@ void ceph_check_delayed_caps(struct ceph_mds_client *mdsc) 
		list_del_init(&ci->i_cap_delay_list);



		inode = igrab(&ci->vfs_inode);

		spin_unlock(&mdsc->cap_delay_lock);



		if (inode) {

			spin_unlock(&mdsc->cap_delay_lock);

			dout("check_delayed_caps on %p\n", inode);

			ceph_check_caps(ci, 0, NULL);

			/* avoid calling iput_final() in tick thread */

			ceph_async_iput(inode);

			spin_lock(&mdsc->cap_delay_lock);

		}

	}

	spin_unlock(&mdsc->cap_delay_lock);

fs/ceph/debugfs.c

+3 −13
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static int metric_show(struct seq_file *s, void *p) 
	struct ceph_fs_client *fsc = s->private;

	struct ceph_mds_client *mdsc = fsc->mdsc;

	struct ceph_client_metric *m = &mdsc->metric;

	int i, nr_caps = 0;

	int nr_caps = 0;

	s64 total, sum, avg, min, max, sq;



	seq_printf(s, "item          total       avg_lat(us)     min_lat(us)     max_lat(us)     stdev(us)\n");
@@ -190,17 +190,7 @@ static int metric_show(struct seq_file *s, void *p) 
		   percpu_counter_sum(&m->d_lease_mis),

		   percpu_counter_sum(&m->d_lease_hit));



	mutex_lock(&mdsc->mutex);

	for (i = 0; i < mdsc->max_sessions; i++) {

		struct ceph_mds_session *s;



		s = __ceph_lookup_mds_session(mdsc, i);

		if (!s)

			continue;

		nr_caps += s->s_nr_caps;

		ceph_put_mds_session(s);

	}

	mutex_unlock(&mdsc->mutex);

	nr_caps = atomic64_read(&m->total_caps);

	seq_printf(s, "%-14s%-16d%-16lld%lld\n", "caps", nr_caps,

		   percpu_counter_sum(&m->i_caps_mis),

		   percpu_counter_sum(&m->i_caps_hit));
@@ -272,7 +262,7 @@ static int mds_sessions_show(struct seq_file *s, void *ptr) 
	struct ceph_mds_client *mdsc = fsc->mdsc;

	struct ceph_auth_client *ac = fsc->client->monc.auth;

	struct ceph_options *opt = fsc->client->options;

	int mds = -1;

	int mds;



	mutex_lock(&mdsc->mutex);

fs/ceph/dir.c

+4 −0
Original line number Diff line number Diff line
@@ -930,6 +930,10 @@ static int ceph_symlink(struct inode *dir, struct dentry *dentry, 
	req->r_num_caps = 2;

	req->r_dentry_drop = CEPH_CAP_FILE_SHARED | CEPH_CAP_AUTH_EXCL;

	req->r_dentry_unless = CEPH_CAP_FILE_EXCL;

	if (as_ctx.pagelist) {

		req->r_pagelist = as_ctx.pagelist;

		as_ctx.pagelist = NULL;

	}

	err = ceph_mdsc_do_request(mdsc, dir, req);

	if (!err && !req->r_reply_info.head->is_dentry)

		err = ceph_handle_notrace_create(dir, dentry);

CRA Git | Maintained and supported by SUSTech CRA and CCSE