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

Commit b459be73 authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

crush: sync up with userspace 



.. up to ceph.git commit 1db1abc8328d ("crush: eliminate ad hoc diff
between kernel and userspace").  This fixes a bunch of recently pulled
coding style issues and makes includes a bit cleaner.

A patch "crush:Make the function crush_ln static" from Nicholas Krause
<xerofoify@gmail.com> is folded in as crush_ln() has been made static
in userspace as well.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 8f529795

include/linux/crush/crush.h

+38 −2
Original line number Diff line number Diff line 
#ifndef CEPH_CRUSH_CRUSH_H

#define CEPH_CRUSH_CRUSH_H



#ifdef __KERNEL__

# include <linux/types.h>

#else

# include "crush_compat.h"

#endif



/*

 * CRUSH is a pseudo-random data distribution algorithm that
@@ -20,7 +24,11 @@ 
#define CRUSH_MAGIC 0x00010000ul   /* for detecting algorithm revisions */



#define CRUSH_MAX_DEPTH 10  /* max crush hierarchy depth */

#define CRUSH_MAX_RULESET (1<<8)  /* max crush ruleset number */

#define CRUSH_MAX_RULES CRUSH_MAX_RULESET  /* should be the same as max rulesets */



#define CRUSH_MAX_DEVICE_WEIGHT (100u * 0x10000u)

#define CRUSH_MAX_BUCKET_WEIGHT (65535u * 0x10000u)



#define CRUSH_ITEM_UNDEF  0x7ffffffe  /* undefined result (internal use only) */

#define CRUSH_ITEM_NONE   0x7fffffff  /* no result */
@@ -108,6 +116,15 @@ enum { 
};

extern const char *crush_bucket_alg_name(int alg);



/*

 * although tree was a legacy algorithm, it has been buggy, so

 * exclude it.

 */

#define CRUSH_LEGACY_ALLOWED_BUCKET_ALGS (	\

		(1 << CRUSH_BUCKET_UNIFORM) |	\

		(1 << CRUSH_BUCKET_LIST) |	\

		(1 << CRUSH_BUCKET_STRAW))



struct crush_bucket {

	__s32 id;        /* this'll be negative */

	__u16 type;      /* non-zero; type=0 is reserved for devices */
@@ -187,6 +204,25 @@ struct crush_map { 
	 * that want to limit reshuffling, a value of 3 or 4 will make the

	 * mappings line up a bit better with previous mappings. */

	__u8 chooseleaf_vary_r;



#ifndef __KERNEL__

	/*

	 * version 0 (original) of straw_calc has various flaws.  version 1

	 * fixes a few of them.

	 */

	__u8 straw_calc_version;



	/*

	 * allowed bucket algs is a bitmask, here the bit positions

	 * are CRUSH_BUCKET_*.  note that these are *bits* and

	 * CRUSH_BUCKET_* values are not, so we need to or together (1

	 * << CRUSH_BUCKET_WHATEVER).  The 0th bit is not used to

	 * minimize confusion (bucket type values start at 1).

	 */

	__u32 allowed_bucket_algs;



	__u32 *choose_tries;

#endif

};

include/linux/crush/hash.h

+6 −0
Original line number Diff line number Diff line 
#ifndef CEPH_CRUSH_HASH_H

#define CEPH_CRUSH_HASH_H



#ifdef __KERNEL__

# include <linux/types.h>

#else

# include "crush_compat.h"

#endif



#define CRUSH_HASH_RJENKINS1   0



#define CRUSH_HASH_DEFAULT CRUSH_HASH_RJENKINS1

include/linux/crush/mapper.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * LGPL2

 */



#include <linux/crush/crush.h>

#include "crush.h"



extern int crush_find_rule(const struct crush_map *map, int ruleset, int type, int size);

extern int crush_do_rule(const struct crush_map *map,

net/ceph/crush/crush.c

+6 −7
Original line number Diff line number Diff line 


#ifdef __KERNEL__

# include <linux/slab.h>

# include <linux/crush/crush.h>

#else

# include <stdlib.h>

# include <assert.h>

# define kfree(x) do { if (x) free(x); } while (0)

# define BUG_ON(x) assert(!(x))

# include "crush_compat.h"

# include "crush.h"

#endif



#include <linux/crush/crush.h>



const char *crush_bucket_alg_name(int alg)

{

	switch (alg) {
@@ -134,6 +130,9 @@ void crush_destroy(struct crush_map *map) 
		kfree(map->rules);

	}



#ifndef __KERNEL__

	kfree(map->choose_tries);

#endif

	kfree(map);

}

net/ceph/crush/crush_ln_table.h

+15 −17
Original line number Diff line number Diff line
@@ -10,20 +10,20 @@ 
 *

 */



#if defined(__linux__)

#include <linux/types.h>

#elif defined(__FreeBSD__)

#include <sys/types.h>

#endif



#ifndef CEPH_CRUSH_LN_H

#define CEPH_CRUSH_LN_H



#ifdef __KERNEL__

# include <linux/types.h>

#else

# include "crush_compat.h"

#endif



// RH_LH_tbl[2*k] = 2^48/(1.0+k/128.0)

// RH_LH_tbl[2*k+1] = 2^48*log2(1.0+k/128.0)



static int64_t __RH_LH_tbl[128*2+2] = {

/*

 * RH_LH_tbl[2*k] = 2^48/(1.0+k/128.0)

 * RH_LH_tbl[2*k+1] = 2^48*log2(1.0+k/128.0)

 */

static __s64 __RH_LH_tbl[128*2+2] = {

  0x0001000000000000ll, 0x0000000000000000ll, 0x0000fe03f80fe040ll, 0x000002dfca16dde1ll,

  0x0000fc0fc0fc0fc1ll, 0x000005b9e5a170b4ll, 0x0000fa232cf25214ll, 0x0000088e68ea899all,

  0x0000f83e0f83e0f9ll, 0x00000b5d69bac77ell, 0x0000f6603d980f67ll, 0x00000e26fd5c8555ll,
@@ -91,9 +91,10 @@ static int64_t __RH_LH_tbl[128*2+2] = { 
  0x0000800000000000ll, 0x0000ffff00000000ll,

};





    // LL_tbl[k] = 2^48*log2(1.0+k/2^15);

static int64_t __LL_tbl[256] = {

/*

 * LL_tbl[k] = 2^48*log2(1.0+k/2^15)

 */

static __s64 __LL_tbl[256] = {

  0x0000000000000000ull, 0x00000002e2a60a00ull, 0x000000070cb64ec5ull, 0x00000009ef50ce67ull,

  0x0000000cd1e588fdull, 0x0000000fb4747e9cull, 0x0000001296fdaf5eull, 0x0000001579811b58ull,

  0x000000185bfec2a1ull, 0x0000001b3e76a552ull, 0x0000001e20e8c380ull, 0x0000002103551d43ull,
@@ -160,7 +161,4 @@ static int64_t __LL_tbl[256] = { 
  0x000002d4562d2ec6ull, 0x000002d73330209dull, 0x000002da102d63b0ull, 0x000002dced24f814ull,

};









#endif