From patchwork Tue Mar 19 04:04:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Jitindar Singh X-Patchwork-Id: 10858813 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 C164717E9 for ; Tue, 19 Mar 2019 04:04:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A836E29289 for ; Tue, 19 Mar 2019 04:04:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C1A62943C; Tue, 19 Mar 2019 04:04:50 +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 41B2429289 for ; Tue, 19 Mar 2019 04:04:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727376AbfCSEEt (ORCPT ); Tue, 19 Mar 2019 00:04:49 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:42715 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725913AbfCSEEt (ORCPT ); Tue, 19 Mar 2019 00:04:49 -0400 Received: by mail-pf1-f196.google.com with SMTP id r15so10007025pfn.9; Mon, 18 Mar 2019 21:04:48 -0700 (PDT) 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=7MN1030302t70DeNGRrKyHcA7xhfX6ZTmVDiGJN+8Rk=; b=nThsCMcDXv1ENe/tMWA1EQunG7yPbUwn8yPm7NuiJ4ZWFr4oTXaS2ArHPPsppOLg3m rcBufCk+DI5i7Me8qfxaot8IitNbvagWUqoLIHwuHDbUI14XeRMcaoUgsnDv9Tuve/YI t+7tmeI9LoMCwXNNMk5WHivewIAJOXvnND9PTjYU51Jq1FWg/cxSBIRKiiHKNyaaaBJa 0Qta35qfQM/9KlSHdNi503hhtPffqg2r6vs6jyBV2AVCfIJKL6qT/+igibq5UCP7JG4s l4Po+4DlmG4dBxX42BmeL8IqFIPoZ4YSmeX0SV6RnqBLT4OL4Dm24V+w2vchkQONCyiM AidQ== 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=7MN1030302t70DeNGRrKyHcA7xhfX6ZTmVDiGJN+8Rk=; b=SMKYMsZFqjaZimX0r2ypHd8k6dOLOvC3JBiZaEz0VX4AFZ0vb2xvM+O2N4j4SZD2EB 7Qesui+oezJNkr8EZJL05EauhkRX08NTvqql+yDjD3CvU17zv+pByXF5Kkdey2syNN6w rgGXymKrC4/3Tn+gmg9ZFm80Zet1+ivBu8SYWmEAq1UpE2CuGoNcDGOUR0qh+7kfCs1Z br6GFVP33/VP6X8ROUOnu1CylUuSnPhH6uox4yHu8RFnqNSBNzK8XpqKHsiqZxGDnX0i CCHs0RKCR4zAUsgXZtIQy+M1muGDoIiUxm4UTGjYzr6uXKL8+d5CfO681FXUtwdeXZFC LgpA== X-Gm-Message-State: APjAAAWZqDMBRgJoMlzDCtra3pOjHCDEMK6/QG9NrGwgL7FfxkYnvIGA oXeQnTsb5DrwQb0Yrci8TVJbwMcyZKo= X-Google-Smtp-Source: APXvYqyee7MJ9kmNN3EJ/pnZCGYkjM9KxJhKHhPshX5cWG15GDUuqjzISE+GtOB8gGV/gkvcfcIjFA== X-Received: by 2002:a17:902:681:: with SMTP id 1mr16673493plh.31.1552968288144; Mon, 18 Mar 2019 21:04:48 -0700 (PDT) Received: from surajjs2.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id h87sm27650935pfj.20.2019.03.18.21.04.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Mar 2019 21:04:47 -0700 (PDT) From: Suraj Jitindar Singh To: kvm-ppc@vger.kernel.org Cc: paulus@samba.org, kvm@vger.kernel.org, Suraj Jitindar Singh Subject: [PATCH 2/3] KVM: PPC: Book3S HV: Implement virtual mode H_PAGE_INIT handler Date: Tue, 19 Mar 2019 15:04:34 +1100 Message-Id: <20190319040435.10716-2-sjitindarsingh@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20190319040435.10716-1-sjitindarsingh@gmail.com> References: <20190319040435.10716-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 Implement a virtual mode handler for the H_CALL H_PAGE_INIT which can be used to zero or copy a guest page. The page is defined to be 4k and must be 4k aligned. The in-kernel handler halves the time to handle this H_CALL compared to handling it in userspace for a radix guest. Signed-off-by: Suraj Jitindar Singh --- arch/powerpc/kvm/book3s_hv.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 7179ea783f4f..fa29cc4900c2 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -883,6 +883,39 @@ static int kvmppc_copy_guest(struct kvm *kvm, gpa_t to, gpa_t from, return 0; } +static int kvmppc_h_page_init(struct kvm_vcpu *vcpu, unsigned long flags, + unsigned long dest, unsigned long src) +{ + int ret = H_FUNCTION; + u64 pg_sz = 1UL << 12; /* 4K page size */ + u64 pg_mask = pg_sz - 1; + + /* Check for invalid flags (H_PAGE_SET_LOANED covers all CMO flags) */ + if (flags & ~(H_ICACHE_INVALIDATE | H_ICACHE_SYNCHRONIZE | + H_ZERO_PAGE | H_COPY_PAGE | H_PAGE_SET_LOANED)) + return H_PARAMETER; + + /* dest (and src if copy_page flag set) must be page aligned */ + if ((dest & pg_mask) || ((flags & H_COPY_PAGE) && (src & pg_mask))) + return H_PARAMETER; + + /* zero and/or copy the page as determined by the flags */ + if (flags & H_ZERO_PAGE) { + ret = kvm_clear_guest(vcpu->kvm, dest, pg_sz); + if (ret < 0) + return H_PARAMETER; + } + if (flags & H_COPY_PAGE) { + ret = kvmppc_copy_guest(vcpu->kvm, dest, src, pg_sz); + if (ret < 0) + return H_PARAMETER; + } + + /* We can ignore the remaining flags */ + + return H_SUCCESS; +} + static int kvm_arch_vcpu_yield_to(struct kvm_vcpu *target) { struct kvmppc_vcore *vcore = target->arch.vcore; @@ -1083,6 +1116,11 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu) if (nesting_enabled(vcpu->kvm)) ret = kvmhv_copy_tofrom_guest_nested(vcpu); break; + case H_PAGE_INIT: + ret = kvmppc_h_page_init(vcpu, kvmppc_get_gpr(vcpu, 4), + kvmppc_get_gpr(vcpu, 5), + kvmppc_get_gpr(vcpu, 6)); + break; default: return RESUME_HOST; } @@ -1127,6 +1165,7 @@ static int kvmppc_hcall_impl_hv(unsigned long cmd) case H_IPOLL: case H_XIRR_X: #endif + case H_PAGE_INIT: return 1; }