From nobody Fri Dec 19 04:53:06 2025 Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A2CA51FC7CB for ; Wed, 18 Dec 2024 19:41:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734550872; cv=none; b=O+U0xbwNLpqac+0heFD9WGsqRw/dVbbOwhVp7ZO+jEoIF5E0fvwhGLVXun3P3M0qaMx1vT1JyU0GOfQskNspuGc0/hNgLeElBh18ngoPPWx6w2egMudZEm99qNupcXj/p869z1ZwwVHYoxBkD6/8EPLNo8qJUyfRxc086LVzeLo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734550872; c=relaxed/simple; bh=u+fOwnC5xDGJB5IIWpGGM8aw0GLdouoVAGKsTO7b8VI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=i5WHK202U5wI29Ngh3ablZY9rGhGRXlLByzhh1svBJ7QLX04WIr42bosuAsfD7aRnpblK3uUvVTApZSI+//QCV0vs48SuVA/ntDT808b1FpehDGxcQ9MMjJVDvh6ltTYbnEhziPMfvSG1Bt9hyaBl8NS7ZdZjgXjdnOodnqyTAM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--qperret.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=zhS6TX01; arc=none smtp.client-ip=209.85.218.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--qperret.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="zhS6TX01" Received: by mail-ej1-f73.google.com with SMTP id a640c23a62f3a-aa68952272bso658082666b.2 for ; Wed, 18 Dec 2024 11:41:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1734550869; x=1735155669; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=PduJERFrled8xtlVt7hkNZd8foU0YkZ4d2iWPXC2aQE=; b=zhS6TX01E/qW8dZvqbWrAc9fPvjZxq1lUhSFWBH5ZVmtTHhQrNn15Zyg3aNujLLKN4 twhqx6x3MfkjvISZQju9iMs1qJJuMtmj2d20uMkQr56hBq1QwrgzY02A5gnKK+W4Loiw 2LKqKR0sPBaKZbn2CFGhsBNOZTwKobZ4p660Mi9VV8z8LDn0uvO5UKC9upuQsxy2aI/u 6ECg8Y0Z9k87mALzezRyvrwMpc+HxIPkjYJnOHgPSJiMyrN86D5klbT1+PpvM7zy2x/s zucZ59EeVjW4RfPSrX+gXP+QwS93gG8UUi+k48Yzzerv3ezuEal38gBRnwg/1i7BkxRR IJ0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734550869; x=1735155669; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PduJERFrled8xtlVt7hkNZd8foU0YkZ4d2iWPXC2aQE=; b=IdX14K2S0Ge6Gq4dUskhpE/iW30thzVgOLWDpw/0t5Vee/2NH/pIHyMkA74WOsLwmz C2zc36VCuxFAH4ztr85/A7R9QEm/AlepfSfkifN8grLtoPjdr8yYS8Iq8yp9YU8Llhxh Q9YUOjOT4c5JiP6Rp7B9LwcbUPewQzb4VEXttUAzzhnEcTCXLm49+tnbmLltDlTV0F1J hISTeZVa9LMOql5Uni7dbZJLRgXQLT/sVBryh2cdIbGUByx8W9nKOqG8A4SDol8SKTvP +EA8wpcY3KUF4HnJeaNZe9ecNpZtYQEeANzdCQJsNNNS86HDHT/Mvv4fiHyk//Sy6q7p hosA== X-Forwarded-Encrypted: i=1; AJvYcCWwfkcga6GTd3ZBCxxXCaIDd7dyj4kq+8sJlgtgg+erql0VNsq9NEXe4j87LVDy4NovrCpN/bu/42KkPSc=@vger.kernel.org X-Gm-Message-State: AOJu0YwNwn/d+d04kJlL5TKGXfYSJYKWihpnVMBH1Hv4CsvKvTgw07y6 U5YCvyWNl/VHQhHsJG0c/Bm4uw3nFLuVlh0NQMwB1zjOZwVAeRVpGDBSpD5kvPyIVHcuRUqeByT Lf3hn+Q== X-Google-Smtp-Source: AGHT+IEzfg77HHE0CyOw+rv8bE4cFPV2J1IBhBkYsKjKqKS35RJU0YPOC+Z6JqMb76N1ZMGCOQXv2II72IZa X-Received: from ejdq18.prod.google.com ([2002:a17:906:3892:b0:aa6:9198:7599]) (user=qperret job=prod-delivery.src-stubby-dispatcher) by 2002:a17:906:c10d:b0:aa6:66eb:9c06 with SMTP id a640c23a62f3a-aabf471913emr432721066b.5.1734550869004; Wed, 18 Dec 2024 11:41:09 -0800 (PST) Date: Wed, 18 Dec 2024 19:40:44 +0000 In-Reply-To: <20241218194059.3670226-1-qperret@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241218194059.3670226-1-qperret@google.com> X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Message-ID: <20241218194059.3670226-4-qperret@google.com> Subject: [PATCH v4 03/18] KVM: arm64: Make hyp_page::order a u8 From: Quentin Perret To: Marc Zyngier , Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon Cc: Fuad Tabba , Vincent Donnefort , Sebastian Ene , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We don't need 16 bits to store the hyp page order, and we'll need some bits to store page ownership data soon, so let's reduce the order member. Tested-by: Fuad Tabba Reviewed-by: Fuad Tabba Signed-off-by: Quentin Perret --- arch/arm64/kvm/hyp/include/nvhe/gfp.h | 6 +++--- arch/arm64/kvm/hyp/include/nvhe/memory.h | 5 +++-- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 14 +++++++------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/gfp.h b/arch/arm64/kvm/hyp/inc= lude/nvhe/gfp.h index 97c527ef53c2..3766333bace9 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/gfp.h +++ b/arch/arm64/kvm/hyp/include/nvhe/gfp.h @@ -7,7 +7,7 @@ #include #include =20 -#define HYP_NO_ORDER USHRT_MAX +#define HYP_NO_ORDER ((u8)(~0)) =20 struct hyp_pool { /* @@ -19,11 +19,11 @@ struct hyp_pool { struct list_head free_area[NR_PAGE_ORDERS]; phys_addr_t range_start; phys_addr_t range_end; - unsigned short max_order; + u8 max_order; }; =20 /* Allocation */ -void *hyp_alloc_pages(struct hyp_pool *pool, unsigned short order); +void *hyp_alloc_pages(struct hyp_pool *pool, u8 order); void hyp_split_page(struct hyp_page *page); void hyp_get_page(struct hyp_pool *pool, void *addr); void hyp_put_page(struct hyp_pool *pool, void *addr); diff --git a/arch/arm64/kvm/hyp/include/nvhe/memory.h b/arch/arm64/kvm/hyp/= include/nvhe/memory.h index 0964c461da92..8f2b42bcc8e1 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/memory.h +++ b/arch/arm64/kvm/hyp/include/nvhe/memory.h @@ -41,8 +41,9 @@ static inline enum pkvm_page_state pkvm_getstate(enum kvm= _pgtable_prot prot) } =20 struct hyp_page { - unsigned short refcount; - unsigned short order; + u16 refcount; + u8 order; + u8 reserved; }; =20 extern u64 __hyp_vmemmap; diff --git a/arch/arm64/kvm/hyp/nvhe/page_alloc.c b/arch/arm64/kvm/hyp/nvhe= /page_alloc.c index e691290d3765..a1eb27a1a747 100644 --- a/arch/arm64/kvm/hyp/nvhe/page_alloc.c +++ b/arch/arm64/kvm/hyp/nvhe/page_alloc.c @@ -32,7 +32,7 @@ u64 __hyp_vmemmap; */ static struct hyp_page *__find_buddy_nocheck(struct hyp_pool *pool, struct hyp_page *p, - unsigned short order) + u8 order) { phys_addr_t addr =3D hyp_page_to_phys(p); =20 @@ -51,7 +51,7 @@ static struct hyp_page *__find_buddy_nocheck(struct hyp_p= ool *pool, /* Find a buddy page currently available for allocation */ static struct hyp_page *__find_buddy_avail(struct hyp_pool *pool, struct hyp_page *p, - unsigned short order) + u8 order) { struct hyp_page *buddy =3D __find_buddy_nocheck(pool, p, order); =20 @@ -94,7 +94,7 @@ static void __hyp_attach_page(struct hyp_pool *pool, struct hyp_page *p) { phys_addr_t phys =3D hyp_page_to_phys(p); - unsigned short order =3D p->order; + u8 order =3D p->order; struct hyp_page *buddy; =20 memset(hyp_page_to_virt(p), 0, PAGE_SIZE << p->order); @@ -129,7 +129,7 @@ static void __hyp_attach_page(struct hyp_pool *pool, =20 static struct hyp_page *__hyp_extract_page(struct hyp_pool *pool, struct hyp_page *p, - unsigned short order) + u8 order) { struct hyp_page *buddy; =20 @@ -183,7 +183,7 @@ void hyp_get_page(struct hyp_pool *pool, void *addr) =20 void hyp_split_page(struct hyp_page *p) { - unsigned short order =3D p->order; + u8 order =3D p->order; unsigned int i; =20 p->order =3D 0; @@ -195,10 +195,10 @@ void hyp_split_page(struct hyp_page *p) } } =20 -void *hyp_alloc_pages(struct hyp_pool *pool, unsigned short order) +void *hyp_alloc_pages(struct hyp_pool *pool, u8 order) { - unsigned short i =3D order; struct hyp_page *p; + u8 i =3D order; =20 hyp_spin_lock(&pool->lock); =20 --=20 2.47.1.613.gc27f4b7a9f-goog