From patchwork Wed Jan 29 20:20:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 11356785 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 1208192A for ; Wed, 29 Jan 2020 20:22:13 +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 E2BCC20702 for ; Wed, 29 Jan 2020 20:22:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gAXEf7Se" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E2BCC20702 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: mail.kernel.org; spf=none 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 1iwtpw-0006lK-BC; Wed, 29 Jan 2020 20:21:20 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iwtpu-0006k9-VW for xen-devel@lists.xenproject.org; Wed, 29 Jan 2020 20:21:18 +0000 X-Inumbo-ID: d4f048e4-42d4-11ea-a933-bc764e2007e4 Received: from mail-wr1-x444.google.com (unknown [2a00:1450:4864:20::444]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d4f048e4-42d4-11ea-a933-bc764e2007e4; Wed, 29 Jan 2020 20:20:46 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id z3so1076025wru.3 for ; Wed, 29 Jan 2020 12:20:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GVwT/fRB4x8eA70WV+TcjUCD3Ezn+Rwuk+S0GkkMty8=; b=gAXEf7Se8v8p9nT0qBBqFghoKfIJKvPBa3M4QWikvczdKUiWZcGDYpMkqTKPYu8PP8 h57uT8eWlXFlKLkOwFlyoQxR7clrTg5dpL4Ej1n8amYKtFbRihbW8/Qgs43McI6HeGaa ZiLMEs36c5Rb6ZHPPJvxzyy/xjf/XQZD1GXs14p0c4hhxZm0UoFiS2WyUBSQl93Uvvm+ kK3lA/YXEKWR+OgBZXkDW1TefIRL4cklDitVGG98m6xBQSQoQTGWcA3WbnUXuxXjLbRT vQ48pDIeJ/HRFOKPycLbbKLB0BLcZPrnwq7ftfFlcQA4AsMgdxKN4vOUFyH3Bd6H+T5S OhxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GVwT/fRB4x8eA70WV+TcjUCD3Ezn+Rwuk+S0GkkMty8=; b=Q9ZLabAbyYPJBLFLgV9uSgHHztl8cVMXmOXleoe6usGhVkcSzl6txp8MycjnogN4fX UbHcUQwaURTmAd1fF2Nlmsbmb/8WHwq4Jw9tLfrc9y3J9K5+c000u3bfWAxPxq3AYTCT FJdnsJwhEXjAQpGg0goLgeei6FHmG+ZIl9z2ubZ33htWi9ZuM9O9uDZh+h+acfbJxdqM VXifQdjzUazpb6aIaXG3QWNorGt6JRUDx0mlf2DiVzDrbaiELbJPI1nC8iZmTP+bCDdF 4xl2zOM0wjDgZ5RcZu9daaiteE5W8CLjDalQBxuw6Qwe9hLabWrrJFU7P1U3On9gGZPJ tPFg== X-Gm-Message-State: APjAAAW/sKDYHase3AOLsJDjxLjBMWN4wTMK7EAAq3RyG91r3sHPhgHS 2MTqgAgvnq/axJWJuj+KFxTwmEb1sFQ= X-Google-Smtp-Source: APXvYqwAbYO5qpKgjBv6vkVVZMyWpCUtW9Q2/wRvX2tv0EcaSAVI+10pmrYFri7BkOMy1Ly35gXQtA== X-Received: by 2002:a5d:488c:: with SMTP id g12mr619047wrq.67.1580329245583; Wed, 29 Jan 2020 12:20:45 -0800 (PST) Received: from localhost.localdomain (41.142.6.51.dyn.plus.net. [51.6.142.41]) by smtp.gmail.com with ESMTPSA id a22sm3564115wmd.20.2020.01.29.12.20.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2020 12:20:45 -0800 (PST) From: Wei Liu X-Google-Original-From: Wei Liu To: Xen Development List Date: Wed, 29 Jan 2020 20:20:30 +0000 Message-Id: <20200129202034.15052-9-liuwe@microsoft.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200129202034.15052-1-liuwe@microsoft.com> References: <20200129202034.15052-1-liuwe@microsoft.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v5 08/12] x86/hyperv: provide Hyper-V hypercall functions X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Wei Liu , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Paul Durrant , Ian Jackson , Michael Kelley , Julien Grall , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" These functions will be used later to make hypercalls to Hyper-V. Signed-off-by: Wei Liu Reviewed-by: Paul Durrant --- v5: 1. Switch back to direct call 2. Fix some issues pointed out by Jan I tried using the asm(".equ ..") trick but hit a problem with %c again. mm.c:5736:5: error: invalid 'asm': operand is not a condition code, invalid operand code 'c' asm ( ".equ HV_HCALL_PAGE, %c0; .global HV_HCALL_PAGE" --- MAINTAINERS | 1 + xen/arch/x86/guest/hyperv/hyperv.c | 6 ++ xen/arch/x86/xen.lds.S | 4 + xen/include/asm-x86/fixmap.h | 3 +- xen/include/asm-x86/guest/hyperv-hcall.h | 96 ++++++++++++++++++++++++ 5 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 xen/include/asm-x86/guest/hyperv-hcall.h diff --git a/MAINTAINERS b/MAINTAINERS index 04d91482cd..d0a5ed635b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -519,6 +519,7 @@ S: Supported F: xen/arch/x86/guest/hyperv/ F: xen/arch/x86/hvm/viridian/ F: xen/include/asm-x86/guest/hyperv.h +F: xen/include/asm-x86/guest/hyperv-hcall.h F: xen/include/asm-x86/guest/hyperv-tlfs.h F: xen/include/asm-x86/hvm/viridian.h diff --git a/xen/arch/x86/guest/hyperv/hyperv.c b/xen/arch/x86/guest/hyperv/hyperv.c index 2bedcc438c..932a648ff7 100644 --- a/xen/arch/x86/guest/hyperv/hyperv.c +++ b/xen/arch/x86/guest/hyperv/hyperv.c @@ -123,6 +123,12 @@ static const struct hypervisor_ops ops = { .setup = setup, }; +static void __maybe_unused build_assertions(void) +{ + /* We use 1 in linker script */ + BUILD_BUG_ON(FIX_X_HYPERV_HCALL != 1); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 97f9c07891..8e02b4c648 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -329,6 +329,10 @@ SECTIONS efi = .; #endif +#ifdef CONFIG_HYPERV_GUEST + hv_hcall_page = ABSOLUTE(__fix_x_to_virt(1)); +#endif + /* Sections to be discarded */ /DISCARD/ : { *(.exit.text) diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index 8094546b75..a9bcb068cb 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -16,6 +16,7 @@ #define FIXADDR_TOP (VMAP_VIRT_END - PAGE_SIZE) #define FIXADDR_X_TOP (XEN_VIRT_END - PAGE_SIZE) +#define __fix_x_to_virt(x) (FIXADDR_X_TOP - ((x) << PAGE_SHIFT)) #ifndef __ASSEMBLY__ @@ -110,8 +111,6 @@ extern void __set_fixmap_x( #define clear_fixmap_x(idx) __set_fixmap_x(idx, 0, 0) -#define __fix_x_to_virt(x) (FIXADDR_X_TOP - ((x) << PAGE_SHIFT)) - #define fix_x_to_virt(x) ((void *)__fix_x_to_virt(x)) #endif /* __ASSEMBLY__ */ diff --git a/xen/include/asm-x86/guest/hyperv-hcall.h b/xen/include/asm-x86/guest/hyperv-hcall.h new file mode 100644 index 0000000000..5b7509b3b5 --- /dev/null +++ b/xen/include/asm-x86/guest/hyperv-hcall.h @@ -0,0 +1,96 @@ +/****************************************************************************** + * asm-x86/guest/hyperv-hcall.h + * + * This program is free software; you can redistribute it and/or + * modify it under the terms and conditions of the GNU General Public + * License, version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; If not, see . + * + * Copyright (c) 2019 Microsoft. + */ + +#ifndef __X86_HYPERV_HCALL_H__ +#define __X86_HYPERV_HCALL_H__ + +#include +#include + +#include +#include +#include +#include + +static inline uint64_t hv_do_hypercall(uint64_t control, paddr_t input_addr, + paddr_t output_addr) +{ + uint64_t status; + register unsigned long r8 asm("r8") = output_addr; + + asm volatile ( "call hv_hcall_page" + : "=a" (status), "+c" (control), + "+d" (input_addr) ASM_CALL_CONSTRAINT + : "r" (r8) + : "memory" ); + + return status; +} + +static inline uint64_t hv_do_fast_hypercall(uint16_t code, + uint64_t input1, uint64_t input2) +{ + uint64_t status; + uint64_t control = code | HV_HYPERCALL_FAST_BIT; + register unsigned long r8 asm("r8") = input2; + + asm volatile ( "call hv_hcall_page" + : "=a" (status), "+c" (control), + "+d" (input1) ASM_CALL_CONSTRAINT + : "r" (r8) + : ); + + return status; +} + +static inline uint64_t hv_do_rep_hypercall(uint16_t code, uint16_t rep_count, + uint16_t varhead_size, + paddr_t input, paddr_t output) +{ + uint64_t control = code; + uint64_t status; + uint16_t rep_comp; + + control |= (uint64_t)varhead_size << HV_HYPERCALL_VARHEAD_OFFSET; + control |= (uint64_t)rep_count << HV_HYPERCALL_REP_COMP_OFFSET; + + do { + status = hv_do_hypercall(control, input, output); + if ( (status & HV_HYPERCALL_RESULT_MASK) != HV_STATUS_SUCCESS ) + break; + + rep_comp = MASK_EXTR(status, HV_HYPERCALL_REP_COMP_MASK); + + control &= ~HV_HYPERCALL_REP_START_MASK; + control |= MASK_INSR(rep_comp, HV_HYPERCALL_REP_START_MASK); + } while ( rep_comp < rep_count ); + + return status; +} + +#endif /* __X86_HYPERV_HCALL_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */