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

Commit 304d13ff authored by Jian Yu's avatar Jian Yu Committed by Greg Kroah-Hartman
Browse files

staging: lustre: libcfs: replace direct HZ access with kernel APIs 



On some customers' systems, the kernel was compiled with HZ defined
to 100, instead of 1000. This improves performance for HPC applications.
However, to use these systems with Lustre, customers have to re-build
Lustre for the kernel because Lustre directly uses the defined constant
HZ.

Since kernel 2.6.21, some non-HZ dependent timing APIs become non-
inline functions, which can be used in Lustre codes to replace the
direct HZ access.

These kernel APIs include:
  jiffies_to_msecs()
  jiffies_to_usecs()
  jiffies_to_timespec()
  msecs_to_jiffies()
  usecs_to_jiffies()
  timespec_to_jiffies()

 And here are some samples of the replacement:
  HZ            -> msecs_to_jiffies(MSEC_PER_SEC)
  n * HZ        -> msecs_to_jiffies(n * MSEC_PER_SEC)
  HZ / n        -> msecs_to_jiffies(MSEC_PER_SEC / n)
  n / HZ        -> jiffies_to_msecs(n) / MSEC_PER_SEC
  n / HZ * 1000 -> jiffies_to_msecs(n)

This patch replaces the direct HZ access in the libcfs module.

Signed-off-by: default avatarJian Yu <jian.yu@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5443
Reviewed-on: http://review.whamcloud.com/11993


Reviewed-by: default avatarNathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@gmail.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2dc09ea8

drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h

+2 −2
Original line number Diff line number Diff line
@@ -70,12 +70,12 @@ static inline unsigned long cfs_time_current(void) 


static inline long cfs_time_seconds(int seconds)

{

	return ((long)seconds) * HZ;

	return ((long)seconds) * msecs_to_jiffies(MSEC_PER_SEC);

}



static inline long cfs_duration_sec(long d)

{

	return d / HZ;

	return d / msecs_to_jiffies(MSEC_PER_SEC);

}



#define cfs_time_current_64 get_jiffies_64

drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c

+2 −3
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ static void cfs_crypto_performance_test(enum cfs_crypto_hash_alg hash_alg) 
	void *buf;

	unsigned long		   start, end;

	int			     bcount, err = 0;

	int			     sec = 1; /* do test only 1 sec */

	struct page *page;

	unsigned char hash[CFS_CRYPTO_HASH_DIGESTSIZE_MAX];

	unsigned int hash_len = sizeof(hash);
@@ -328,8 +327,8 @@ static void cfs_crypto_performance_test(enum cfs_crypto_hash_alg hash_alg) 
	memset(buf, 0xAD, PAGE_SIZE);

	kunmap(page);



	for (start = jiffies, end = start + sec * HZ, bcount = 0;

	     time_before(jiffies, end); bcount++) {

	for (start = jiffies, end = start + msecs_to_jiffies(MSEC_PER_SEC),

	     bcount = 0; time_before(jiffies, end); bcount++) {

		struct cfs_crypto_hash_desc *hdesc;

		int i;