d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/ofw: Fix malloc inside lock

Browse Source 
Summary:
Currently ofw_real_bounce_alloc() is requesting memory, using WAITOK, holding a
non-sleepable locks, called 'OF Bounce Page'.

Fix this by allocating the pages outside of the lock, and only updating the
global variables while holding the lock.

Submitted by:	Breno Leitao
Differential Revision:	https://reviews.freebsd.org/D14955
This commit is contained in:
Justin Hibbits 2018-04-08 16:43:56 +00:00
parent a045941bd2
commit d6d0670814
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=332286
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/powerpc/ofw/ofw_real.c
View File

@ -197,6 +197,8 @@ ofw_real_stop(void)
static void
ofw_real_bounce_alloc(void *junk)
{
caddr_t temp;
/*
* Check that ofw_real is actually in use before allocating wads
* of memory. Do this by checking if our mutex has been set up.
@ -208,12 +210,15 @@ ofw_real_bounce_alloc(void *junk)
* Allocate a page of contiguous, wired physical memory that can
* fit into a 32-bit address space and accessed from real mode.
*/
temp = contigmalloc(4 * PAGE_SIZE, M_OFWREAL, 0, 0,
ulmin(platform_real_maxaddr(), BUS_SPACE_MAXADDR_32BIT), PAGE_SIZE,
4 * PAGE_SIZE);
if (temp == NULL)
panic("%s: Not able to allocated contiguous memory\n", __func__);
mtx_lock(&of_bounce_mtx);
of_bounce_virt = contigmalloc(4 * PAGE_SIZE, M_OFWREAL, 0, 0,
ulmin(platform_real_maxaddr(), BUS_SPACE_MAXADDR_32BIT), PAGE_SIZE,
4 * PAGE_SIZE);
of_bounce_virt = temp;
of_bounce_phys = vtophys(of_bounce_virt);
of_bounce_size = 4 * PAGE_SIZE;