From patchwork Mon Dec 10 03:58:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Jitindar Singh X-Patchwork-Id: 10720599 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E588E91E for ; Mon, 10 Dec 2018 03:59:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D5A9A286AA for ; Mon, 10 Dec 2018 03:59:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C9EC32962F; Mon, 10 Dec 2018 03:59:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A6DA286AA for ; Mon, 10 Dec 2018 03:59:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726430AbeLJD67 (ORCPT ); Sun, 9 Dec 2018 22:58:59 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:46907 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726417AbeLJD67 (ORCPT ); Sun, 9 Dec 2018 22:58:59 -0500 Received: by mail-pl1-f196.google.com with SMTP id t13so4568852ply.13; Sun, 09 Dec 2018 19:58:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=h7DqnNU1Ggyii/PzsZtgi3n0KTNf05KRkHCfe8fV+04=; b=gQ2koxsOTgOLErQW0TBc43xMiVrWuyD05olzJl8/NxgvZt24V1h5wW7HM+lOLiV5mJ jw5zspZePyyPWp652n2CKBy/uwu1Dmsd5cHe1pfyH1JV9kyVKsdTDNhXDQiy0lDTQl9F mQNeiKYtpSW4c1jkC10jBjJC4iTZ+7w/g9nU8xjJhmjp3KqWrc8A0fxwvW2RtdLMLBCA JP9zqGWfR2nG95kOwoodNlabtNuJMw+h7b5pNpp4+wiL8+WPbvbdRcDRhHLqPJoTH61b qQ7bH4Bj+a+P66pIHiPYqeox13ueVALagKD9yrl8otUYYCI41uWsnNb4wNIOu+HfZK74 P/dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=h7DqnNU1Ggyii/PzsZtgi3n0KTNf05KRkHCfe8fV+04=; b=DHQparmgy9QFT/4J12Rtkj/Ep9EZ5FshP96Ajz9BJF90gPNi3CnhhmXES0U7CobnrQ M7k31zOygmNz58AX4h9vI7c9qBRST7hrviADYG15CcpmtGk3IliQph8+PknAtkbk9Ffz IeWlNvYbumCwKHxgFkh79Fe7xkLhUB+Jj1YSYf8yaKGNO3QT7JtiGcmfRrrwmiSEHwSB NrKb8tL3FwIrvI/KgXvtvYJyLyY3GaJEW18gZBCdnGdOy48LItlU1uMYxHFSopseiIh9 BVpifwNVfm7411OJoBFHK8QNunbbGju79zXRuR/XmMKyl7iqe8JieWt6BvJp9KTAANyY ifJw== X-Gm-Message-State: AA+aEWZBO7k9qnQtxykjIEPEwGYyLo6XELqqkahK2gW9tqX1PV5UD6sd yLym1SaaVHWsHy/STbhNC7WcsExj X-Google-Smtp-Source: AFSGD/X8Cv3d+R2w6ERG4xhDAT+Uc/RAjEjEUQCCsx74Iwvru58OZgqEV+lupyVQjif2EULfTFpnNA== X-Received: by 2002:a17:902:33c1:: with SMTP id b59mr10578928plc.220.1544414338715; Sun, 09 Dec 2018 19:58:58 -0800 (PST) Received: from surajjs2.ozlabs.ibm.com.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id f6sm14291899pfg.188.2018.12.09.19.58.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 09 Dec 2018 19:58:58 -0800 (PST) From: Suraj Jitindar Singh To: kvm-ppc@vger.kernel.org Cc: sjitindarsingh@gmail.com, kvm@vger.kernel.org, paulus@ozlabs.org, linuxppc-dev@lists.ozlabs.org, aik@ozlabs.ru Subject: [PATCH V2 4/8] KVM: PPC: Add load_from_eaddr and store_to_eaddr to the kvmppc_ops struct Date: Mon, 10 Dec 2018 14:58:21 +1100 Message-Id: <20181210035825.29404-5-sjitindarsingh@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20181210035825.29404-1-sjitindarsingh@gmail.com> References: <20181210035825.29404-1-sjitindarsingh@gmail.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The kvmppc_ops struct is used to store function pointers to kvm implementation specific functions. Introduce two new functions load_from_eaddr and store_to_eaddr to be used to load from and store to a guest effective address respectively. Also implement these for the kvm-hv module. If we are using the radix mmu then we can call the functions to access quadrant 1 and 2. Signed-off-by: Suraj Jitindar Singh --- arch/powerpc/include/asm/kvm_ppc.h | 4 ++++ arch/powerpc/kvm/book3s_hv.c | 40 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h index 9b89b1918dfc..159dd76700cb 100644 --- a/arch/powerpc/include/asm/kvm_ppc.h +++ b/arch/powerpc/include/asm/kvm_ppc.h @@ -326,6 +326,10 @@ struct kvmppc_ops { unsigned long flags); void (*giveup_ext)(struct kvm_vcpu *vcpu, ulong msr); int (*enable_nested)(struct kvm *kvm); + int (*load_from_eaddr)(struct kvm_vcpu *vcpu, ulong *eaddr, void *ptr, + int size); + int (*store_to_eaddr)(struct kvm_vcpu *vcpu, ulong *eaddr, void *ptr, + int size); }; extern struct kvmppc_ops *kvmppc_hv_ops; diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index a56f8413758a..8a0921176a60 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -5214,6 +5214,44 @@ static int kvmhv_enable_nested(struct kvm *kvm) return 0; } +static int kvmhv_load_from_eaddr(struct kvm_vcpu *vcpu, ulong *eaddr, void *ptr, + int size) +{ + int rc = -EINVAL; + + if (kvmhv_vcpu_is_radix(vcpu)) { + rc = kvmhv_copy_from_guest_radix(vcpu, *eaddr, ptr, size); + + if (rc > 0) + rc = -EINVAL; + } + + /* For now quadrants are the only way to access nested guest memory */ + if (rc && vcpu->arch.nested) + rc = -EAGAIN; + + return rc; +} + +static int kvmhv_store_to_eaddr(struct kvm_vcpu *vcpu, ulong *eaddr, void *ptr, + int size) +{ + int rc = -EINVAL; + + if (kvmhv_vcpu_is_radix(vcpu)) { + rc = kvmhv_copy_to_guest_radix(vcpu, *eaddr, ptr, size); + + if (rc > 0) + rc = -EINVAL; + } + + /* For now quadrants are the only way to access nested guest memory */ + if (rc && vcpu->arch.nested) + rc = -EAGAIN; + + return rc; +} + static struct kvmppc_ops kvm_ops_hv = { .get_sregs = kvm_arch_vcpu_ioctl_get_sregs_hv, .set_sregs = kvm_arch_vcpu_ioctl_set_sregs_hv, @@ -5254,6 +5292,8 @@ static struct kvmppc_ops kvm_ops_hv = { .get_rmmu_info = kvmhv_get_rmmu_info, .set_smt_mode = kvmhv_set_smt_mode, .enable_nested = kvmhv_enable_nested, + .load_from_eaddr = kvmhv_load_from_eaddr, + .store_to_eaddr = kvmhv_store_to_eaddr, }; static int kvm_init_subcore_bitmap(void)