From nobody Fri Dec 19 14:35:39 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 C0C72265CAD for ; Tue, 20 May 2025 08:53:03 +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=1747731185; cv=none; b=YP/IOkW8tmO5M2EtvArxiKuUGykZV9szp8p0N11rOBLTRaw+8yoZicpvr5RvpxVb3N+WJLKbAzHs3DTHG2TDzuRMizU/EeqW6P6e6eUVPj2cKXdKE6+9vd7Gyp70cnqxtwSfJDN07B9cIV5ZexjTWC+ed5yqO+agyZfb+c9Xnc8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747731185; c=relaxed/simple; bh=YgmArXGJBjFelTvxc+9b3y1ehEGR8e4TCnYOoPgpzsc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=U1vOeBz5+TCxdNmPTTZvb0iRRUkqaC63U6GNWd0g44rnlv0p862ZXhOt0TsPiv2gG1orUVSrozR0F+FTHb5LgqYiAntpOt87sEUa0wIfnWMHfFxgrleUBxEYRUVpJ0PCfqkDsDRemAWy1u7prjEOjQYFZ9y+F+aLXkxhB5x9YQM= 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=rpGaHqpJ; 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="rpGaHqpJ" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43cec217977so28253295e9.0 for ; Tue, 20 May 2025 01:53:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747731182; x=1748335982; 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=CKZgmiZHsWd3katRT3fxSYHJdGTZyCIpS+lL+y5Js0E=; b=rpGaHqpJS+HxGWu/p9IhfDrfd9Q/QjVKVbHRO6+4wTVkp8i4mCEEHxggyngcNMOpsv cK3ghRGH+GBpdMLlOZSTcCv/rgpncBynuXj0CNdP6jxXDIQwTibShQNzObYkcKkGsWmX nb4yMj6AuUKwIQCKxLofzQZ3NIP1P/mTUv1oVoBTahg7Bk9fuS3YWa+aJtr+05bSJYHM kFs7pwsnVNqMdmxpH6yxjKMuXiZ/hfzWbB7P9nXAin9TIpQx0TyRe19n0Y+pzlab7Acz t4OwcklHJt76jjH/GqbZ8vRxWFhG5qAEdLfmAtq6j8NkEM2fAux/frIEo8lZkaTRE+ln UNww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747731182; x=1748335982; 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=CKZgmiZHsWd3katRT3fxSYHJdGTZyCIpS+lL+y5Js0E=; b=akV0/PWBDMlUQo2smJ1vHamcCMWXb7BrmecSUjFusLu7GeCfLorwOt6FFdsH1HkEJj oBkbpBi6N5SQjSfdabPD3eNFtn0r43YtThju6SYVrAKJtLmeOOu9ROtbBqsnNJNtOrdU 4Qs1a/hdivoRJaNP7wPJKJBH0T+bs2D58/6alnmNBW/buSbai4dcjSme1Akruml2+/mk CGPL9mXvcD8QyvddhPz8uI9PFa2gSyQZwuig1Ys77WPyUGDK8FS5yzoKBnFZ4tnXNRn1 Wj8sFrJ8wCi8dyAWIfyoDpCmqOKqFqkgHqoTX8/0t7PTF5ijsNS0SzwGvlCUBhzVrigj 3qXg== X-Forwarded-Encrypted: i=1; AJvYcCVkRMIyS7+82dSpKGO0KgZSBGuLlhrFRDWYNrwmlLlcQk5VgWcqA+71OX/qnA6yd1jnIU9KJaAihi70o1g=@vger.kernel.org X-Gm-Message-State: AOJu0YxvcnDOHbq1LBQfBC9/WD+L1KvEl5VELt6f6zP7P1R08bKJb0jM VsMzOJNTJVMh1iTPQJICM+zjuAWHF0w/ZrskrUUu9ZO8IFFbJX05c2okdx8q1yf1B/bbhMKnMe8 /Rqj2ZMom5jxtfiv3Gqavvw== X-Google-Smtp-Source: AGHT+IFVdTcpdyqZnbRyjGjgkt8Kni5chetO4dBq5cxEbxyb82PcnyVXthra3fVVyFQB8jcxKQCM9hCtE+YosLWO X-Received: from wmbhh15.prod.google.com ([2002:a05:600c:530f:b0:43b:c450:ea70]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:59a6:0:b0:3a3:7752:108a with SMTP id ffacd0b85a97d-3a377521242mr3030138f8f.25.1747731182145; Tue, 20 May 2025 01:53:02 -0700 (PDT) Date: Tue, 20 May 2025 09:51:52 +0100 In-Reply-To: <20250520085201.3059786-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: <20250520085201.3059786-1-vdonnefort@google.com> X-Mailer: git-send-email 2.49.0.1143.g0be31eac6b-goog Message-ID: <20250520085201.3059786-2-vdonnefort@google.com> Subject: [PATCH v5 01/10] KVM: arm64: Handle huge mappings for np-guest CMOs 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" clean_dcache_guest_page() and invalidate_icache_guest_page() accept a size as an argument. But they also rely on fixmap, which can only map a single PAGE_SIZE page. With the upcoming stage-2 huge mappings for pKVM np-guests, those callbacks will get size > PAGE_SIZE. Loop the CMOs on a PAGE_SIZE basis until the whole range is done. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvh= e/mem_protect.c index 31173c694695..be4f7c5612f8 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -219,14 +219,32 @@ static void guest_s2_put_page(void *addr) =20 static void clean_dcache_guest_page(void *va, size_t size) { - __clean_dcache_guest_page(hyp_fixmap_map(__hyp_pa(va)), size); - hyp_fixmap_unmap(); + size +=3D va - PTR_ALIGN_DOWN(va, PAGE_SIZE); + va =3D PTR_ALIGN_DOWN(va, PAGE_SIZE); + size =3D PAGE_ALIGN(size); + + while (size) { + __clean_dcache_guest_page(hyp_fixmap_map(__hyp_pa(va)), + PAGE_SIZE); + hyp_fixmap_unmap(); + va +=3D PAGE_SIZE; + size -=3D PAGE_SIZE; + } } =20 static void invalidate_icache_guest_page(void *va, size_t size) { - __invalidate_icache_guest_page(hyp_fixmap_map(__hyp_pa(va)), size); - hyp_fixmap_unmap(); + size +=3D va - PTR_ALIGN_DOWN(va, PAGE_SIZE); + va =3D PTR_ALIGN_DOWN(va, PAGE_SIZE); + size =3D PAGE_ALIGN(size); + + while (size) { + __invalidate_icache_guest_page(hyp_fixmap_map(__hyp_pa(va)), + PAGE_SIZE); + hyp_fixmap_unmap(); + va +=3D PAGE_SIZE; + size -=3D PAGE_SIZE; + } } =20 int kvm_guest_prepare_stage2(struct pkvm_hyp_vm *vm, void *pgd) --=20 2.49.0.1143.g0be31eac6b-goog