From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (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 32C42224F6 for ; Mon, 4 Nov 2024 13:32:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730727138; cv=none; b=bWJvsWc44CCVokv3O18nTQOUueFgn/J3QNwxlXLUNLqdSWuJt/Qh9i5bMJSyecNLYm1J+HX4sksLVguptdzbQJTl9CYIpPclSoWxY+zH2segLQzs8Zr9QGQStG1+lOPXaqL42fuEZPsUi6kiXhZQmHVhK1+BQRinx2hjKgxSLig= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730727138; c=relaxed/simple; bh=REnepbOcmsv0k7th+LSpXXbICi7vnDjh1RvcN0Yje7s=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=g5D2WU5OG3BiO0PtSfP2tJlVgG/FkZLpUY1m0LMVw/llazpmf8MQsQKZ/cxUxVJ3/hP+PJLOFtEHSo8GQV2CpmZ0fvIrPsGCkq0ZNfrlmSno/kx4VGaVbuKnDb6x0CbXDh9dEOQ8ujqFGJW4EnUMYGY/vrDwQXk82+CxkavCKtc= 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=cEvFU+FE; arc=none smtp.client-ip=209.85.219.201 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="cEvFU+FE" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e28fc8902e6so7668780276.0 for ; Mon, 04 Nov 2024 05:32:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730727135; x=1731331935; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=DjUYluJ7thLERHfqDAbw880QNuSB0DBGhk0tN16op68=; b=cEvFU+FEco/y8CrpHEbA5jIpOCB/Fx+KZa5W7PtsXVgsmQjWNslX2zT21flkctWrSr Pibf92tPifC2+DFq2dZLyOob/Qp7ZuSmT+0fwB7UU+96AYQcsUemH5mzonmJ96e71TAC /6MZUayMCu78dkr6aTKM1SQZEf5uQITDDtuOvMcQteLnHq8fHeZwF/daaY6j504UEEZf wX4NSRWWQ2CN0UVQyZWqQb5M9qQouKDQJm2kXB+S5NPcrz3eolIPdUuEU9851YNJeKJU j6gdQhKjOPOccWSLX++KMzg5QLIp9rI77+0tcChAOYCvcZ2kYCKn6X4eJGYGT/bNkyRw 6OCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730727135; x=1731331935; 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=DjUYluJ7thLERHfqDAbw880QNuSB0DBGhk0tN16op68=; b=GPn6KHADUAeTaYFJ8kqcXCdcczu0MLiDucnkGqp8dFQvky5+E0nN5uZs69K92AO7x+ WMqGQql4l1UrLvyUQ3JPUJ9hzUOdK9+/2kmvlHFhfAY55lLiZbGoOiy2tOVp+b/tn1C+ eBV960NP5jZ2nvmIOOY5FSglPM3E6Qe/hAbhIdlPSmM6B1tsdEf3yf0Jth5WOvBzmHt9 YthvsMqcGrywPi9LHosgbBGmVYGQcsJazHZ8gt0HpJMEjRxDcdpSM1waV7yZE1AcovWu uGvvFxl3N2iifbb1h8rMeaRYDaFy4b6UMfOOita0yMIthv1bRWPmDi0JcDBbBffKV49E P19Q== X-Forwarded-Encrypted: i=1; AJvYcCVoXLbpHYNVJh5H6mOdsTwYAoQzdLh20MoNUN6kEBjYwV75RcocmmxMXVMzlfzhEMDUAwjT/cQ=@lists.linux.dev X-Gm-Message-State: AOJu0YxC0hGGQSl8OMjFvhFG34KxL7haYo/HXcKGz2PLEp4rtLJkQR1x 0QYn1Co1F84ZX0acnjnLKylOn13Xhk3FsYBFi/WA8wlc8PKUkneBcRhEGrHS4Pc+FS2SG097fn+ Nq26w1w== X-Google-Smtp-Source: AGHT+IGCwsvypUWNk6RlNMRAjdWFDm97ufr3Hg3Q8v/EOjc5GY5BaJQCKOeF2R4oR705NB7B1GCdCKn9Vkg0 X-Received: from big-boi.c.googlers.com ([fda3:e722:ac3:cc00:31:98fb:c0a8:129]) (user=qperret job=sendgmr) by 2002:a25:ba0d:0:b0:e28:fb8b:9155 with SMTP id 3f1490d57ef6-e3087bfc93amr63281276.9.1730727135113; Mon, 04 Nov 2024 05:32:15 -0800 (PST) Date: Mon, 4 Nov 2024 13:31:49 +0000 In-Reply-To: <20241104133204.85208-1-qperret@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241104133204.85208-1-qperret@google.com> X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog Message-ID: <20241104133204.85208-4-qperret@google.com> Subject: [PATCH 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-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. 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/include/nvhe/gfp.h index 97c527ef53c2..f1725bad6331 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 -#define HYP_NO_ORDER USHRT_MAX +#define HYP_NO_ORDER 0xff 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; }; /* 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 6dfeb000371c..88cb8ff9e769 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/memory.h +++ b/arch/arm64/kvm/hyp/include/nvhe/memory.h @@ -42,8 +42,9 @@ static inline enum pkvm_page_state pkvm_getstate(enum kvm_pgtable_prot prot) } struct hyp_page { - unsigned short refcount; - unsigned short order; + u16 refcount; + u8 order; + u8 reserved; }; 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 = hyp_page_to_phys(p); @@ -51,7 +51,7 @@ static struct hyp_page *__find_buddy_nocheck(struct hyp_pool *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 = __find_buddy_nocheck(pool, p, order); @@ -94,7 +94,7 @@ 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; + u8 order = p->order; struct hyp_page *buddy; memset(hyp_page_to_virt(p), 0, PAGE_SIZE << p->order); @@ -129,7 +129,7 @@ static void __hyp_attach_page(struct hyp_pool *pool, static struct hyp_page *__hyp_extract_page(struct hyp_pool *pool, struct hyp_page *p, - unsigned short order) + u8 order) { struct hyp_page *buddy; @@ -183,7 +183,7 @@ void hyp_get_page(struct hyp_pool *pool, void *addr) void hyp_split_page(struct hyp_page *p) { - unsigned short order = p->order; + u8 order = p->order; unsigned int i; p->order = 0; @@ -195,10 +195,10 @@ void hyp_split_page(struct hyp_page *p) } } -void *hyp_alloc_pages(struct hyp_pool *pool, unsigned short order) +void *hyp_alloc_pages(struct hyp_pool *pool, u8 order) { - unsigned short i = order; struct hyp_page *p; + u8 i = order; hyp_spin_lock(&pool->lock); -- 2.47.0.163.g1226f6d8fa-goog