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

Commit ea0712d6 authored by Qingqing Zhou's avatar Qingqing Zhou Committed by Isaac J. Manjarres
Browse files

iommu-debug: allocate test_virt_addr when reading it 



Change to allocate test_virt_addr of size 1 MB when reading
test_virt_addr for the first time. This will ensure allocation
to be made when tests are exercised and this doesn't add in
static boot time allocation.

Change-Id: If8babd47f52d954fb62b7c44f51268ee9bb6b0c0
Signed-off-by: default avatarQingqing Zhou <qqzhou@codeaurora.org>
[isaacm@codeaurora.org: resolved trivial merge conflicts]
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
parent be8d5fe0

drivers/iommu/iommu-debug.c

+21 −10
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1472,9 +1472,13 @@ static ssize_t iommu_debug_test_virt_addr_read(struct file *file, 


	memset(buf, 0, buf_len);



	if (!test_virt_addr)

	if (IS_ERR_OR_NULL(test_virt_addr))

		test_virt_addr = kzalloc(SZ_1M, GFP_KERNEL);



	if (!test_virt_addr) {

		test_virt_addr = ERR_PTR(-ENOMEM);

		strlcpy(buf, "FAIL\n", buf_len);

	else

	} else

		snprintf(buf, buf_len, "0x%pK\n", test_virt_addr);



	return simple_read_from_buffer(ubuf, count, offset, buf, strlen(buf));
@@ -1804,6 +1808,12 @@ static ssize_t iommu_debug_dma_map_write(struct file *file, 
	if (kstrtouint(comma2 + 1, 0, &attr))

		goto invalid_format;



	if (IS_ERR(test_virt_addr))

		goto allocation_failure;



	if (!test_virt_addr)

		goto missing_allocation;



	if (v_addr < test_virt_addr || v_addr + size > test_virt_addr + SZ_1M)

		goto invalid_addr;
@@ -1851,6 +1861,14 @@ static ssize_t iommu_debug_dma_map_write(struct file *file, 
invalid_addr:

	pr_err_ratelimited("Invalid addr given! Address should be within 1MB size from start addr returned by doing 'cat test_virt_addr'.\n");

	return retval;



allocation_failure:

	pr_err_ratelimited("Allocation of test_virt_addr failed.\n");

	return -ENOMEM;



missing_allocation:

	pr_err_ratelimited("Please attempt to do 'cat test_virt_addr'.\n");

	return retval;

}



static ssize_t iommu_debug_dma_map_read(struct file *file, char __user *ubuf,
@@ -2358,13 +2376,6 @@ static int iommu_debug_init_tests(void) 
		return -ENODEV;

	}



	test_virt_addr = kzalloc(SZ_1M, GFP_KERNEL);



	if (!test_virt_addr) {

		debugfs_remove_recursive(debugfs_tests_dir);

		return -ENOMEM;

	}



	return 0;

}