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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E6510C43217 for ; Mon, 17 Oct 2022 11:53:50 +0000 (UTC) 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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rnkgl8VDnfIjuhhxGJZ1pRIy/4VcVrFCbKI7BYO9l3w=; b=XgdtC3Ud/d7c4P QDPJUaYaNZKYCyKprku3gmRQYgTODlS4YXe3H3C8KVS1bGmsY6giDOnJHudcs75i1ZNPQKm9FS4bx R4VBs+UbWej4cKCQj2zhFcG4uLHK7UbgsqEMG0xRfuoe+TIvp+QiyMbO7xIPIFv+ZTIUqlBw6yQ/M CUNO7EiG+NYTNQTnisnJAF6q2FsQvt7l3no173E5d0aTUUVCXYhFsvhTDSej8iufXDyIjfAUvSYq1 73sYWIzoVVf56Zh/GPaWEldzQHNtKdbkWXUYLGU6tt+d4ePJ7t4Y6y66BiTJQPq+8+DLshhdCt4+S I76lcIit0uALnvTgnlOA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1okOfp-00BCXB-2l; Mon, 17 Oct 2022 11:52:49 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1okOfY-00BCFC-2F for linux-arm-kernel@lists.infradead.org; Mon, 17 Oct 2022 11:52:33 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C5532B81630; Mon, 17 Oct 2022 11:52:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 764C5C433C1; Mon, 17 Oct 2022 11:52:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666007549; bh=yEAREzQrE4OzDm8tjXcid5kmoNA03bQzioyQnganDwc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GqExlozjMaYbuK8eyaZW+XPhKqnpqREY2VKOWn5Y7y8NkBhIHcu7mzLy+kUbuE/39 yWhwDISRKO4M3IQoySONehxdAQXplYhseMpq8GIgn6tPYfRdErLqa1PUnOqsFsmHyf XgS2IlPNYcaWQhJwlaGzaAdXGfEKloct3YPVDK3UuOrpeQvHqo+wJZfxvnGpGUeSFg yNVZVmbQIy26CpIl+BlVEyehAuVobLtnDhmKp70gSUAjQdTGpRRilTZHEUfiZoFbb6 1Raq5IddRJ6+sWWR8CrzIJyEk7oUwYuV79OCA7Pt2FXCQ++nB7cX78Af3h8GDR+Gd3 RCeRiWgxJBMuw== From: Will Deacon To: kvmarm@lists.linux.dev Cc: Will Deacon , Sean Christopherson , Vincent Donnefort , Alexandru Elisei , Catalin Marinas , James Morse , Chao Peng , Quentin Perret , Suzuki K Poulose , Mark Rutland , Fuad Tabba , Oliver Upton , Marc Zyngier , kernel-team@android.com, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 02/25] KVM: arm64: Allow attaching of non-coalescable pages to a hyp pool Date: Mon, 17 Oct 2022 12:51:46 +0100 Message-Id: <20221017115209.2099-3-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221017115209.2099-1-will@kernel.org> References: <20221017115209.2099-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221017_045232_271279_F503C9A8 X-CRM114-Status: GOOD ( 15.14 ) 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 From: Quentin Perret All the contiguous pages used to initialize a 'struct hyp_pool' are considered coalescable, which means that the hyp page allocator will actively try to merge them with their buddies on the hyp_put_page() path. However, using hyp_put_page() on a page that is not part of the inital memory range given to a hyp_pool() is currently unsupported. In order to allow dynamically extending hyp pools at run-time, add a check to __hyp_attach_page() to allow inserting 'external' pages into the free-list of order 0. This will be necessary to allow lazy donation of pages from the host to the hypervisor when allocating guest stage-2 page-table pages at EL2. Tested-by: Vincent Donnefort Signed-off-by: Quentin Perret Signed-off-by: Will Deacon --- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/kvm/hyp/nvhe/page_alloc.c b/arch/arm64/kvm/hyp/nvhe/page_alloc.c index 1ded09fc9b10..0d15227aced8 100644 --- a/arch/arm64/kvm/hyp/nvhe/page_alloc.c +++ b/arch/arm64/kvm/hyp/nvhe/page_alloc.c @@ -93,11 +93,15 @@ static inline struct hyp_page *node_to_page(struct list_head *node) static void __hyp_attach_page(struct hyp_pool *pool, struct hyp_page *p) { + phys_addr_t phys = hyp_page_to_phys(p); unsigned short order = p->order; struct hyp_page *buddy; memset(hyp_page_to_virt(p), 0, PAGE_SIZE << p->order); + if (phys < pool->range_start || phys >= pool->range_end) + goto insert; + /* * Only the first struct hyp_page of a high-order page (otherwise known * as the 'head') should have p->order set. The non-head pages should @@ -116,6 +120,7 @@ static void __hyp_attach_page(struct hyp_pool *pool, p = min(p, buddy); } +insert: /* Mark the new head, and insert it */ p->order = order; page_add_to_list(p, &pool->free_area[order]); -- 2.38.0.413.g74048e4d9e-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel