From patchwork Mon Aug 25 13:27:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 35917 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DBC7720565 for ; Mon, 25 Aug 2014 13:28:56 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id et14sf112337053pad.10 for ; Mon, 25 Aug 2014 06:28:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=HBigFtgyUYaHRiozV3/CfPEJvVdSLi0KBgRzMBNqaW0=; b=KH1AYp7pFyQDj4aSLc1VZ2qPgSccJG5T9DOrGzvU5syBq3hFtLM8eBJOwWuaZWiNsd ts5N+CI9UDVr2QxVX73M8gByEO/7v5mC/pl+hEfOoygpDXXfislycBtuRU9y8lxX7MoF JyfQVPW3iIopNW7qf92K9wgxpbC2OxM11wW3uq8tcCmJFKNshyl8ZhgR6HOGAf9i8jxv xfxi9aWT4Si5hHFm6OUcxOf9LR50UrKTnJ8U1O4lCiZYTXHg3mzutgTVQcz2hlpckzZU yz3T7g8ul3moudGuUEo7f9Tcal9YyYzLqG0N8LCDFLgUpfhqkrMDRCjVlS2M4sBOQaAQ 4DuQ== X-Gm-Message-State: ALoCoQl6JFPrkgsjStg5q+CsKX/BideJkNF++T1tZj1rS0OOEYC3krokC/K1HtAMPJMECuAdo+hU X-Received: by 10.66.255.70 with SMTP id ao6mr14123135pad.5.1408973336220; Mon, 25 Aug 2014 06:28:56 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.31.161 with SMTP id f30ls198482qgf.39.gmail; Mon, 25 Aug 2014 06:28:56 -0700 (PDT) X-Received: by 10.220.163.69 with SMTP id z5mr18638424vcx.10.1408973336060; Mon, 25 Aug 2014 06:28:56 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id u3si6875115vda.87.2014.08.25.06.28.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Aug 2014 06:28:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ik5so14940342vcb.20 for ; Mon, 25 Aug 2014 06:28:56 -0700 (PDT) X-Received: by 10.220.187.134 with SMTP id cw6mr949096vcb.71.1408973335989; Mon, 25 Aug 2014 06:28:55 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp117337vcb; Mon, 25 Aug 2014 06:28:55 -0700 (PDT) X-Received: by 10.180.223.4 with SMTP id qq4mr15599224wic.47.1408973334892; Mon, 25 Aug 2014 06:28:54 -0700 (PDT) Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by mx.google.com with ESMTPS id qm2si55896628wjc.59.2014.08.25.06.28.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Aug 2014 06:28:54 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.174 as permitted sender) client-ip=209.85.212.174; Received: by mail-wi0-f174.google.com with SMTP id d1so2533977wiv.13 for ; Mon, 25 Aug 2014 06:28:54 -0700 (PDT) X-Received: by 10.194.205.70 with SMTP id le6mr22519493wjc.25.1408973334406; Mon, 25 Aug 2014 06:28:54 -0700 (PDT) Received: from gnx2579.gnb.st.com (LCaen-156-56-7-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by mx.google.com with ESMTPSA id co6sm100101595wjb.31.2014.08.25.06.28.52 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Aug 2014 06:28:53 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, christoffer.dall@linaro.org, marc.zyngier@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, alex.williamson@redhat.com, joel.schopp@amd.com, kim.phillips@freescale.com Cc: linux-kernel@vger.kernel.org, patches@linaro.org, will.deacon@arm.com, a.motakis@virtualopensystems.com, a.rigo@virtualopensystems.com, john.liuli@huawei.com Subject: [RFC 8/9] KVM: KVM-VFIO: add kvm_vfio_arch_data and accessors Date: Mon, 25 Aug 2014 15:27:43 +0200 Message-Id: <1408973264-30384-9-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1408973264-30384-1-git-send-email-eric.auger@linaro.org> References: <1408973264-30384-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , add a pointer to architecture specific data in kvm_vfio struct add accessors to keep kvm_vfio private Signed-off-by: Eric Auger --- arch/arm/include/asm/kvm_host.h | 8 ++++++++ virt/kvm/vfio.c | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 62cbf5b..4f1edbf 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -177,6 +177,14 @@ void kvm_vfio_device_put_external_user(struct vfio_device *vdev); int kvm_vfio_external_get_type(struct vfio_device *vdev); struct device *kvm_vfio_external_get_base_device(struct vfio_device *vdev); +struct kvm_vfio; +struct kvm_vfio_arch_data; +void kvm_vfio_device_set_arch_data(struct kvm_vfio *kv, + struct kvm_vfio_arch_data *ptr); +struct kvm_vfio_arch_data *kvm_vfio_device_get_arch_data(struct kvm_vfio *kv); +void kvm_vfio_lock(struct kvm_vfio *kv); +void kvm_vfio_unlock(struct kvm_vfio *kv); + /* We do not have shadow page tables, hence the empty hooks */ static inline int kvm_age_hva(struct kvm *kvm, unsigned long hva) { diff --git a/virt/kvm/vfio.c b/virt/kvm/vfio.c index f1c4e35..177b71e 100644 --- a/virt/kvm/vfio.c +++ b/virt/kvm/vfio.c @@ -28,6 +28,7 @@ struct kvm_vfio { struct list_head group_list; struct mutex lock; bool noncoherent; + struct kvm_vfio_arch_data *arch_data; }; static struct vfio_group *kvm_vfio_group_get_external_user(struct file *filep) @@ -338,6 +339,26 @@ static int kvm_vfio_create(struct kvm_device *dev, u32 type) return 0; } +void kvm_vfio_device_set_arch_data(struct kvm_vfio *kv, + struct kvm_vfio_arch_data *ptr) +{ + kv->arch_data = ptr; +} + +struct kvm_vfio_arch_data *kvm_vfio_device_get_arch_data(struct kvm_vfio *kv) +{ + return kv->arch_data; +} + +void kvm_vfio_lock(struct kvm_vfio *kv) +{ + mutex_lock(&kv->lock); +} + +void kvm_vfio_unlock(struct kvm_vfio *kv) +{ + mutex_unlock(&kv->lock); +} struct kvm_device_ops kvm_vfio_ops = { .name = "kvm-vfio",