From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
To: Michael Ellerman <mpe@ellerman.id.au>,
Paul Mackerras <paulus@samba.org>,
peterz@infradead.org
Cc: dev@codyps.com, <linux-kernel@vger.kernel.org>,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v2 04/10] powerpc/hv-24x7: Drop event_24x7_request()
Date: Mon, 30 Mar 2015 18:53:41 -0700 [thread overview]
Message-ID: <1427766828-771-5-git-send-email-sukadev@linux.vnet.ibm.com> (raw)
In-Reply-To: <1427766828-771-1-git-send-email-sukadev@linux.vnet.ibm.com>
The function event_24x7_request() is essentially a wrapper to the
function single_24x7_request() and can be dropped to simplify code.
Changelog [v2]:
- Michael Ellerman: Use fields from the request structure rather
than re-extracting from event structure.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
---
arch/powerpc/perf/hv-24x7.c | 40 +++++++++++++++-------------------------
1 file changed, 15 insertions(+), 25 deletions(-)
diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c
index 87c9905..f509f3b 100644
--- a/arch/powerpc/perf/hv-24x7.c
+++ b/arch/powerpc/perf/hv-24x7.c
@@ -985,9 +985,9 @@ static const struct attribute_group *attr_groups[] = {
NULL,
};
-static unsigned long single_24x7_request(u8 domain, u32 offset, u16 ix,
- u16 lpar, u64 *count)
+static unsigned long single_24x7_request(struct perf_event *event, u64 *count)
{
+ u16 idx;
unsigned long ret;
struct hv_24x7_request_buffer *request_buffer;
@@ -1004,17 +1004,22 @@ static unsigned long single_24x7_request(u8 domain, u32 offset, u16 ix,
memset(request_buffer, 0, 4096);
memset(result_buffer, 0, 4096);
+ if (is_physical_domain(event_get_domain(event)))
+ idx = event_get_core(event);
+ else
+ idx = event_get_vcpu(event);
+
request_buffer->interface_version = HV_24X7_IF_VERSION_CURRENT;
request_buffer->num_requests = 1;
req = &request_buffer->requests[0];
- req->performance_domain = domain;
+ req->performance_domain = event_get_domain(event);
req->data_size = cpu_to_be16(8);
- req->data_offset = cpu_to_be32(offset);
- req->starting_lpar_ix = cpu_to_be16(lpar),
+ req->data_offset = cpu_to_be32(event_get_offset(event));
+ req->starting_lpar_ix = cpu_to_be16(event_get_lpar(event)),
req->max_num_lpars = cpu_to_be16(1);
- req->starting_ix = cpu_to_be16(ix);
+ req->starting_ix = cpu_to_be16(idx);
req->max_ix = cpu_to_be16(1);
/*
@@ -1029,7 +1034,8 @@ static unsigned long single_24x7_request(u8 domain, u32 offset, u16 ix,
if (ret) {
pr_devel_ratelimited("hcall failed: %d %#x %#x %d => "
"0x%lx (%ld) detail=0x%x failing ix=%x\n",
- domain, offset, ix, lpar, ret, ret,
+ req->performance_domain, req->data_offset,
+ idx, req->starting_lpar_ix, ret, ret,
result_buffer->detailed_rc,
result_buffer->failing_request_ix);
goto out;
@@ -1042,22 +1048,6 @@ out:
return ret;
}
-static unsigned long event_24x7_request(struct perf_event *event, u64 *res)
-{
- u16 idx;
- unsigned domain = event_get_domain(event);
-
- if (is_physical_domain(domain))
- idx = event_get_core(event);
- else
- idx = event_get_vcpu(event);
-
- return single_24x7_request(event_get_domain(event),
- event_get_offset(event),
- idx,
- event_get_lpar(event),
- res);
-}
static int h_24x7_event_init(struct perf_event *event)
{
@@ -1126,7 +1116,7 @@ static int h_24x7_event_init(struct perf_event *event)
}
/* see if the event complains */
- if (event_24x7_request(event, &ct)) {
+ if (single_24x7_request(event, &ct)) {
pr_devel("test hcall failed\n");
return -EIO;
}
@@ -1138,7 +1128,7 @@ static u64 h_24x7_get_value(struct perf_event *event)
{
unsigned long ret;
u64 ct;
- ret = event_24x7_request(event, &ct);
+ ret = single_24x7_request(event, &ct);
if (ret)
/* We checked this in event init, shouldn't fail here... */
return 0;
--
1.8.3.1
next prev parent reply other threads:[~2015-03-31 1:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-31 1:53 [PATCH v2 00/10] powerpc/hv-24x7: Reorganize single_24x7_request() Sukadev Bhattiprolu
2015-03-31 1:53 ` [PATCH v2 01/10] powerpc/hv-24x7: Modify definition of request and result buffers Sukadev Bhattiprolu
2015-03-31 1:53 ` [PATCH v2 02/10] powerpc/hv24x7: Remove unnecessary parameter Sukadev Bhattiprolu
2015-03-31 1:53 ` [PATCH v2 03/10] perf/hv24x7: Use pr_devel() to log message Sukadev Bhattiprolu
2015-03-31 1:53 ` Sukadev Bhattiprolu [this message]
2015-03-31 1:53 ` [PATCH v2 05/10] powerpc/hv24x7: Move debug prints to separate function Sukadev Bhattiprolu
2015-03-31 1:53 ` [PATCH v2 06/10] powerpc/hv-24x7: Rename hv_24x7_event_update Sukadev Bhattiprolu
2015-03-31 1:53 ` [PATCH v2 07/10] powerpc/hv-24x7: Define add_event_to_24x7_request() Sukadev Bhattiprolu
2015-03-31 1:53 ` [PATCH v2 08/10] perf/hv24x7: Whitespace cleanup Sukadev Bhattiprolu
2015-03-31 3:08 ` Joe Perches
2015-04-01 18:26 ` Sukadev Bhattiprolu
2015-03-31 1:53 ` [PATCH v2 09/10] powerpc/hv-24x7: Define update_event_count() Sukadev Bhattiprolu
2015-03-31 1:53 ` [PATCH v2 10/10] powerpc/hv-24x7: Break up single_24x7_request 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=1427766828-771-5-git-send-email-sukadev@linux.vnet.ibm.com \
--to=sukadev@linux.vnet.ibm.com \
--cc=dev@codyps.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--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).