Unverified Commit 908c8608 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14314 x86/sgx: Fix deadlock in SGX NUMA node search 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhao Yipeng <zhaoyipeng5@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ZEAV3IGSUWXWNH4ZB3ESK375IBAPEZS7/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYQRL 
 
Link:https://gitee.com/openeuler/kernel/pulls/14314

 

Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 4ef23172 318889e8

arch/x86/kernel/cpu/sgx/main.c

+14 −13
Original line number Diff line number Diff line
@@ -474,24 +474,25 @@ struct sgx_epc_page *__sgx_alloc_epc_page(void) 
{

	struct sgx_epc_page *page;

	int nid_of_current = numa_node_id();

	int nid = nid_of_current;

	int nid_start, nid;



	if (node_isset(nid_of_current, sgx_numa_mask)) {

		page = __sgx_alloc_epc_page_from_node(nid_of_current);

		if (page)

			return page;

	}



	/* Fall back to the non-local NUMA nodes: */

	while (true) {

		nid = next_node_in(nid, sgx_numa_mask);

		if (nid == nid_of_current)

			break;

	/*

	 * Try local node first. If it doesn't have an EPC section,

	 * fall back to the non-local NUMA nodes.

	 */

	if (node_isset(nid_of_current, sgx_numa_mask))

		nid_start = nid_of_current;

	else

		nid_start = next_node_in(nid_of_current, sgx_numa_mask);



	nid = nid_start;

	do {

		page = __sgx_alloc_epc_page_from_node(nid);

		if (page)

			return page;

	}



		nid = next_node_in(nid, sgx_numa_mask);

	} while (nid != nid_start);



	return ERR_PTR(-ENOMEM);

}