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 AE0D7D6B076 for ; Thu, 29 Jan 2026 15:27:59 +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:In-Reply-To:References:Cc:Subject:From: To:Message-Id:Date:Mime-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Z8ObVzklm75Xz1pBr5Ra415EEfz7sE5KBGgZyJ/mn/8=; b=MmsZhF9x8AcTnS J7hPjq04y+7QZCLZDABDMmYsh2hpyi9n/cihMrperhb8ri/EgK7rRucZ3tSjhTzSbYULGjpy9X4kU SXj4WB0SpVXnSS/kfsVWKAppgsFrkwBPWra17556p+zVH1ovRjBDaJVxrjjJE5dKy0/uluQ7twDmH mKoZXr+5LQXKsGDdojSzchFoLEyZQ9EcCeoBEyKzOOT9tQ+0dyT9MV7gcdAkBzUm+SyPl1UTrGTC5 O7hdRhA75u7V6Aom3yatl5Gohn/jZyfleb5/7j6j2uDZZ9I8B+/VRuyRXTmoIX7mcQRh9it5piGz9 Z4TxV4uvXtzUSjyhU7bw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vlTvq-00000000HTH-2EeU; Thu, 29 Jan 2026 15:27:42 +0000 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vlTvo-00000000HS6-15Th for linux-riscv@lists.infradead.org; Thu, 29 Jan 2026 15:27:41 +0000 Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60TAKXvI3674030 for ; Thu, 29 Jan 2026 15:27:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= ScOC4GuemLF+vD6HqYRKrExatm0/7pF+N+hUpuGlD6w=; b=lm+Pl4lwNanlF8MG x05/DQHvA9ngneLxFBxDmTgdaEi2lEc9+nA+8s9bmWNXByRIYIVPCErqeYr5CYxD EhuAN+7e5w20mADS3ka/V9dwiShZl6g//O1JD4+t1D1q3dBCOBeIPst1Sltynwf5 plcXSMY0k1wG1E8KiAEoa2SoeuInJ0n2JJoqfdXZi1mZmFmhgjhob6nteDNrdwtl m+XeoiHKr5pjeWJewDgTtjuGc9ro4f01UwfaKq7UZDFRLs4zjS5EmvpwfdCkbWdY ppUmw3mo+W01rOKceE7Zf0mUu2mvzK7SDZZG/VIpp19mvArQMm1PMQHkE8PSbnd8 Js1agQ== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4c05q7gxbk-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 29 Jan 2026 15:27:38 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8c71655aa11so326204885a.3 for ; Thu, 29 Jan 2026 07:27:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1769700458; x=1770305258; darn=lists.infradead.org; h=in-reply-to:references:cc:subject:from:to:message-id:date :content-transfer-encoding:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=ScOC4GuemLF+vD6HqYRKrExatm0/7pF+N+hUpuGlD6w=; b=Hl47+DG+V5rbK9JFv5ZcBKBIQEHnsoxUIL4cGN2rsRCHT+BIZIk0PA3tUVjnzyPLyJ a9Ie5RZDRxdKKPeSiHnY35lB3lp9dhJxLRSw6U1cMH8XpKbLGr0zEx1qG6jSNKrM1luF lfxrE2xAc9pXML8xHMqTrCYfI/rCd7f6vOJmI3PDqubho66LW78gJe3ap1ELcuxs/HG9 0/yvn/zWgpZ5cgppTdQdwoplx/fCosrxwOlvBRvAmQet6e4kAPYH98E1JNuVL4GDoThe HGXIAX987AwJlS5qVq41fdD7VBCgsLao81k92DajLaZWvtZGmq3UEtsA8YICo8SBRe3j I7ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769700458; x=1770305258; h=in-reply-to:references:cc:subject:from:to:message-id:date :content-transfer-encoding:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ScOC4GuemLF+vD6HqYRKrExatm0/7pF+N+hUpuGlD6w=; b=jEinZxKujio5Xt468PjkvhZqb6du7tYsDbniVTCn2Ai1WrHSBRL6SKDi1J6NxtGSKQ w7a6yT5cdZDzKCmhvDRY+VaUmVMl7bc/tSwWEnfVxRiS5DMgtJc3NXNV+3ZuhJCAiGLQ NG58FyxItI0P78EIXlbkxTUcRQe6YlWjHI6d8Bt/JeeQ4EWFVX8EYHnijXpIBgzPh/oR 8PlAt0g2FLTLn1imWYZ0NaLe8yMr6XhMdl8oy8pJHAYvqMREaSjB9C2jZPBZiQol9JME qq0NzkFilkiQz8qXWdCKi5KjF1BDcSQnxXz9QhYJcnSTEEJwocf176BpslRi0SP8khK3 643w== X-Forwarded-Encrypted: i=1; AJvYcCUFKlv4oH55e9WGuYmTJ1D4eapq+8rP6MXa9SREMkm+1jNwffaixQXP/vsDhUDfdNnRwJgf1PNT5LWnlA==@lists.infradead.org X-Gm-Message-State: AOJu0YwOmqdVOZdDuPSpgcAcGhilJrvg92jbZb7Rl+q+FdgX/akKsDAc 6laV7GYAx5fcEN+JmEglohr49Fc/JZ9c1+5rZOe0aGHvw42swynjOOvtdSPQyEjhGqltdSN5MtU j2yEMFVUajfBNn7lnr+0PlRh0MtTSiXpx1uA7jjUEiTMde4OzS1X0fIQZ45HF1p5v5x7kACo= X-Gm-Gg: AZuq6aJR/WN9k2lY+gzy65fSNDVZfzGErnoiDavxGP5jOHLePw3JzHVzGJZen+ho9jV pJK7YBo1+7P1SF5V9cGqDjkXlahQa1uKQGwce+kC9K1F7TbEGa4wtnmK8+IPXcT27IPgq9KWFul gCShpyu7rrsWBQ7oom+bipmkSThzOAc4EVU8fAOIpgQAMS/pPDRZmFnT8MobtjQ5SNra/YuUxtk /b1eIJV3PH7/0jkx/jfcmgPWMP5uCLXyTnsLeNmvW8wTDIf0MTAla7NuMZfaRlKk/UCOVpvAMQ+ 5LaiMUqA2EcOcXtE7jy2hwxYScGwz8uTev+QLuA05WIfLoqMv/df+Zvkw0LDQpt3mq5kq8ZFVPG 8qRvz2ZNzqCElCCR2yEd1l6EUed0mQQ5GwNDMX1TBy9JoW3kK X-Received: by 2002:a05:620a:bc8:b0:8b2:eefb:c8a6 with SMTP id af79cd13be357-8c70b92cc4emr1250375785a.88.1769700457643; Thu, 29 Jan 2026 07:27:37 -0800 (PST) X-Received: by 2002:a05:620a:bc8:b0:8b2:eefb:c8a6 with SMTP id af79cd13be357-8c70b92cc4emr1250369285a.88.1769700456838; Thu, 29 Jan 2026 07:27:36 -0800 (PST) Received: from localhost (ip-86-49-253-11.bb.vodafone.cz. [86.49.253.11]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-435e131cefdsm15219531f8f.23.2026.01.29.07.27.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jan 2026 07:27:36 -0800 (PST) Mime-Version: 1.0 Date: Thu, 29 Jan 2026 15:27:35 +0000 Message-Id: To: , , , , , , , , , From: =?utf-8?q?Radim_Kr=C4=8Dm=C3=A1=C5=99?= Subject: Re: [PATCH v3 1/2] RISC-V: KVM: Support runtime configuration for per-VM's HGATP mode Cc: , , , , , , References: <20260125150450.27068-1-fangyu.yu@linux.alibaba.com> <20260125150450.27068-2-fangyu.yu@linux.alibaba.com> In-Reply-To: <20260125150450.27068-2-fangyu.yu@linux.alibaba.com> X-Proofpoint-GUID: scEvo5QcN0e3pe1SnCAQf4FsGUjvt_q6 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTI5MDEwNiBTYWx0ZWRfXyGNE273Ek51e fkVZDuob7PzayMTYZDuIK0ulCPtOTg92zwJfV3Hxo3aFrQ8KPkKVqh9zb3xzD+tKHXqQQuypbsV GaCnf6MysBfr3Wpy5b53hkJkX7Etbf9Eh6SycreEswLPDYb8xdIVG/a36G+l8ED2nLRCs0GA63k 2g/W0xCejKJCbv/4c5V9jywBPSrFKvzyOo4cuU0az80McwTmFx+8YkhJ+jTA0VbEPuVRXlWkuVm 3PCosYqjA+I0tpASwqG1d9WtUJr2FTz8rBroOk51AKNVNfdATvWldeK5u6eVOQQD56xUnvc1M9m 3IiDziU2bV2Hkh02AymAUltk6K8MGSb2ImTi0EDjlDWJ5fP3aRCbCfUmRmGaianeO5LMt3uMVAZ akx/Co0MhqNgRDG961cC2pU7j1wUqoBo/sG0AuQeZyNF+nD6H/w/GZtP+Lg6a/SLBHPshHun+n9 Z/zQiyyMtHmPZZVzqNw== X-Authority-Analysis: v=2.4 cv=donWylg4 c=1 sm=1 tr=0 ts=697b7c6a cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=HFCiZzTCIv7qJCpyeE1rag==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=SRrdq9N9AAAA:8 a=f4C2yWSDeSD6iuI_DtIA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-ORIG-GUID: scEvo5QcN0e3pe1SnCAQf4FsGUjvt_q6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-01-29_02,2026-01-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 clxscore=1015 suspectscore=0 spamscore=0 impostorscore=0 bulkscore=0 priorityscore=1501 phishscore=0 lowpriorityscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601290106 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260129_072740_305030_93CC174B X-CRM114-Status: GOOD ( 20.86 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 2026-01-25T23:04:49+08:00, : > From: Fangyu Yu > > Introduces one per-VM architecture-specific fields to support runtime > configuration of the G-stage page table format: > > - kvm->arch.kvm_riscv_gstage_pgd_levels: the corresponding number of page > table levels for the selected mode. > > These fields replace the previous global variables > kvm_riscv_gstage_mode and kvm_riscv_gstage_pgd_levels, enabling different > virtual machines to independently select their G-stage page table format > instead of being forced to share the maximum mode detected by the kernel > at boot time. > > Signed-off-by: Fangyu Yu > --- > diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h > @@ -87,6 +87,22 @@ struct kvm_vcpu_stat { > struct kvm_arch_memory_slot { > }; > > +static inline unsigned long kvm_riscv_gstage_mode(unsigned long pgd_levels) > +{ > + switch (pgd_levels) { > + case 2: > + return HGATP_MODE_SV32X4; > + case 3: > + return HGATP_MODE_SV39X4; > + case 4: > + return HGATP_MODE_SV48X4; > + case 5: > + return HGATP_MODE_SV57X4; > + default: > + return HGATP_MODE_OFF; I think default should be an internal error. We can do "case 0: return HGATP_MODE_OFF;", or just error it too since KVM shouldn't ever ask for mode without protection anyway. > diff --git a/arch/riscv/kvm/gstage.c b/arch/riscv/kvm/gstage.c > @@ -319,41 +321,48 @@ void __init kvm_riscv_gstage_mode_detect(void) > +unsigned long kvm_riscv_gstage_gpa_bits(struct kvm_arch *ka) > +{ > + return (HGATP_PAGE_SHIFT + > + ka->kvm_riscv_gstage_pgd_levels * kvm_riscv_gstage_index_bits + > + kvm_riscv_gstage_pgd_xbits); > +} > + > +gpa_t kvm_riscv_gstage_gpa_size(struct kvm_arch *ka) > +{ > + return BIT_ULL(kvm_riscv_gstage_gpa_bits(ka)); > +} Please define these two functions as static inline in the header files. They used to be just macros there, so it'd be safer not put LTO into the equation. > diff --git a/arch/riscv/kvm/main.c b/arch/riscv/kvm/main.c > @@ -105,17 +105,17 @@ static int __init riscv_kvm_init(void) > return rc; > > kvm_riscv_gstage_mode_detect(); > - switch (kvm_riscv_gstage_mode) { > - case HGATP_MODE_SV32X4: > + switch (kvm_riscv_gstage_max_pgd_levels) { > + case 2: > str = "Sv32x4"; > break; > - case HGATP_MODE_SV39X4: > + case 3: > str = "Sv39x4"; > break; > - case HGATP_MODE_SV48X4: > + case 4: > str = "Sv48x4"; > break; > - case HGATP_MODE_SV57X4: > + case 5: > str = "Sv57x4"; > break; > default: > @@ -164,7 +164,7 @@ static int __init riscv_kvm_init(void) > (rc) ? slist : "no features"); > } > > - kvm_info("using %s G-stage page table format\n", str); > + kvm_info("Max G-stage page table format %s\n", str); Fun fact: the ISA doesn't define the same hierarchy for hgatp modes as it does for satp modes, so we could have just Sv57x4 and nothing below. We could do just with a code comment that we're assuming vendors will do better, but I'd rather not introduce more assumptions... I think the easiest would be to kvm_riscv_gstage_mode_detect() levels in reverse and stop on the first one that is not supported. (I'll reply with a patch later.) Thanks. _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv