Commit 2cfa34f2 authored by Ilya Dryomov's avatar Ilya Dryomov Committed by Sage Weil
Browse files

libceph: primary_affinity infrastructure 



Add primary_affinity infrastructure.  primary_affinity values are
stored in an max_osd-sized array, hanging off ceph_osdmap, similar to
a osd_weight array.

Introduce {get,set}_primary_affinity() helpers, primarily to return
CEPH_OSD_DEFAULT_PRIMARY_AFFINITY when no affinity has been set and to
abstract out osd_primary_affinity array allocation and initialization.

Signed-off-by: default avatarIlya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: default avatarAlex Elder <elder@linaro.org>
parent d286de79

include/linux/ceph/osdmap.h

+3 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ struct ceph_osdmap { 
	struct rb_root pg_temp;

	struct rb_root primary_temp;



	u32 *osd_primary_affinity;



	struct rb_root pg_pools;

	u32 pool_max;
@@ -134,6 +136,7 @@ static inline bool ceph_osdmap_flag(struct ceph_osdmap *map, int flag) 
}



extern char *ceph_osdmap_state_str(char *str, int len, int state);

extern u32 ceph_get_primary_affinity(struct ceph_osdmap *map, int osd);



static inline struct ceph_entity_addr *ceph_osd_addr(struct ceph_osdmap *map,

						     int osd)

include/linux/ceph/rados.h

+4 −0
Original line number Diff line number Diff line
@@ -133,6 +133,10 @@ extern const char *ceph_osd_state_name(int s); 
#define CEPH_OSD_IN  0x10000

#define CEPH_OSD_OUT 0



/* osd primary-affinity.  fixed point value: 0x10000 == baseline */

#define CEPH_OSD_MAX_PRIMARY_AFFINITY 0x10000

#define CEPH_OSD_DEFAULT_PRIMARY_AFFINITY 0x10000





/*

 * osd map flag bits

net/ceph/debugfs.c

+3 −2
Original line number Diff line number Diff line
@@ -77,10 +77,11 @@ static int osdmap_show(struct seq_file *s, void *p) 
		int state = map->osd_state[i];

		char sb[64];



		seq_printf(s, "osd%d\t%s\t%3d%%\t(%s)\n",

		seq_printf(s, "osd%d\t%s\t%3d%%\t(%s)\t%3d%%\n",

			   i, ceph_pr_addr(&addr->in_addr),

			   ((map->osd_weight[i]*100) >> 16),

			   ceph_osdmap_state_str(sb, sizeof(sb), state));

			   ceph_osdmap_state_str(sb, sizeof(sb), state),

			   ((ceph_get_primary_affinity(map, i)*100) >> 16));

	}

	for (n = rb_first(&map->pg_temp); n; n = rb_next(n)) {

		struct ceph_pg_mapping *pg =

net/ceph/osdmap.c

+47 −0
Original line number Diff line number Diff line
@@ -649,6 +649,7 @@ void ceph_osdmap_destroy(struct ceph_osdmap *map) 
	kfree(map->osd_state);

	kfree(map->osd_weight);

	kfree(map->osd_addr);

	kfree(map->osd_primary_affinity);

	kfree(map);

}
@@ -685,6 +686,20 @@ static int osdmap_set_max_osd(struct ceph_osdmap *map, int max) 
	map->osd_weight = weight;

	map->osd_addr = addr;



	if (map->osd_primary_affinity) {

		u32 *affinity;



		affinity = krealloc(map->osd_primary_affinity,

				    max*sizeof(*affinity), GFP_NOFS);

		if (!affinity)

			return -ENOMEM;



		for (i = map->max_osd; i < max; i++)

			affinity[i] = CEPH_OSD_DEFAULT_PRIMARY_AFFINITY;



		map->osd_primary_affinity = affinity;

	}



	map->max_osd = max;



	return 0;
@@ -912,6 +927,38 @@ static int decode_new_primary_temp(void **p, void *end, 
	return __decode_primary_temp(p, end, map, true);

}



u32 ceph_get_primary_affinity(struct ceph_osdmap *map, int osd)

{

	BUG_ON(osd >= map->max_osd);



	if (!map->osd_primary_affinity)

		return CEPH_OSD_DEFAULT_PRIMARY_AFFINITY;



	return map->osd_primary_affinity[osd];

}



static int set_primary_affinity(struct ceph_osdmap *map, int osd, u32 aff)

{

	BUG_ON(osd >= map->max_osd);



	if (!map->osd_primary_affinity) {

		int i;



		map->osd_primary_affinity = kmalloc(map->max_osd*sizeof(u32),

						    GFP_NOFS);

		if (!map->osd_primary_affinity)

			return -ENOMEM;



		for (i = 0; i < map->max_osd; i++)

			map->osd_primary_affinity[i] =

			    CEPH_OSD_DEFAULT_PRIMARY_AFFINITY;

	}



	map->osd_primary_affinity[osd] = aff;



	return 0;

}



/*

 * decode a full map.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE