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.4 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 05848C4338F for ; Mon, 2 Aug 2021 09:39:29 +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 BFB3161057 for ; Mon, 2 Aug 2021 09:39:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BFB3161057 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=hKJIQx4rII8X3nU3Sngq+dJJH039pXRKEvdinIrAqPY=; b=Ruhba/Ch/YYrM4 gRFTaS7lnl111xLyhvJfozrtKuzFKoCD3uCJdNfrFTmAYFM7XR7EEV8R0ZNW3m7Q4andkjJ6w7x2w icufcfaG0vvMrP1AJw0xFgvuUpDVbWZC7KKq+/EcORGkpUUfm6LLOmFreb2jCG9jAKvdMbQL7eepA OeVzBnOcfcDXP8q63wV+w1zU40/QFWI7bl0PVzGJx/y+bF9m7K/k+j28L/TvYTh60sdIelTOz7VZ+ txJkepii5qGJBPGw0GwD/jhxQNrgkZ1iXzTxOBsvYwovuWRK3HcdMmf8Ad72IhoTRALkshv8sBr5o +Xegc0G7XXslQSfTxoHQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mAUO2-00FZU6-2D; Mon, 02 Aug 2021 09:37:30 +0000 Received: from mail-oi1-x233.google.com ([2607:f8b0:4864:20::233]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mAUNv-00FZRo-0i for linux-arm-kernel@lists.infradead.org; Mon, 02 Aug 2021 09:37:24 +0000 Received: by mail-oi1-x233.google.com with SMTP id n16so16859228oij.2 for ; Mon, 02 Aug 2021 02:37:19 -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=FYSKq5I9PT1AOR7++VBDqRUavrD1FqW1zkcq2amkopA=; b=BOHy8c6RcwBv7BrZpawuZkaSiILuONkxy7E9exBa18jEkvhpM2mDhoaSYmfLpYlO0y 3Juy2FnrfJYtsuyXakMsrb5sWy0al+mhdrKckXjGcfenEr/gchY+LziFl5RIqHIzxsn5 cGEvLMc98cLzLD0XDWyKgBP1BaJX3EnS/FO2xiGeRcuF3Vx1isdKKvzJm5lKbgEHyH0n Gng7h7uqoTeoKL1JmenGMRV97O28QlScIg3CUHw4PqXGnqPCp5uJoST3dVmhPN8DLwz0 skLl/gWCpFZ9aqLuPvoHQftThg7Qag861NVqscxhtJYdZu+C41nY56By2vOYAWeO/D7B 3ayA== 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=FYSKq5I9PT1AOR7++VBDqRUavrD1FqW1zkcq2amkopA=; b=tn3XsiJImmN2lH2Lpto4j01uqNtkrWh/NnjeQy244QWIuYFXfbqAZ7njjN/go3Oi/F wlv/dc1hHl0O0ZRppgLGoR8A6cc3hI1iREBOs3cbT52/oB1gqcJ/O3k7lVpQ+k7YCuzS viQK+KwbREzTlogefVNFw3Htw9OXNWKfCf776B5cRC8jVH1m4vDXlV9o7yDU/w2batgN Yidts73IZq2HxtZRGrzZvtvI23mwPdh6U1P7BDxV9bQH4y8cFLIFCacw/kSx3C51sddc scLsOxhIbbk9kdOJCUWFXozFYmUgJ5ZunnTxBmbtvCQBEEtD75cmi2o8JZtiQf6NKOQD 0/Gw== X-Gm-Message-State: AOAM533HUrjxzxctCN2zNGBWx5YYNscoUjYgEX+x10+cnM9R1XX9seZC IMJxro6LanCBfbw2vyBKsDVB7Eu+UEhlJYmdo1sdTA== X-Google-Smtp-Source: ABdhPJx7duRBSKr9RK9jF8w3zgG9BJbts+dNEDkZYXg0XR4D+ZuJAK0QB2VUoRu6L16cgXQVWEdqlDJrLx8Fq0oVgEM= X-Received: by 2002:a05:6808:5a:: with SMTP id v26mr9759822oic.90.1627897039116; Mon, 02 Aug 2021 02:37:19 -0700 (PDT) MIME-Version: 1.0 References: <20210729132818.4091769-1-qperret@google.com> <20210729132818.4091769-4-qperret@google.com> In-Reply-To: <20210729132818.4091769-4-qperret@google.com> From: Fuad Tabba Date: Mon, 2 Aug 2021 11:36:42 +0200 Message-ID: Subject: Re: [PATCH v3 03/21] KVM: arm64: Provide the host_stage2_try() helper macro 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-20210802_023723_127499_26175B2B X-CRM114-Status: GOOD ( 25.95 ) 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 Thu, Jul 29, 2021 at 3:28 PM Quentin Perret wrote: > > We currently unmap all MMIO mappings from the host stage-2 to recycle > the pages whenever we run out. In order to make this pattern easy to > re-use from other places, factor the logic out into a dedicated macro. > While at it, apply the macro for the kvm_pgtable_stage2_set_owner() > calls. They're currently only called early on and are guaranteed to > succeed, but making them robust to the -ENOMEM case doesn't hurt and > will avoid painful debugging sessions later on. > > Signed-off-by: Quentin Perret > --- > arch/arm64/kvm/hyp/nvhe/mem_protect.c | 40 +++++++++++++++------------ > 1 file changed, 22 insertions(+), 18 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > index d938ce95d3bd..74280a753efb 100644 > --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c > +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > @@ -208,6 +208,25 @@ static inline int __host_stage2_idmap(u64 start, u64 end, > prot, &host_s2_pool); > } > > +/* > + * The pool has been provided with enough pages to cover all of memory with > + * page granularity, but it is difficult to know how much of the MMIO range > + * we will need to cover upfront, so we may need to 'recycle' the pages if we > + * run out. > + */ The comment you added in V2 about host_kvm.lock got dropped in favor asserting that the lock is held. Reviewed-by: Fuad Tabba Thanks, /fuad > +#define host_stage2_try(fn, ...) \ > + ({ \ > + int __ret; \ > + hyp_assert_lock_held(&host_kvm.lock); \ > + __ret = fn(__VA_ARGS__); \ > + if (__ret == -ENOMEM) { \ > + __ret = host_stage2_unmap_dev_all(); \ > + if (!__ret) \ > + __ret = fn(__VA_ARGS__); \ > + } \ > + __ret; \ > + }) > + > static int host_stage2_idmap(u64 addr) > { > enum kvm_pgtable_prot prot = KVM_PGTABLE_PROT_R | KVM_PGTABLE_PROT_W; > @@ -223,22 +242,7 @@ static int host_stage2_idmap(u64 addr) > if (ret) > goto unlock; > > - ret = __host_stage2_idmap(range.start, range.end, prot); > - if (ret != -ENOMEM) > - goto unlock; > - > - /* > - * The pool has been provided with enough pages to cover all of memory > - * with page granularity, but it is difficult to know how much of the > - * MMIO range we will need to cover upfront, so we may need to 'recycle' > - * the pages if we run out. > - */ > - ret = host_stage2_unmap_dev_all(); > - if (ret) > - goto unlock; > - > - ret = __host_stage2_idmap(range.start, range.end, prot); > - > + ret = host_stage2_try(__host_stage2_idmap, range.start, range.end, prot); > unlock: > hyp_spin_unlock(&host_kvm.lock); > > @@ -257,8 +261,8 @@ int __pkvm_mark_hyp(phys_addr_t start, phys_addr_t end) > return -EINVAL; > > hyp_spin_lock(&host_kvm.lock); > - ret = kvm_pgtable_stage2_set_owner(&host_kvm.pgt, start, end - start, > - &host_s2_pool, pkvm_hyp_id); > + ret = host_stage2_try(kvm_pgtable_stage2_set_owner, &host_kvm.pgt, > + start, end - start, &host_s2_pool, pkvm_hyp_id); > hyp_spin_unlock(&host_kvm.lock); > > return ret != -EAGAIN ? ret : 0; > -- > 2.32.0.432.gabb21c7263-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel