From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1E58C4338F for ; Tue, 10 Aug 2021 04:37:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 883D960E76 for ; Tue, 10 Aug 2021 04:37:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236531AbhHJEh3 (ORCPT ); Tue, 10 Aug 2021 00:37:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235432AbhHJEh1 (ORCPT ); Tue, 10 Aug 2021 00:37:27 -0400 Received: from mail-ot1-x332.google.com (mail-ot1-x332.google.com [IPv6:2607:f8b0:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AAD7C0613D3 for ; Mon, 9 Aug 2021 21:37:05 -0700 (PDT) Received: by mail-ot1-x332.google.com with SMTP id d10-20020a9d4f0a0000b02904f51c5004e3so16283458otl.9 for ; Mon, 09 Aug 2021 21:37:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=iuMMsEGLKerJ5lRGm/ABGvekt+HABMuilZ78dGDMJFI=; b=ioEjI7POv1cOzJm+7aGtRJgUkHGN5G04oOdKw4Y5sPhvuQCMRhHIrbibStOLzToRRe dsgBt7ZtUDzC32C9wLFzsphd41QuTZOyW5GGh8u9N9U/YlvctKES0KYQNjK+Ifj6bbQL aXmwqH522XxzHPUTBLvNZAKG5azpSHKie775cWKhwwvBsIolmsvyvriYf/uJKG5oo6u+ 4V+N8uD5TAsA17K4PlcM0N1UpExhSWcY5XZDxYOyIRGNIfS71srC2VHAAaJp9bx7Yuah DHaWUC7tyXgI6EOeuzbOCtdEo50TLaq8/j7Lnn0CCcAstLoLg+qO08WcLw2v1x1apqre Obrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=iuMMsEGLKerJ5lRGm/ABGvekt+HABMuilZ78dGDMJFI=; b=PBOeieR4DKUR7luyy93fBhZNoZGIMjjFrpkKjK8UaOchI8tnQ5cRDsTDORX5m3gF2T Js0gGEmLK34IODYHeciW7tWzfYRNIsaHOhGKCL4bmkdx8+W8b2sqOn5CXfDYghtNo2Pg zzG+FCO9yyqdIMrt4kVMdyfj+uWQqbhfFqCkYqiKlVoMzQrZ58lcAFey6vSGJuW2sec6 7948NTcB3srZDHlUljJ3HZHwf43cvZNDmmmbfPTZGAVlXCtOXg3j8wTDzoCPApVq18pd TU9kCZgxaLvZoGWBYORhb4mZ081LQMMiyRNoyVyuLMzMGESXMn7a6NedlAfO3kSUh3rL pskg== X-Gm-Message-State: AOAM531L9YpNXO2en9qD3906geC8vCFdgMLuuUDAmT+sg+YfUqcx0kVB Nhwa9rpZPRzRJAGepLu+kM/V6ddd86fmNdCVXcYV4w== X-Google-Smtp-Source: ABdhPJxh1ebQPLukCRAzo162yMxeyI9EjHD2CefBzJPEaYqBoaxTTKzCRsMUssS39EaR+fX2grAPznuKU9j+qgdfN6w= X-Received: by 2002:a05:6830:1095:: with SMTP id y21mr9439797oto.144.1628570224785; Mon, 09 Aug 2021 21:37:04 -0700 (PDT) MIME-Version: 1.0 References: <20210809152448.1810400-1-qperret@google.com> <20210809152448.1810400-14-qperret@google.com> In-Reply-To: <20210809152448.1810400-14-qperret@google.com> From: Fuad Tabba Date: Tue, 10 Aug 2021 06:36:27 +0200 Message-ID: Subject: Re: [PATCH v4 13/21] KVM: arm64: Expose host stage-2 manipulation helpers To: Quentin Perret Cc: maz@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, catalin.marinas@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, ardb@kernel.org, qwandor@google.com, dbrazdil@google.com, kernel-team@android.com Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Quentin, On Mon, Aug 9, 2021 at 5:25 PM Quentin Perret wrote: > > We will need to manipulate the host stage-2 page-table from outside > mem_protect.c soon. Introduce two functions allowing this, and make > them usable to users of mem_protect.h. > > Signed-off-by: Quentin Perret Reviewed-by: Fuad Tabba Thanks, /fuad > --- > arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 2 ++ > arch/arm64/kvm/hyp/nvhe/mem_protect.c | 18 +++++++++++++++++- > 2 files changed, 19 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h > index 87b1690c439f..0849ee8fa260 100644 > --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h > +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h > @@ -49,6 +49,8 @@ extern struct host_kvm host_kvm; > int __pkvm_prot_finalize(void); > int __pkvm_mark_hyp(phys_addr_t start, phys_addr_t end); > > +int host_stage2_idmap_locked(phys_addr_t addr, u64 size, enum kvm_pgtable_prot prot); > +int host_stage2_set_owner_locked(phys_addr_t addr, u64 size, u8 owner_id); > int kvm_host_prepare_stage2(void *pgt_pool_base); > void handle_host_mem_abort(struct kvm_cpu_context *host_ctxt); > > diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > index 6fed6772c673..f95a5a4aa09c 100644 > --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c > +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > @@ -273,6 +273,22 @@ static int host_stage2_adjust_range(u64 addr, struct kvm_mem_range *range) > return 0; > } > > +int host_stage2_idmap_locked(phys_addr_t addr, u64 size, > + enum kvm_pgtable_prot prot) > +{ > + hyp_assert_lock_held(&host_kvm.lock); > + > + return host_stage2_try(__host_stage2_idmap, addr, addr + size, prot); > +} > + > +int host_stage2_set_owner_locked(phys_addr_t addr, u64 size, u8 owner_id) > +{ > + hyp_assert_lock_held(&host_kvm.lock); > + > + return host_stage2_try(kvm_pgtable_stage2_set_owner, &host_kvm.pgt, > + addr, size, &host_s2_pool, owner_id); > +} > + > static bool host_stage2_force_pte_cb(u64 addr, u64 end, enum kvm_pgtable_prot prot) > { > /* > @@ -309,7 +325,7 @@ static int host_stage2_idmap(u64 addr) > if (ret) > goto unlock; > > - ret = host_stage2_try(__host_stage2_idmap, range.start, range.end, prot); > + ret = host_stage2_idmap_locked(range.start, range.end - range.start, prot); > unlock: > hyp_spin_unlock(&host_kvm.lock); > > -- > 2.32.0.605.g8dce9f2422-goog > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6FFEBC4320A for ; Tue, 10 Aug 2021 04:37:13 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id DAB346101D for ; Tue, 10 Aug 2021 04:37:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DAB346101D Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 475C74B099; Tue, 10 Aug 2021 00:37:12 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@google.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JnIl-QB6Ylld; Tue, 10 Aug 2021 00:37:08 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 5AA084B09B; Tue, 10 Aug 2021 00:37:08 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id B23384B090 for ; Tue, 10 Aug 2021 00:37:06 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZxEoeQGqRiRl for ; Tue, 10 Aug 2021 00:37:05 -0400 (EDT) Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 860274A5A0 for ; Tue, 10 Aug 2021 00:37:05 -0400 (EDT) Received: by mail-ot1-f54.google.com with SMTP id 61-20020a9d0d430000b02903eabfc221a9so20705290oti.0 for ; Mon, 09 Aug 2021 21:37:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=iuMMsEGLKerJ5lRGm/ABGvekt+HABMuilZ78dGDMJFI=; b=ioEjI7POv1cOzJm+7aGtRJgUkHGN5G04oOdKw4Y5sPhvuQCMRhHIrbibStOLzToRRe dsgBt7ZtUDzC32C9wLFzsphd41QuTZOyW5GGh8u9N9U/YlvctKES0KYQNjK+Ifj6bbQL aXmwqH522XxzHPUTBLvNZAKG5azpSHKie775cWKhwwvBsIolmsvyvriYf/uJKG5oo6u+ 4V+N8uD5TAsA17K4PlcM0N1UpExhSWcY5XZDxYOyIRGNIfS71srC2VHAAaJp9bx7Yuah DHaWUC7tyXgI6EOeuzbOCtdEo50TLaq8/j7Lnn0CCcAstLoLg+qO08WcLw2v1x1apqre Obrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=iuMMsEGLKerJ5lRGm/ABGvekt+HABMuilZ78dGDMJFI=; b=bL03KhLgHwAi7QFFMKwD1lgoLoxen5X94RXtsMDIEpQkfEEzRZLraYXv2jSo1ZMYY9 YbZ3h+yKadVeiXGjZay7Oy5n2VNPwqMhdGsQt3g6C1rZ18IRFSz0jr0G6EpiLaxVq8c/ GAT8SButpwn9jxzeRW8DAndOlDdqckO3AfSBgT1VQ1wP5hHUEG3XDqXbkREsw385ts21 vaeJ4f8OHso5g2qIaSOiQYgJaTkx+7767ji3PYBSZBFr13wn+SFfAc5bdH/pNMrG4hQ0 SSTE+bdHOMUGCRXDR3gguZC43AhI3zCHvB2Ky5g3gOunEdUXhg0KaOBnf/yqQtCnNuit Bvww== X-Gm-Message-State: AOAM532rzKftfJJJIbq42xE17mpoXK+GX/kVN09qnuQOHRCksPTw045i FIPwvdePNy1DJqB7RAuW8cwQsz3BZ38aweTYtlRtuQ== X-Google-Smtp-Source: ABdhPJxh1ebQPLukCRAzo162yMxeyI9EjHD2CefBzJPEaYqBoaxTTKzCRsMUssS39EaR+fX2grAPznuKU9j+qgdfN6w= X-Received: by 2002:a05:6830:1095:: with SMTP id y21mr9439797oto.144.1628570224785; Mon, 09 Aug 2021 21:37:04 -0700 (PDT) MIME-Version: 1.0 References: <20210809152448.1810400-1-qperret@google.com> <20210809152448.1810400-14-qperret@google.com> In-Reply-To: <20210809152448.1810400-14-qperret@google.com> From: Fuad Tabba Date: Tue, 10 Aug 2021 06:36:27 +0200 Message-ID: Subject: Re: [PATCH v4 13/21] KVM: arm64: Expose host stage-2 manipulation helpers To: Quentin Perret Cc: kernel-team@android.com, qwandor@google.com, maz@kernel.org, linux-kernel@vger.kernel.org, catalin.marinas@arm.com, will@kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu Hi Quentin, On Mon, Aug 9, 2021 at 5:25 PM Quentin Perret wrote: > > We will need to manipulate the host stage-2 page-table from outside > mem_protect.c soon. Introduce two functions allowing this, and make > them usable to users of mem_protect.h. > > Signed-off-by: Quentin Perret Reviewed-by: Fuad Tabba Thanks, /fuad > --- > arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 2 ++ > arch/arm64/kvm/hyp/nvhe/mem_protect.c | 18 +++++++++++++++++- > 2 files changed, 19 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h > index 87b1690c439f..0849ee8fa260 100644 > --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h > +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h > @@ -49,6 +49,8 @@ extern struct host_kvm host_kvm; > int __pkvm_prot_finalize(void); > int __pkvm_mark_hyp(phys_addr_t start, phys_addr_t end); > > +int host_stage2_idmap_locked(phys_addr_t addr, u64 size, enum kvm_pgtable_prot prot); > +int host_stage2_set_owner_locked(phys_addr_t addr, u64 size, u8 owner_id); > int kvm_host_prepare_stage2(void *pgt_pool_base); > void handle_host_mem_abort(struct kvm_cpu_context *host_ctxt); > > diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > index 6fed6772c673..f95a5a4aa09c 100644 > --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c > +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > @@ -273,6 +273,22 @@ static int host_stage2_adjust_range(u64 addr, struct kvm_mem_range *range) > return 0; > } > > +int host_stage2_idmap_locked(phys_addr_t addr, u64 size, > + enum kvm_pgtable_prot prot) > +{ > + hyp_assert_lock_held(&host_kvm.lock); > + > + return host_stage2_try(__host_stage2_idmap, addr, addr + size, prot); > +} > + > +int host_stage2_set_owner_locked(phys_addr_t addr, u64 size, u8 owner_id) > +{ > + hyp_assert_lock_held(&host_kvm.lock); > + > + return host_stage2_try(kvm_pgtable_stage2_set_owner, &host_kvm.pgt, > + addr, size, &host_s2_pool, owner_id); > +} > + > static bool host_stage2_force_pte_cb(u64 addr, u64 end, enum kvm_pgtable_prot prot) > { > /* > @@ -309,7 +325,7 @@ static int host_stage2_idmap(u64 addr) > if (ret) > goto unlock; > > - ret = host_stage2_try(__host_stage2_idmap, range.start, range.end, prot); > + ret = host_stage2_idmap_locked(range.start, range.end - range.start, prot); > unlock: > hyp_spin_unlock(&host_kvm.lock); > > -- > 2.32.0.605.g8dce9f2422-goog > _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5CA0C432BE for ; Tue, 10 Aug 2021 04:39:46 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 7B12C60EBD for ; Tue, 10 Aug 2021 04:39:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7B12C60EBD Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1udvtOpDlEvu1jGkK0R7SYK4+Qh75ZU0vI2E+75ns2E=; b=y1ZCzrOMdy8JMa WtsYAMaiVH3Hd2fzDRHLYOO/NEz3/73RylCdFQ3COwPfqjclb0xlWaoipYjEk/69lXcCKUUqkXpI2 74P5mKINB1frTBuwHnIWtNrBMHwy+iR9G2t4xDYbaTOSxXBEkKIiHHBwGbKEyJdsBLp1veeej2JRZ dUTX09l4wSeIXWr60eHOs/8CWd4s8QoljwoTkMm03jfUS6DMk2h61t/v1aI8SwyIwOHtjUnPEB+Dv MdwOVV5VeXdI1vO3q+iyd8zhMtw6Uf2S3snWm1+dE/DFHAzhir5iHWR69CbI8HphiuN73aQxxgvcQ wlGz9X9AAr9QxjBkY5mA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mDJVo-002PLJ-Rt; Tue, 10 Aug 2021 04:37:13 +0000 Received: from mail-ot1-x32e.google.com ([2607:f8b0:4864:20::32e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mDJVl-002PKG-9A for linux-arm-kernel@lists.infradead.org; Tue, 10 Aug 2021 04:37:10 +0000 Received: by mail-ot1-x32e.google.com with SMTP id v10-20020a9d604a0000b02904fa9613b53dso9673474otj.6 for ; Mon, 09 Aug 2021 21:37:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=iuMMsEGLKerJ5lRGm/ABGvekt+HABMuilZ78dGDMJFI=; b=ioEjI7POv1cOzJm+7aGtRJgUkHGN5G04oOdKw4Y5sPhvuQCMRhHIrbibStOLzToRRe dsgBt7ZtUDzC32C9wLFzsphd41QuTZOyW5GGh8u9N9U/YlvctKES0KYQNjK+Ifj6bbQL aXmwqH522XxzHPUTBLvNZAKG5azpSHKie775cWKhwwvBsIolmsvyvriYf/uJKG5oo6u+ 4V+N8uD5TAsA17K4PlcM0N1UpExhSWcY5XZDxYOyIRGNIfS71srC2VHAAaJp9bx7Yuah DHaWUC7tyXgI6EOeuzbOCtdEo50TLaq8/j7Lnn0CCcAstLoLg+qO08WcLw2v1x1apqre Obrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=iuMMsEGLKerJ5lRGm/ABGvekt+HABMuilZ78dGDMJFI=; b=DEieNcdW08vD22hoEK0TZ17MGdoO8WbJz+LKtMpdsmDcOrQufT7/ixhhX8F/CcFcHl hVdSmmVBJjD43WQoNavAjneHNW+yW+V/WJYH2gVolgQy9KciiowQPMNxHixIdifWC35v g4dSpJBAQ25tYTDX1LLz072FYOgkX3IhqhoD803Yu6UDwcDjQLxe832Q30Y7ZgSF1jvN FLDPVt5HR/xS6cwgNdICxxfw3MrCd2Cb36B0vrl4JYUDDLj9rrGpq13FuWaISJSygMGi b/TBCJ5orfxAbQjtjpL/LzpGG0QwZtnf4inCS1AoL6TqfBTZrDNaAeBy0gChY4A3D8ch k2Tw== X-Gm-Message-State: AOAM53131RpsOQV+fWBX5aLqFDkQ7XyVQG1ev6xdotg05OGYewjyT9EK wNgxkIxRzAXLPWm5vhK82MVMEzQ/VO68wNdyklQpSA== X-Google-Smtp-Source: ABdhPJxh1ebQPLukCRAzo162yMxeyI9EjHD2CefBzJPEaYqBoaxTTKzCRsMUssS39EaR+fX2grAPznuKU9j+qgdfN6w= X-Received: by 2002:a05:6830:1095:: with SMTP id y21mr9439797oto.144.1628570224785; Mon, 09 Aug 2021 21:37:04 -0700 (PDT) MIME-Version: 1.0 References: <20210809152448.1810400-1-qperret@google.com> <20210809152448.1810400-14-qperret@google.com> In-Reply-To: <20210809152448.1810400-14-qperret@google.com> From: Fuad Tabba Date: Tue, 10 Aug 2021 06:36:27 +0200 Message-ID: Subject: Re: [PATCH v4 13/21] KVM: arm64: Expose host stage-2 manipulation helpers To: Quentin Perret Cc: maz@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, catalin.marinas@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, ardb@kernel.org, qwandor@google.com, dbrazdil@google.com, kernel-team@android.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210809_213709_379036_ED430B2A X-CRM114-Status: GOOD ( 19.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Quentin, On Mon, Aug 9, 2021 at 5:25 PM Quentin Perret wrote: > > We will need to manipulate the host stage-2 page-table from outside > mem_protect.c soon. Introduce two functions allowing this, and make > them usable to users of mem_protect.h. > > Signed-off-by: Quentin Perret Reviewed-by: Fuad Tabba Thanks, /fuad > --- > arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 2 ++ > arch/arm64/kvm/hyp/nvhe/mem_protect.c | 18 +++++++++++++++++- > 2 files changed, 19 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h > index 87b1690c439f..0849ee8fa260 100644 > --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h > +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h > @@ -49,6 +49,8 @@ extern struct host_kvm host_kvm; > int __pkvm_prot_finalize(void); > int __pkvm_mark_hyp(phys_addr_t start, phys_addr_t end); > > +int host_stage2_idmap_locked(phys_addr_t addr, u64 size, enum kvm_pgtable_prot prot); > +int host_stage2_set_owner_locked(phys_addr_t addr, u64 size, u8 owner_id); > int kvm_host_prepare_stage2(void *pgt_pool_base); > void handle_host_mem_abort(struct kvm_cpu_context *host_ctxt); > > diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > index 6fed6772c673..f95a5a4aa09c 100644 > --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c > +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > @@ -273,6 +273,22 @@ static int host_stage2_adjust_range(u64 addr, struct kvm_mem_range *range) > return 0; > } > > +int host_stage2_idmap_locked(phys_addr_t addr, u64 size, > + enum kvm_pgtable_prot prot) > +{ > + hyp_assert_lock_held(&host_kvm.lock); > + > + return host_stage2_try(__host_stage2_idmap, addr, addr + size, prot); > +} > + > +int host_stage2_set_owner_locked(phys_addr_t addr, u64 size, u8 owner_id) > +{ > + hyp_assert_lock_held(&host_kvm.lock); > + > + return host_stage2_try(kvm_pgtable_stage2_set_owner, &host_kvm.pgt, > + addr, size, &host_s2_pool, owner_id); > +} > + > static bool host_stage2_force_pte_cb(u64 addr, u64 end, enum kvm_pgtable_prot prot) > { > /* > @@ -309,7 +325,7 @@ static int host_stage2_idmap(u64 addr) > if (ret) > goto unlock; > > - ret = host_stage2_try(__host_stage2_idmap, range.start, range.end, prot); > + ret = host_stage2_idmap_locked(range.start, range.end - range.start, prot); > unlock: > hyp_spin_unlock(&host_kvm.lock); > > -- > 2.32.0.605.g8dce9f2422-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel