From nobody Mon Feb 9 20:12:48 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677760961; cv=none; d=zohomail.com; s=zohoarc; b=nnOL2GxeztO243EoJc17Qlh8Tj6Gl1ReI0x2lCwhMcd9TtQJmK2atV7/kNBNEF4ojgwXmBhN9LVpACRwSKTbo9aGu+FxR/0nIFFSJ0Vj0oTix1oXCZnrbOSRVj7y4qJ1HK7Wph+XI8voYQ4mHZXLo+hGhvJ2G2cwfkUrbnQpXJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677760961; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oxpdKGBOxbOxA7U1jOwwZnGH+vMWO4jjVwnofdbvh60=; b=Gd93dke9y7KVDjXhOn8qgXHwh1aCA5zesOBi4vnmAjO9iUjKhhmoxefgewKpgcpvXwyJNRQDI7UvvIZ/bG9XlsasbeQrRLTWeU0xiIw4E/XgucjABJD+QW0c+U7r6FZl6/EV6Llj2ASIqsjsrUAsmVETpFUb+XGnSfcldVzX37U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677760961531471.06511817548505; Thu, 2 Mar 2023 04:42:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXiAJ-0006T9-6N; Thu, 02 Mar 2023 07:36:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXi78-0002tW-Dg for qemu-devel@nongnu.org; Thu, 02 Mar 2023 07:32:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXi76-0003TW-2v for qemu-devel@nongnu.org; Thu, 02 Mar 2023 07:32:49 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-356-kxeANXTDNtWdP_iG6_RGnQ-1; Thu, 02 Mar 2023 07:32:46 -0500 Received: by mail-wm1-f70.google.com with SMTP id m31-20020a05600c3b1f00b003e9de8c95easo5698809wms.2 for ; Thu, 02 Mar 2023 04:32:46 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id iz16-20020a05600c555000b003e21638c0edsm2832974wmb.45.2023.03.02.04.32.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 04:32:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677760367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oxpdKGBOxbOxA7U1jOwwZnGH+vMWO4jjVwnofdbvh60=; b=ffnD8MX50ibxcdVHp2106jXOU6T1QSQdqYpmxYj0U7eWni9z41gyZ3mNMj26GXBHROumU8 QI248Tgr6NzDUxNyy44cG2xTN/3W4lUSayRAoVYEag9Hq1u9wM1LrQcMiHGjLc3p0Z2g/P e1EGWAF+MdfEDP2msdGyfjMO6FFhkRM= X-MC-Unique: kxeANXTDNtWdP_iG6_RGnQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oxpdKGBOxbOxA7U1jOwwZnGH+vMWO4jjVwnofdbvh60=; b=AJq5kaQphchhU7xzMFXtM5lt61kVD3P0SQI/4RFNU3xqYTcr8GKSoFoME8UGVcbKCl bzhdGa1MTYAgBbWNF8TKXV6LkJUuRU3HbvarwSxr5cKWYXpwYfwT8n7NCW+nH9iEljT1 9qnlixZR0c6TfGF/8sx8FG+9Wv8iSd1ieCvSHgOJo77XzEKZXtjNQTGbe2pi+KXTfEj4 uDHFTvwMntI2UD1pDTgARtwCRMeSKJ5m9bnBpIr6t/HY6c8AUDyvAE5nwi9re68Y8DGj H/AeKf2aIO+TltG8UiUIn0XgsV44u/nZQCAa/PV79mgx6KeHiwfs3iAQCRVsaqGPguRJ ZvoQ== X-Gm-Message-State: AO0yUKWHvmiwVlI9gQGy9j0dWHZw3IMhpxurvCxtpxpjVD4Yv2Hu9Pkk Qhz6+B+fsvQaU57gwkTaSNgiXx2aCLszNGKVfbYvY3oEB5z9h9AaUcVuLEz3T6nmbSIzVgAjXY9 5gKTcWnnzTFPeid/qrfuz5cXlh2vxMS1WVf+CmVZtScatb/nNNoEIA8V6MIG3Y3N1veRYm4ewT7 A= X-Received: by 2002:a05:600c:3506:b0:3ea:d620:579b with SMTP id h6-20020a05600c350600b003ead620579bmr7464510wmq.0.1677760364830; Thu, 02 Mar 2023 04:32:44 -0800 (PST) X-Google-Smtp-Source: AK7set//t5YOAKsKw1YRRTeTMGzZ2Z/EdM0Y6c50AlZudFizUo3Trl0ovwr/plZRW8v8knqS83veRA== X-Received: by 2002:a05:600c:3506:b0:3ea:d620:579b with SMTP id h6-20020a05600c350600b003ead620579bmr7464487wmq.0.1677760364461; Thu, 02 Mar 2023 04:32:44 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: David Woodhouse , Paul Durrant Subject: [PULL 45/62] i386/xen: Implement HYPERVISOR_grant_table_op and GNTTABOP_[gs]et_verson Date: Thu, 2 Mar 2023 13:30:12 +0100 Message-Id: <20230302123029.153265-46-pbonzini@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230302123029.153265-1-pbonzini@redhat.com> References: <20230302123029.153265-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677760961976100005 Content-Type: text/plain; charset="utf-8" From: David Woodhouse Signed-off-by: David Woodhouse Reviewed-by: Paul Durrant --- hw/i386/kvm/xen_gnttab.c | 31 ++++++++++++++++++++ hw/i386/kvm/xen_gnttab.h | 5 ++++ target/i386/kvm/xen-emu.c | 60 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+) diff --git a/hw/i386/kvm/xen_gnttab.c b/hw/i386/kvm/xen_gnttab.c index 72e87aea6ad6..b54a94e2bd54 100644 --- a/hw/i386/kvm/xen_gnttab.c +++ b/hw/i386/kvm/xen_gnttab.c @@ -180,3 +180,34 @@ int xen_gnttab_map_page(uint64_t idx, uint64_t gfn) return 0; } =20 +int xen_gnttab_set_version_op(struct gnttab_set_version *set) +{ + int ret; + + switch (set->version) { + case 1: + ret =3D 0; + break; + + case 2: + /* Behave as before set_version was introduced. */ + ret =3D -ENOSYS; + break; + + default: + ret =3D -EINVAL; + } + + set->version =3D 1; + return ret; +} + +int xen_gnttab_get_version_op(struct gnttab_get_version *get) +{ + if (get->dom !=3D DOMID_SELF && get->dom !=3D xen_domid) { + return -ESRCH; + } + + get->version =3D 1; + return 0; +} diff --git a/hw/i386/kvm/xen_gnttab.h b/hw/i386/kvm/xen_gnttab.h index a7caa94c838c..79579677ba96 100644 --- a/hw/i386/kvm/xen_gnttab.h +++ b/hw/i386/kvm/xen_gnttab.h @@ -15,4 +15,9 @@ void xen_gnttab_create(void); int xen_gnttab_map_page(uint64_t idx, uint64_t gfn); =20 +struct gnttab_set_version; +struct gnttab_get_version; +int xen_gnttab_set_version_op(struct gnttab_set_version *set); +int xen_gnttab_get_version_op(struct gnttab_get_version *get); + #endif /* QEMU_XEN_GNTTAB_H */ diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c index 6f9b7a5cb96e..d49b6117f1d2 100644 --- a/target/i386/kvm/xen-emu.c +++ b/target/i386/kvm/xen-emu.c @@ -34,6 +34,7 @@ #include "hw/xen/interface/hvm/params.h" #include "hw/xen/interface/vcpu.h" #include "hw/xen/interface/event_channel.h" +#include "hw/xen/interface/grant_table.h" =20 #include "xen-compat.h" =20 @@ -1169,6 +1170,61 @@ static bool kvm_xen_hcall_sched_op(struct kvm_xen_ex= it *exit, X86CPU *cpu, return true; } =20 +static bool kvm_xen_hcall_gnttab_op(struct kvm_xen_exit *exit, X86CPU *cpu, + int cmd, uint64_t arg, int count) +{ + CPUState *cs =3D CPU(cpu); + int err; + + switch (cmd) { + case GNTTABOP_set_version: { + struct gnttab_set_version set; + + qemu_build_assert(sizeof(set) =3D=3D 4); + if (kvm_copy_from_gva(cs, arg, &set, sizeof(set))) { + err =3D -EFAULT; + break; + } + + err =3D xen_gnttab_set_version_op(&set); + if (!err && kvm_copy_to_gva(cs, arg, &set, sizeof(set))) { + err =3D -EFAULT; + } + break; + } + case GNTTABOP_get_version: { + struct gnttab_get_version get; + + qemu_build_assert(sizeof(get) =3D=3D 8); + if (kvm_copy_from_gva(cs, arg, &get, sizeof(get))) { + err =3D -EFAULT; + break; + } + + err =3D xen_gnttab_get_version_op(&get); + if (!err && kvm_copy_to_gva(cs, arg, &get, sizeof(get))) { + err =3D -EFAULT; + } + break; + } + case GNTTABOP_query_size: + case GNTTABOP_setup_table: + case GNTTABOP_copy: + case GNTTABOP_map_grant_ref: + case GNTTABOP_unmap_grant_ref: + case GNTTABOP_swap_grant_ref: + return false; + + default: + /* Xen explicitly returns -ENOSYS to HVM guests for all others */ + err =3D -ENOSYS; + break; + } + + exit->u.hcall.result =3D err; + return true; +} + static bool do_kvm_xen_handle_exit(X86CPU *cpu, struct kvm_xen_exit *exit) { uint16_t code =3D exit->u.hcall.input; @@ -1179,6 +1235,10 @@ static bool do_kvm_xen_handle_exit(X86CPU *cpu, stru= ct kvm_xen_exit *exit) } =20 switch (code) { + case __HYPERVISOR_grant_table_op: + return kvm_xen_hcall_gnttab_op(exit, cpu, exit->u.hcall.params[0], + exit->u.hcall.params[1], + exit->u.hcall.params[2]); case __HYPERVISOR_sched_op: return kvm_xen_hcall_sched_op(exit, cpu, exit->u.hcall.params[0], exit->u.hcall.params[1]); --=20 2.39.1