From: Minfei Huang <mnghuan@gmail.com>
To: bp@suse.de, pbonzini@redhat.com, luto@kernel.org, hpa@zytor.com,
mingo@redhat.com, tglx@linutronix.de
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
Minfei Huang <mnghuan@gmail.com>
Subject: [PATCH 2/3] pvclock: Cleanup to remove function pvclock_get_nsec_offset
Date: Fri, 27 May 2016 14:17:11 +0800 [thread overview]
Message-ID: <1464329832-4638-2-git-send-email-mnghuan@gmail.com> (raw)
In-Reply-To: <1464329832-4638-1-git-send-email-mnghuan@gmail.com>
Function __pvclock_read_cycles is short enough, so there is no need to
have another function pvclock_get_nsec_offset to calculate tsc delta.
It's better to combine it into function __pvclock_read_cycles.
Remove useless variables in function __pvclock_read_cycles.
Signed-off-by: Minfei Huang <mnghuan@gmail.com>
---
arch/x86/include/asm/pvclock.h | 23 +++++++----------------
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/arch/x86/include/asm/pvclock.h b/arch/x86/include/asm/pvclock.h
index 538ae94..7c1c895 100644
--- a/arch/x86/include/asm/pvclock.h
+++ b/arch/x86/include/asm/pvclock.h
@@ -69,31 +69,22 @@ static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift)
}
static __always_inline
-u64 pvclock_get_nsec_offset(const struct pvclock_vcpu_time_info *src)
-{
- u64 delta = rdtsc_ordered() - src->tsc_timestamp;
- return pvclock_scale_delta(delta, src->tsc_to_system_mul,
- src->tsc_shift);
-}
-
-static __always_inline
unsigned __pvclock_read_cycles(const struct pvclock_vcpu_time_info *src,
cycle_t *cycles, u8 *flags)
{
unsigned version;
- cycle_t ret, offset;
- u8 ret_flags;
+ cycle_t offset;
+ u64 delta;
version = src->version;
/* Make the latest version visible */
smp_rmb();
- offset = pvclock_get_nsec_offset(src);
- ret = src->system_time + offset;
- ret_flags = src->flags;
-
- *cycles = ret;
- *flags = ret_flags;
+ delta = rdtsc_ordered() - src->tsc_timestamp;
+ offset = pvclock_scale_delta(delta, src->tsc_to_system_mul,
+ src->tsc_shift);
+ *cycles = src->system_time + offset;
+ *flags = src->flags;
return version;
}
--
2.6.3
next prev parent reply other threads:[~2016-05-27 6:17 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-27 6:17 [PATCH 1/3] pvclock: Add CPU barries to get correct version value Minfei Huang
2016-05-27 6:17 ` Minfei Huang [this message]
2016-05-27 15:40 ` [PATCH 2/3] pvclock: Cleanup to remove function pvclock_get_nsec_offset Andy Lutomirski
2016-05-27 6:17 ` [PATCH 3/3] pvclock: Add a new wrapper function to only get variable flags Minfei Huang
2016-05-27 15:40 ` Andy Lutomirski
2016-05-27 16:06 ` Paolo Bonzini
2016-05-28 12:02 ` Minfei Huang
2016-05-28 12:27 ` [PATCH 3/3 V2] pvclock: Get rid of __pvclock_read_cycles in function pvclock_read_flags Minfei Huang
2016-06-07 13:16 ` Minfei Huang
2016-06-09 11:17 ` Paolo Bonzini
2016-06-08 8:17 ` Borislav Petkov
2016-06-09 11:21 ` Paolo Bonzini
2016-06-09 11:28 ` Borislav Petkov
2016-06-09 12:31 ` Paolo Bonzini
2016-06-12 11:46 ` Minfei Huang
2016-06-09 12:16 ` Peter Zijlstra
2016-06-09 12:24 ` Peter Zijlstra
2016-06-09 12:26 ` Paolo Bonzini
2016-06-09 12:35 ` Peter Zijlstra
2016-05-27 15:39 ` [PATCH 1/3] pvclock: Add CPU barries to get correct version value Andy Lutomirski
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=1464329832-4638-2-git-send-email-mnghuan@gmail.com \
--to=mnghuan@gmail.com \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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).