From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>,
ak@linux.intel.com, Jiri Olsa <jolsa@redhat.com>,
peterz@infradead.org, eranian@google.com
Cc: linuxppc-dev@lists.ozlabs.org, dev@codyps.com,
linux-kernel@vger.kernel.org,
Michael Ellerman <michaele@au1.ibm.com>,
Anshuman Khandual <khandual@linux.vnet.ibm.com>
Subject: [PATCH v2 01/14] powerpc/perf/hv-24x7: use kmem_cache instead of aligned stack allocations
Date: Fri, 15 Aug 2014 00:26:10 -0700 [thread overview]
Message-ID: <1408087583-32239-2-git-send-email-sukadev@linux.vnet.ibm.com> (raw)
In-Reply-To: <1408087583-32239-1-git-send-email-sukadev@linux.vnet.ibm.com>
From: Cody P Schafer <dev@codyps.com>
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 <hbabu@us.ibm.com>
CC: Cody P Schafer <dev@codyps.com>
Reported-by: Ian Munsie <imunsie@au1.ibm.com>
Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com>
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
---
arch/powerpc/perf/hv-24x7.c | 52 ++++++++++++++++++++++++++++++++-------------
1 file changed, 37 insertions(+), 15 deletions(-)
diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c
index 66d0f17..13f3131 100644
--- a/arch/powerpc/perf/hv-24x7.c
+++ b/arch/powerpc/perf/hv-24x7.c
@@ -294,7 +294,7 @@ static unsigned long single_24x7_request(u8 domain, u32 offset, u16 ix,
u16 lpar, u64 *res,
bool success_expected)
{
- unsigned long ret;
+ unsigned long ret = -ENOMEM;
/*
* 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,
struct reqb {
struct hv_24x7_request_buffer buf;
struct hv_24x7_request req;
- } __packed __aligned(4096) request_buffer = {
+ } __packed *request_buffer;
+ struct resb {
+ struct hv_24x7_data_result_buffer buf;
+ struct hv_24x7_result res;
+ struct hv_24x7_result_element elem;
+ __be64 result;
+ } __packed *result_buffer;
+
+ BUILD_BUG_ON(sizeof(*request_buffer) > 4096);
+ BUILD_BUG_ON(sizeof(*result_buffer) > 4096);
+
+ request_buffer = kmem_cache_alloc(hv_page_cache, GFP_USER);
+
+ if (!request_buffer)
+ goto out_reqb;
+
+ result_buffer = kmem_cache_zalloc(hv_page_cache, GFP_USER);
+ if (!result_buffer)
+ goto out_resb;
+
+ *request_buffer = (struct reqb) {
.buf = {
.interface_version = HV_24X7_IF_VERSION_CURRENT,
.num_requests = 1,
@@ -320,28 +340,30 @@ static unsigned long single_24x7_request(u8 domain, u32 offset, u16 ix,
}
};
- struct resb {
- struct hv_24x7_data_result_buffer buf;
- struct hv_24x7_result res;
- struct hv_24x7_result_element elem;
- __be64 result;
- } __packed __aligned(4096) result_buffer = {};
-
ret = plpar_hcall_norets(H_GET_24X7_DATA,
- virt_to_phys(&request_buffer), sizeof(request_buffer),
- virt_to_phys(&result_buffer), sizeof(result_buffer));
+ virt_to_phys(request_buffer), sizeof(*request_buffer),
+ virt_to_phys(result_buffer), sizeof(*result_buffer));
if (ret) {
if (success_expected)
pr_err_ratelimited("hcall failed: %d %#x %#x %d => 0x%lx (%ld) detail=0x%x failing ix=%x\n",
domain, offset, ix, lpar,
ret, ret,
- result_buffer.buf.detailed_rc,
- result_buffer.buf.failing_request_ix);
- return ret;
+ result_buffer->buf.detailed_rc,
+ result_buffer->buf.failing_request_ix);
+ goto out_hcall;
}
- *res = be64_to_cpu(result_buffer.result);
+ *res = be64_to_cpu(result_buffer->result);
+ kfree(result_buffer);
+ kfree(request_buffer);
+ return ret;
+
+out_hcall:
+ kfree(result_buffer);
+out_resb:
+ kfree(request_buffer);
+out_reqb:
return ret;
}
--
1.8.3.1
next prev parent reply other threads:[~2014-08-15 7:26 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-15 7:26 [PATCH v2 00/14] Add support for parameterized events from sysfs Sukadev Bhattiprolu
2014-08-15 7:26 ` Sukadev Bhattiprolu [this message]
2014-08-15 7:26 ` [PATCH v2 03/14] perf Documentation: sysfs events/ interfaces Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 04/14] perf Documentation: remove duplicated docs for powerpc cpu specific events Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 04/14] perf Documentation: add event parameters Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 05/14] tools/perf: annotate list_head with type info Sukadev Bhattiprolu
2014-08-15 13:47 ` Arnaldo Carvalho de Melo
2014-08-15 7:26 ` [PATCH v2 06/14] tools/perf: support parsing parameterized events Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 07/14] tools/perf: extend format_alias() to include event parameters Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 08/14] tools/perf: document parameterized events and note symbolically formed events Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 09/14] perf: provide sysfs_show for struct perf_pmu_events_attr Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 10/14] powerpc/perf/hv-24x7: parse catalog and populate sysfs with events Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 11/14] powerpc/perf/hv-24x7: Documentaion for new sysfs entries which expose descriptions Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 12/14] perf: add PMU_EVENT_ATTR_STRING() helper Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 13/14] powerpc/perf/{hv-gpci, hv-common}: generate requests with counters annotated Sukadev Bhattiprolu
2014-08-15 7:26 ` [PATCH v2 14/14] powerpc/perf/hv-gpci: add the remaining gpci requests Sukadev Bhattiprolu
2014-08-15 7:44 ` [PATCH v2 00/14] Add support for parameterized events from sysfs Peter Zijlstra
2014-08-20 14:15 ` Jiri Olsa
2014-08-23 0:23 ` Sukadev Bhattiprolu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408087583-32239-2-git-send-email-sukadev@linux.vnet.ibm.com \
--to=sukadev@linux.vnet.ibm.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=dev@codyps.com \
--cc=eranian@google.com \
--cc=jolsa@redhat.com \
--cc=khandual@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=michaele@au1.ibm.com \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).