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

Commit 6fa9bffb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client 

Pull Ceph fixes from Sage Weil:
 "There is a lifecycle fix in the auth code, a fix for a narrow race
  condition on map, and a helpful message in the log when there is a
  feature mismatch (which happens frequently now that the default
  server-side options have changed)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: report unsupported features to syslog
  rbd: fix rbd map vs notify races
  libceph: make authorizer destruction independent of ceph_auth_client
parents cf681c2e d3767f0f

drivers/block/rbd.c

+25 −27
Original line number Diff line number Diff line
@@ -538,7 +538,6 @@ static int _rbd_dev_v2_snap_size(struct rbd_device *rbd_dev, u64 snap_id, 
				u8 *order, u64 *snap_size);

static int _rbd_dev_v2_snap_features(struct rbd_device *rbd_dev, u64 snap_id,

		u64 *snap_features);

static u64 rbd_snap_id_by_name(struct rbd_device *rbd_dev, const char *name);



static int rbd_open(struct block_device *bdev, fmode_t mode)

{
@@ -3127,9 +3126,6 @@ static void rbd_watch_cb(u64 ver, u64 notify_id, u8 opcode, void *data) 
	struct rbd_device *rbd_dev = (struct rbd_device *)data;

	int ret;



	if (!rbd_dev)

		return;



	dout("%s: \"%s\" notify_id %llu opcode %u\n", __func__,

		rbd_dev->header_name, (unsigned long long)notify_id,

		(unsigned int)opcode);
@@ -3263,6 +3259,9 @@ static void rbd_dev_header_unwatch_sync(struct rbd_device *rbd_dev) 


	ceph_osdc_cancel_event(rbd_dev->watch_event);

	rbd_dev->watch_event = NULL;



	dout("%s flushing notifies\n", __func__);

	ceph_osdc_flush_notifies(&rbd_dev->rbd_client->client->osdc);

}



/*
@@ -3642,21 +3641,14 @@ static void rbd_exists_validate(struct rbd_device *rbd_dev) 
static void rbd_dev_update_size(struct rbd_device *rbd_dev)

{

	sector_t size;

	bool removing;



	/*

	 * Don't hold the lock while doing disk operations,

	 * or lock ordering will conflict with the bdev mutex via:

	 * rbd_add() -> blkdev_get() -> rbd_open()

	 * If EXISTS is not set, rbd_dev->disk may be NULL, so don't

	 * try to update its size.  If REMOVING is set, updating size

	 * is just useless work since the device can't be opened.

	 */

	spin_lock_irq(&rbd_dev->lock);

	removing = test_bit(RBD_DEV_FLAG_REMOVING, &rbd_dev->flags);

	spin_unlock_irq(&rbd_dev->lock);

	/*

	 * If the device is being removed, rbd_dev->disk has

	 * been destroyed, so don't try to update its size

	 */

	if (!removing) {

	if (test_bit(RBD_DEV_FLAG_EXISTS, &rbd_dev->flags) &&

	    !test_bit(RBD_DEV_FLAG_REMOVING, &rbd_dev->flags)) {

		size = (sector_t)rbd_dev->mapping.size / SECTOR_SIZE;

		dout("setting size to %llu sectors", (unsigned long long)size);

		set_capacity(rbd_dev->disk, size);
@@ -4191,7 +4183,7 @@ static int _rbd_dev_v2_snap_features(struct rbd_device *rbd_dev, u64 snap_id, 
		__le64 features;

		__le64 incompat;

	} __attribute__ ((packed)) features_buf = { 0 };

	u64 incompat;

	u64 unsup;

	int ret;



	ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
@@ -4204,9 +4196,12 @@ static int _rbd_dev_v2_snap_features(struct rbd_device *rbd_dev, u64 snap_id, 
	if (ret < sizeof (features_buf))

		return -ERANGE;



	incompat = le64_to_cpu(features_buf.incompat);

	if (incompat & ~RBD_FEATURES_SUPPORTED)

	unsup = le64_to_cpu(features_buf.incompat) & ~RBD_FEATURES_SUPPORTED;

	if (unsup) {

		rbd_warn(rbd_dev, "image uses unsupported features: 0x%llx",

			 unsup);

		return -ENXIO;

	}



	*snap_features = le64_to_cpu(features_buf.features);
@@ -5187,6 +5182,10 @@ static int rbd_dev_probe_parent(struct rbd_device *rbd_dev, int depth) 
	return ret;

}



/*

 * rbd_dev->header_rwsem must be locked for write and will be unlocked

 * upon return.

 */

static int rbd_dev_device_setup(struct rbd_device *rbd_dev)

{

	int ret;
@@ -5195,7 +5194,7 @@ static int rbd_dev_device_setup(struct rbd_device *rbd_dev) 


	ret = rbd_dev_id_get(rbd_dev);

	if (ret)

		return ret;

		goto err_out_unlock;



	BUILD_BUG_ON(DEV_NAME_LEN

			< sizeof (RBD_DRV_NAME) + MAX_INT_FORMAT_WIDTH);
@@ -5236,8 +5235,9 @@ static int rbd_dev_device_setup(struct rbd_device *rbd_dev) 
	/* Everything's ready.  Announce the disk to the world. */



	set_bit(RBD_DEV_FLAG_EXISTS, &rbd_dev->flags);

	add_disk(rbd_dev->disk);

	up_write(&rbd_dev->header_rwsem);



	add_disk(rbd_dev->disk);

	pr_info("%s: added with size 0x%llx\n", rbd_dev->disk->disk_name,

		(unsigned long long) rbd_dev->mapping.size);
@@ -5252,6 +5252,8 @@ static int rbd_dev_device_setup(struct rbd_device *rbd_dev) 
		unregister_blkdev(rbd_dev->major, rbd_dev->name);

err_out_id:

	rbd_dev_id_put(rbd_dev);

err_out_unlock:

	up_write(&rbd_dev->header_rwsem);

	return ret;

}
@@ -5442,6 +5444,7 @@ static ssize_t do_rbd_add(struct bus_type *bus, 
	spec = NULL;		/* rbd_dev now owns this */

	rbd_opts = NULL;	/* rbd_dev now owns this */



	down_write(&rbd_dev->header_rwsem);

	rc = rbd_dev_image_probe(rbd_dev, 0);

	if (rc < 0)

		goto err_out_rbd_dev;
@@ -5471,6 +5474,7 @@ static ssize_t do_rbd_add(struct bus_type *bus, 
	return rc;



err_out_rbd_dev:

	up_write(&rbd_dev->header_rwsem);

	rbd_dev_destroy(rbd_dev);

err_out_client:

	rbd_put_client(rbdc);
@@ -5577,12 +5581,6 @@ static ssize_t do_rbd_remove(struct bus_type *bus, 
		return ret;



	rbd_dev_header_unwatch_sync(rbd_dev);

	/*

	 * flush remaining watch callbacks - these must be complete

	 * before the osd_client is shutdown

	 */

	dout("%s: flushing notifies", __func__);

	ceph_osdc_flush_notifies(&rbd_dev->rbd_client->client->osdc);



	/*

	 * Don't free anything from rbd_dev->disk until after all

fs/ceph/mds_client.c

+2 −4
Original line number Diff line number Diff line
@@ -386,9 +386,7 @@ void ceph_put_mds_session(struct ceph_mds_session *s) 
	     atomic_read(&s->s_ref), atomic_read(&s->s_ref)-1);

	if (atomic_dec_and_test(&s->s_ref)) {

		if (s->s_auth.authorizer)

			ceph_auth_destroy_authorizer(

				s->s_mdsc->fsc->client->monc.auth,

				s->s_auth.authorizer);

			ceph_auth_destroy_authorizer(s->s_auth.authorizer);

		kfree(s);

	}

}
@@ -3900,7 +3898,7 @@ static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con, 
	struct ceph_auth_handshake *auth = &s->s_auth;



	if (force_new && auth->authorizer) {

		ceph_auth_destroy_authorizer(ac, auth->authorizer);

		ceph_auth_destroy_authorizer(auth->authorizer);

		auth->authorizer = NULL;

	}

	if (!auth->authorizer) {

include/linux/ceph/auth.h

+5 −5
Original line number Diff line number Diff line
@@ -12,9 +12,12 @@ 
 */



struct ceph_auth_client;

struct ceph_authorizer;

struct ceph_msg;



struct ceph_authorizer {

	void (*destroy)(struct ceph_authorizer *);

};



struct ceph_auth_handshake {

	struct ceph_authorizer *authorizer;

	void *authorizer_buf;
@@ -62,8 +65,6 @@ struct ceph_auth_client_ops { 
				 struct ceph_auth_handshake *auth);

	int (*verify_authorizer_reply)(struct ceph_auth_client *ac,

				       struct ceph_authorizer *a, size_t len);

	void (*destroy_authorizer)(struct ceph_auth_client *ac,

				   struct ceph_authorizer *a);

	void (*invalidate_authorizer)(struct ceph_auth_client *ac,

				      int peer_type);
@@ -112,8 +113,7 @@ extern int ceph_auth_is_authenticated(struct ceph_auth_client *ac); 
extern int ceph_auth_create_authorizer(struct ceph_auth_client *ac,

				       int peer_type,

				       struct ceph_auth_handshake *auth);

extern void ceph_auth_destroy_authorizer(struct ceph_auth_client *ac,

					 struct ceph_authorizer *a);

void ceph_auth_destroy_authorizer(struct ceph_authorizer *a);

extern int ceph_auth_update_authorizer(struct ceph_auth_client *ac,

				       int peer_type,

				       struct ceph_auth_handshake *a);

include/linux/ceph/osd_client.h

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ struct ceph_msg; 
struct ceph_snap_context;

struct ceph_osd_request;

struct ceph_osd_client;

struct ceph_authorizer;



/*

 * completion callback for async writepages

net/ceph/auth.c

+2 −6
Original line number Diff line number Diff line
@@ -293,13 +293,9 @@ int ceph_auth_create_authorizer(struct ceph_auth_client *ac, 
}

EXPORT_SYMBOL(ceph_auth_create_authorizer);



void ceph_auth_destroy_authorizer(struct ceph_auth_client *ac,

				  struct ceph_authorizer *a)

void ceph_auth_destroy_authorizer(struct ceph_authorizer *a)

{

	mutex_lock(&ac->mutex);

	if (ac->ops && ac->ops->destroy_authorizer)

		ac->ops->destroy_authorizer(ac, a);

	mutex_unlock(&ac->mutex);

	a->destroy(a);

}

EXPORT_SYMBOL(ceph_auth_destroy_authorizer);