Skip to content

Commit 48bee8a

Browse files
codypsmpe
authored andcommitted
powerpc/perf/hv-24x7: use kmem_cache instead of aligned stack allocations
Ian pointed out the use of __aligned(4096) caused rather large stack consumption in single_24x7_request(), so use the kmem_cache hv_page_cache (which we've already got set up for other allocations) insead of allocating locally. CC: Haren Myneni <[email protected]> Reported-by: Ian Munsie <[email protected]> Signed-off-by: Cody P Schafer <[email protected]> Signed-off-by: Sukadev Bhattiprolu <[email protected]> Signed-off-by: Michael Ellerman <[email protected]>
1 parent bf7588a commit 48bee8a

File tree

1 file changed

+37
-18
lines changed

1 file changed

+37
-18
lines changed

arch/powerpc/perf/hv-24x7.c

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ static unsigned long single_24x7_request(u8 domain, u32 offset, u16 ix,
294294
u16 lpar, u64 *res,
295295
bool success_expected)
296296
{
297-
unsigned long ret;
297+
unsigned long ret = -ENOMEM;
298298

299299
/*
300300
* request_buffer and result_buffer are not required to be 4k aligned,
@@ -304,7 +304,27 @@ static unsigned long single_24x7_request(u8 domain, u32 offset, u16 ix,
304304
struct reqb {
305305
struct hv_24x7_request_buffer buf;
306306
struct hv_24x7_request req;
307-
} __packed __aligned(4096) request_buffer = {
307+
} __packed *request_buffer;
308+
309+
struct {
310+
struct hv_24x7_data_result_buffer buf;
311+
struct hv_24x7_result res;
312+
struct hv_24x7_result_element elem;
313+
__be64 result;
314+
} __packed *result_buffer;
315+
316+
BUILD_BUG_ON(sizeof(*request_buffer) > 4096);
317+
BUILD_BUG_ON(sizeof(*result_buffer) > 4096);
318+
319+
request_buffer = kmem_cache_zalloc(hv_page_cache, GFP_USER);
320+
if (!request_buffer)
321+
goto out;
322+
323+
result_buffer = kmem_cache_zalloc(hv_page_cache, GFP_USER);
324+
if (!result_buffer)
325+
goto out_free_request_buffer;
326+
327+
*request_buffer = (struct reqb) {
308328
.buf = {
309329
.interface_version = HV_24X7_IF_VERSION_CURRENT,
310330
.num_requests = 1,
@@ -320,28 +340,27 @@ static unsigned long single_24x7_request(u8 domain, u32 offset, u16 ix,
320340
}
321341
};
322342

323-
struct resb {
324-
struct hv_24x7_data_result_buffer buf;
325-
struct hv_24x7_result res;
326-
struct hv_24x7_result_element elem;
327-
__be64 result;
328-
} __packed __aligned(4096) result_buffer = {};
329-
330343
ret = plpar_hcall_norets(H_GET_24X7_DATA,
331-
virt_to_phys(&request_buffer), sizeof(request_buffer),
332-
virt_to_phys(&result_buffer), sizeof(result_buffer));
344+
virt_to_phys(request_buffer), sizeof(*request_buffer),
345+
virt_to_phys(result_buffer), sizeof(*result_buffer));
333346

334347
if (ret) {
335348
if (success_expected)
336-
pr_err_ratelimited("hcall failed: %d %#x %#x %d => 0x%lx (%ld) detail=0x%x failing ix=%x\n",
337-
domain, offset, ix, lpar,
338-
ret, ret,
339-
result_buffer.buf.detailed_rc,
340-
result_buffer.buf.failing_request_ix);
341-
return ret;
349+
pr_err_ratelimited("hcall failed: %d %#x %#x %d => "
350+
"0x%lx (%ld) detail=0x%x failing ix=%x\n",
351+
domain, offset, ix, lpar, ret, ret,
352+
result_buffer->buf.detailed_rc,
353+
result_buffer->buf.failing_request_ix);
354+
goto out_free_result_buffer;
342355
}
343356

344-
*res = be64_to_cpu(result_buffer.result);
357+
*res = be64_to_cpu(result_buffer->result);
358+
359+
out_free_result_buffer:
360+
kfree(result_buffer);
361+
out_free_request_buffer:
362+
kfree(request_buffer);
363+
out:
345364
return ret;
346365
}
347366

0 commit comments

Comments
 (0)