From nobody Thu Dec 18 18:04:42 2025 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.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 5D51D266EE9 for ; Thu, 13 Mar 2025 11:40:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741866053; cv=none; b=kbuxP5cCM8VKkIZhjFigkyIgpEHPbu31yU98Q7cNS3pAB+uIDxbZvvkJLKKub1NsVOAmML6GS7x/HCKEt2sGyulB4ohiz9hOwcZZGkO+2MLeS0lBFDXlcRM5SG3LDWUn6OL9dCHWfmI/gbmCuFAXr+BJR8q8y2EZaH8ZLxDxtno= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741866053; c=relaxed/simple; bh=8L40uIOd9N+HOMn5n1S03oOWzS9Nj8POq5v8izGudb0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=eOpx6g/mYu+ECvsJiE5Grhv9DR3jNtZuuyzosDi5a2wL/4mce8yGbgYHoz8tCPFj21c9Qgk+dAU6NJ26t4cLAtTinlPm4BAjDz0sHquVDeRBIMRvZ2N6663DJQ9Y9y/NEnbD4Ea7O/iEBstcVtXRyOry/u/4peE/Eu5AQJgZ+Rg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=j7o5w6pY; arc=none smtp.client-ip=209.85.128.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--vdonnefort.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="j7o5w6pY" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43943bd1409so6402905e9.3 for ; Thu, 13 Mar 2025 04:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741866049; x=1742470849; 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=dVJVlv+KRiLMqpaJQOXgQktnx0DyjzlKOnB26dCdeT4=; b=j7o5w6pYVTw15JhfDo5zyicRSaThO2x4YM+x+pSlWZWj24flxqo+LFlPf9rMJO4HRa ZVB1ye+ScLRovYMQFSlNQHA5nYzDSVYuTAcLctYLWizx3gNJi3o5Fe2q9IjNjwOkxagW rCq7F4JUkOoOEhNuyTOqD2NuiUY6DKMGwSXJQT7B+Qr7vZ2VBx8Ugbf/3t1UvJNY7pLM uNZNMAXO20enTDBbSrvjtzL5nTpWli0yZHwRIcGxKnL39HcN8TVzqcPGoIpzgi1gjO0T 5CETYM7pq5GjEdOEaJrrb+hcJ2Xi9rHwhiYYt9122abMfVuPCmeTY9kxKpZijGgsrRve rxkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741866049; x=1742470849; 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=dVJVlv+KRiLMqpaJQOXgQktnx0DyjzlKOnB26dCdeT4=; b=cJYQ224mAoN5erfLleQWLNRWGQEKYkIEJJFImxbouUmzYlONCSMJvpFVKDeKDV4pRX AI5eKoj8XWDYMU9KVSduPeg9Ei0qSSbLqGuCcN7todUqmir9jzvQLB534+SxhuLxjggj 8UKooCCdbk2e+h/RQqzRYCw/sQOhc3qCv9Uz/avTX51/wsoEWLTCJbPiusDQF4T7q6/m MQm0RU1b8BjS0PlbPGI98p3fZ/mHckPFQl3aZtmd2nvn6tYW/2YaHR7yJuw9roswLoXp cSgWJ7fqr4U/FfZN4mxikQmRSxfff3raBmiZrmo6unM1Lm854j4SR/rm7FcNmnf8/IwO YNvQ== X-Forwarded-Encrypted: i=1; AJvYcCU981pHezot9KGLW364YKg0IDIZBX8wM4FOk4xxacx66t5dLZuzP+511N1x+6SjP1dX6ARoQZAk6/8BCsA=@vger.kernel.org X-Gm-Message-State: AOJu0YzCQdsG12zt92krJ7S/TkMZDBcSmROGzLCf5L+va/9ZV3G+ZE53 W4XoiNKCIh8p2+u4aT+ny/vP0WzqTSbUAVZBkmNq5RTFwfYcIH/qUC3z4DT1NjGCS9JtmBfqy2H MzkP+QzbjjqqgYqrWnA== X-Google-Smtp-Source: AGHT+IEzRRTpq9BGThjAtTMnpcfpVggLzq2Mj7jsx/mhuvVJKFcSB7Gz6JGQE1qtaMHhWCec0Q9TXeSZjyRruCGb X-Received: from wmqb15.prod.google.com ([2002:a05:600c:4e0f:b0:43c:faa1:bb58]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:524c:b0:43d:b32:40aa with SMTP id 5b1f17b1804b1-43d0b32419amr49874555e9.3.1741866049761; Thu, 13 Mar 2025 04:40:49 -0700 (PDT) Date: Thu, 13 Mar 2025 11:40:36 +0000 In-Reply-To: <20250313114038.1502357-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250313114038.1502357-1-vdonnefort@google.com> X-Mailer: git-send-email 2.49.0.rc0.332.g42c0ae87b1-goog Message-ID: <20250313114038.1502357-2-vdonnefort@google.com> Subject: [PATCH v4 1/3] KVM: arm64: Add flags to kvm_hyp_memcache From: Vincent Donnefort To: maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org Cc: qperret@google.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, kernel-team@android.com, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add flags to kvm_hyp_memcache and propagate the latter to the allocation and free callbacks. This will later allow to account for memory, based on the memcache configuration. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm= _host.h index 3a7ec98ef123..12691ae23d4c 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -86,6 +86,7 @@ struct kvm_hyp_memcache { phys_addr_t head; unsigned long nr_pages; struct pkvm_mapping *mapping; /* only used from EL1 */ + unsigned long flags; }; =20 static inline void push_hyp_memcache(struct kvm_hyp_memcache *mc, diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 1f55b0c7b11d..6107a3c8ccf6 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1086,12 +1086,12 @@ void kvm_free_stage2_pgd(struct kvm_s2_mmu *mmu) } } =20 -static void hyp_mc_free_fn(void *addr, void *unused) +static void hyp_mc_free_fn(void *addr, void *mc) { free_page((unsigned long)addr); } =20 -static void *hyp_mc_alloc_fn(void *unused) +static void *hyp_mc_alloc_fn(void *mc) { return (void *)__get_free_page(GFP_KERNEL_ACCOUNT); } @@ -1102,7 +1102,7 @@ void free_hyp_memcache(struct kvm_hyp_memcache *mc) return; =20 kfree(mc->mapping); - __free_hyp_memcache(mc, hyp_mc_free_fn, kvm_host_va, NULL); + __free_hyp_memcache(mc, hyp_mc_free_fn, kvm_host_va, mc); } =20 int topup_hyp_memcache(struct kvm_hyp_memcache *mc, unsigned long min_page= s) @@ -1117,7 +1117,7 @@ int topup_hyp_memcache(struct kvm_hyp_memcache *mc, u= nsigned long min_pages) } =20 return __topup_hyp_memcache(mc, min_pages, hyp_mc_alloc_fn, - kvm_host_pa, NULL); + kvm_host_pa, mc); } =20 /** --=20 2.49.0.rc0.332.g42c0ae87b1-goog