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

Commit 6ba3f378 authored by Andreas Dilger's avatar Andreas Dilger Committed by Greg Kroah-Hartman
Browse files

staging: lustre: libcfs: allocate memory in cfs_crypto_performance_test() 



Move memory allocation from cfs_crypto_test_hashes() into the
function cfs_crypto_performance_test().

Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5053
Reviewed-on: http://review.whamcloud.com/9990


Reviewed-by: default avatarBob Glossman <bob.glossman@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 e43c658c

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

+19 −21
Original line number Diff line number Diff line
@@ -307,16 +307,27 @@ EXPORT_SYMBOL(cfs_crypto_hash_final); 
 * \param[in] buf	data buffer on which to compute the hash

 * \param[in] buf_len	length of \buf on which to compute hash

 */

static void cfs_crypto_performance_test(enum cfs_crypto_hash_alg hash_alg,

					const unsigned char *buf,

					unsigned int buf_len)

static void cfs_crypto_performance_test(enum cfs_crypto_hash_alg hash_alg)

{

	int buf_len = max(PAGE_SIZE, 1048576UL);

	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);



	page = alloc_page(GFP_KERNEL);

	if (!page) {

		err = -ENOMEM;

		goto out_err;

	}



	buf = kmap(page);

	memset(buf, 0xAD, PAGE_SIZE);

	kunmap(page);



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

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

		err = cfs_crypto_hash_digest(hash_alg, buf, buf_len, NULL, 0,
@@ -325,7 +336,8 @@ static void cfs_crypto_performance_test(enum cfs_crypto_hash_alg hash_alg, 
			break;

	}

	end = jiffies;



	__free_page(page);

out_err:

	if (err) {

		cfs_crypto_hash_speeds[hash_alg] =  -1;

		CDEBUG(D_INFO, "Crypto hash algorithm %s, err = %d\n",
@@ -381,25 +393,11 @@ EXPORT_SYMBOL(cfs_crypto_hash_speed); 
 */

static int cfs_crypto_test_hashes(void)

{

	unsigned char	   i;

	unsigned char	   *data;

	unsigned int	    j;

	/* Data block size for testing hash. Maximum

	 * kmalloc size for 2.6.18 kernel is 128K

	 */

	unsigned int	    data_len = 1 * 128 * 1024;



	data = kmalloc(data_len, 0);

	if (!data)

		return -ENOMEM;



	for (j = 0; j < data_len; j++)

		data[j] = j & 0xff;

	enum cfs_crypto_hash_alg hash_alg;



	for (i = 0; i < CFS_HASH_ALG_MAX; i++)

		cfs_crypto_performance_test(i, data, data_len);

	for (hash_alg = 0; hash_alg < CFS_HASH_ALG_MAX; hash_alg++)

		cfs_crypto_performance_test(hash_alg);



	kfree(data);

	return 0;

}