From patchwork Mon Mar 23 13:36:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Manthey X-Patchwork-Id: 11452987 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7F1421392 for ; Mon, 23 Mar 2020 13:39:57 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5024F20735 for ; Mon, 23 Mar 2020 13:39:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazon.de header.i=@amazon.de header.b="MD3WKLdV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5024F20735 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amazon.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jGNHm-0000dz-0q; Mon, 23 Mar 2020 13:38:34 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jGNHl-0000dk-9T for xen-devel@lists.xenproject.org; Mon, 23 Mar 2020 13:38:33 +0000 X-Inumbo-ID: 963e5526-6d0b-11ea-92cf-bc764e2007e4 Received: from smtp-fw-9102.amazon.com (unknown [207.171.184.29]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 963e5526-6d0b-11ea-92cf-bc764e2007e4; Mon, 23 Mar 2020 13:38:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazon201209; t=1584970713; x=1616506713; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=MdOyL29AYTHsWMpNZ5/kM3iG2cT5KMAOOZ0LlLh7nN8=; b=MD3WKLdVZZoFVtzQkmvCsiA1/AxlZ1q9eu71b7JKhqhqcOnFJ89u0pPr fpspt5L5GeA+R37Cyc/t0gFw1rJuWZP3v3MPghcYZ+3WCiKdUilmpxj0y hC+rdasFEQ6UqaaSOJ40EPEi1lM2H28CrH5g8jzf9tbWEpt1wSwGb68SI k=; IronPort-SDR: yoaByQ4Z2ZqPmySFmxd59FTnLMwQ1g7RhnX45omRipqKZe2zOc68wXStVgJpGi8wbFQ2BUqpj7 yRiWTR8teDrA== X-IronPort-AV: E=Sophos;i="5.72,296,1580774400"; d="scan'208";a="32897681" Received: from sea32-co-svc-lb4-vlan3.sea.corp.amazon.com (HELO email-inbound-relay-1a-e34f1ddc.us-east-1.amazon.com) ([10.47.23.38]) by smtp-border-fw-out-9102.sea19.amazon.com with ESMTP; 23 Mar 2020 13:38:31 +0000 Received: from EX13MTAUEA002.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1a-e34f1ddc.us-east-1.amazon.com (Postfix) with ESMTPS id DEE14A1889; Mon, 23 Mar 2020 13:38:29 +0000 (UTC) Received: from EX13D05EUB003.ant.amazon.com (10.43.166.253) by EX13MTAUEA002.ant.amazon.com (10.43.61.77) with Microsoft SMTP Server (TLS) id 15.0.1236.3; Mon, 23 Mar 2020 13:38:29 +0000 Received: from EX13MTAUWC001.ant.amazon.com (10.43.162.135) by EX13D05EUB003.ant.amazon.com (10.43.166.253) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 23 Mar 2020 13:38:28 +0000 Received: from u6fc700a6f3c650.ant.amazon.com (10.95.138.2) by mail-relay.amazon.com (10.43.162.232) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Mon, 23 Mar 2020 13:38:25 +0000 From: Norbert Manthey To: Andrew Cooper , Date: Mon, 23 Mar 2020 14:36:59 +0100 Message-ID: <20200323133701.21728-3-nmanthey@amazon.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200323133701.21728-1-nmanthey@amazon.de> References: <20200323133701.21728-1-nmanthey@amazon.de> MIME-Version: 1.0 Precedence: Bulk Subject: [Xen-devel] [PATCH XTF benchmark v1 2/4] time: add stubs X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Pawel Wieczorkiewicz , Paul Semel , Norbert Manthey Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To measure how long a certain interaction takes, we need time primitives. This commit introduces these primitives, so that future tests can use the gettimeofday function to retrieve the current time. Signed-off-by: Paul Semel Signed-off-by: Norbert Manthey --- build/files.mk | 1 + common/time.c | 203 +++++++++++++++++++++++++++++++++++++++++++++ include/xtf/time.h | 66 +++++++++++++++ 3 files changed, 270 insertions(+) create mode 100644 common/time.c create mode 100644 include/xtf/time.h diff --git a/build/files.mk b/build/files.mk --- a/build/files.mk +++ b/build/files.mk @@ -16,6 +16,7 @@ obj-perarch += $(ROOT)/common/libc/vsnprintf.o obj-perarch += $(ROOT)/common/report.o obj-perarch += $(ROOT)/common/setup.o obj-perarch += $(ROOT)/common/xenbus.o +obj-perarch += $(ROOT)/common/time.o obj-perenv += $(ROOT)/arch/x86/decode.o obj-perenv += $(ROOT)/arch/x86/desc.o diff --git a/common/time.c b/common/time.c new file mode 100644 --- /dev/null +++ b/common/time.c @@ -0,0 +1,203 @@ +#include +#include +#include +#include + +/* This function was taken from mini-os source code [tag xen-RELEASE-4.11.1] + **************************************************************************** + * (C) 2003 - Rolf Neugebauer - Intel Research Cambridge + * (C) 2002-2003 - Keir Fraser - University of Cambridge + * (C) 2005 - Grzegorz Milos - Intel Research Cambridge + * (C) 2006 - Robert Kaiser - FH Wiesbaden + **************************************************************************** + * + * File: time.c + * Author: Rolf Neugebauer and Keir Fraser + * Changes: Grzegorz Milos + * + * Description: Simple time and timer functions + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ +/* It returns ((delta << shift) * mul_frac) >> 32 */ +static inline uint64_t scale_delta(uint64_t delta, uint32_t mul_frac, int shift) +{ + uint64_t product; +#ifdef __i386__ + uint32_t tmp1, tmp2; +#endif + + if ( shift < 0 ) + delta >>= -shift; + else + delta <<= shift; + +#ifdef __i386__ + __asm__ ( + "mul %5 ; " + "mov %4,%%eax ; " + "mov %%edx,%4 ; " + "mul %5 ; " + "add %4,%%eax ; " + "xor %5,%5 ; " + "adc %5,%%edx ; " + : "=A" (product), "=r" (tmp1), "=r" (tmp2) + : "a" ((uint32_t)delta), "1" ((uint32_t)(delta >> 32)), "2" (mul_frac) ); +#else + __asm__ ( + "mul %%rdx ; shrd $32,%%rdx,%%rax" + : "=a" (product) : "0" (delta), "d" ((uint64_t)mul_frac) ); +#endif + + return product; +} + + +#if defined(__i386__) +uint32_t since_boot_time(void) +#else +uint64_t since_boot_time(void) +#endif +{ + unsigned long old_tsc, tsc; +#if defined(__i386__) + uint32_t system_time; +#else + uint64_t system_time; +#endif + uint32_t ver1, ver2; + + do { + do { + ver1 = shared_info.vcpu_info[0].time.version; + smp_rmb(); + } while ( (ver1 & 1) == 1 ); + + system_time = shared_info.vcpu_info[0].time.system_time; + old_tsc = shared_info.vcpu_info[0].time.tsc_timestamp; + smp_rmb(); + tsc = rdtscp(); + ver2 = ACCESS_ONCE(shared_info.vcpu_info[0].time.version); + smp_rmb(); + } while ( ver1 != ver2 ); + + system_time += scale_delta(tsc - old_tsc, + shared_info.vcpu_info[0].time.tsc_to_system_mul, + shared_info.vcpu_info[0].time.tsc_shift); + + return system_time; +} + +/* This function return the epoch time (number of seconds elapsed + * since Juanary 1, 1970) */ +#if defined(__i386__) +uint32_t current_time(void) +#else +uint64_t current_time(void) +#endif +{ +#if defined(__i386__) + uint32_t seconds = shared_info.wc_sec; +#else + uint64_t seconds = ((uint64_t)shared_info.wc_sec_hi << 32) | shared_info.wc_sec; +#endif + return seconds + (since_boot_time() / 1000000000); +} + +/* The POSIX gettimeofday syscall normally takes a second argument, which is + * the timezone (struct timezone). However, it sould be NULL because linux + * doesn't use it anymore. So we need for us to add it in this function + */ +int gettimeofday(struct timeval *tp) +{ + if (!tp) + return -1; + + tp->sec = current_time(); + tp->nsec = shared_info.wc_nsec + (since_boot_time() % 1000000000); + return 0; +} + +#if defined(__i386__) +static inline void nspin_sleep(uint32_t t) +#else +static inline void nspin_sleep(uint64_t t) +#endif +{ + unsigned long end = since_boot_time() + t; + + while ( since_boot_time() < end ) + asm volatile ( "pause" ); +} + +#if defined(__i386__) +static inline void spin_sleep(uint32_t t) +#else +static inline void spin_sleep(uint64_t t) +#endif +{ +#if defined(__i386__) + uint32_t nsec = t * 1000000000; +#else + uint64_t nsec = t * 1000000000ul; +#endif + nspin_sleep(nsec); +} + +#if defined(__i386__) +static inline void mspin_sleep(uint32_t t) +#else +static inline void mspin_sleep(uint64_t t) +#endif +{ +#if defined(__i386__) + uint32_t nsec = t * 1000000; +#else + uint64_t nsec = t * 1000000ul; +#endif + nspin_sleep(nsec); +} + +#if defined(__i386__) +void sleep(uint32_t t) +#else +void sleep(uint64_t t) +#endif +{ + spin_sleep(t); +} + +#if defined(__i386__) +void msleep(uint32_t t) +#else +void msleep(uint64_t t) +#endif +{ + mspin_sleep(t); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/include/xtf/time.h b/include/xtf/time.h new file mode 100644 --- /dev/null +++ b/include/xtf/time.h @@ -0,0 +1,66 @@ +/** + * @file include/xtf/time.h + * + * Time management + */ +#ifndef XTF_TIME_H +# define XTF_TIME_H + +#include + +static inline uint64_t rdtscp (void) { + unsigned int low, high; + asm volatile ("rdtscp" : "=a" (low), "=d" (high) :: "ecx"); + return ((uint64_t) high << 32) | low; +} + +struct timeval { +#if !defined(__i386__) + uint64_t sec; + uint64_t nsec; +#else + uint32_t sec; + uint32_t nsec; +#endif +}; + +#if defined(__i386__) +/* Time from boot in nanoseconds */ +uint32_t since_boot_time(void); + +uint32_t current_time(void); + +/* This function takes seconds in parameter */ +void sleep(uint32_t f); + +/* Be careful, this function takes milliseconds in parameter, + * not microseconds ! + */ +void msleep(uint32_t f); +#else +uint64_t since_boot_time(void); + +uint64_t current_time(void); + +void sleep(uint64_t f); + +void msleep(uint64_t f); +#endif + +int gettimeofday(struct timeval *tp); + + +/* This returns the current epoch time */ +#define NOW() current_time() + +#endif /* XTF_TIME_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */