From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=115.124.30.113 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793435435; b=jVIACSPzoNQ9JVTqsxn+i/lQPqn0KrzvqamcaqfbDkGtWZch3tokkZnVBhDWw4pOM8sk VTH1Qp2gZKUp3pSEwT1ZsHdQ1XKIZNfidGkFX6G0fEhR516MmSDTftzlu6IBRJCqSIelS 1M2Cu3r12ZDPDjUI+SYdUg4KIkELeciPDo7K3B8lzbugq/dALuBq3B4pqTPGaGx5a8ylR mJ7rc8bSGmVMjcJvup4YjllW8L/e++Tqqp8Rx/nTaweVa3vjsPfjzrHahqkoBoaqFtMHa 9o9N01tEIZj4RevAXyEXP8OLf9EgXvG6phnY4xPY5S9L1JnwDEuIqSMfydpCnHa0Tqw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793435435; h=DMARC-Filter:DKIM-Signature:X-Alimail-AntiSpam:Received:From:To:Cc: Subject:Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=bHdV+uBKMbmZEFk857VJk5Itb2ycFnnVw8kcF5qHilM=; b=hZgotiZDsBetqAgBwWIhWAzma/6qxV2OFcGDLytCLde8pIBsxJBTLiROaOEMzzvuUYhu NNBGU+p4g712qHz8c0uYgwzaeIFBx9E11tHhZ/K6+QIQ8CWhuiX5Z21k3WLcm1gyg286L II3mmHT/eyCj43RrRBxuA9QzsjxECz08IFzHzNkdUQfdJwGcejjtuJsDauXEehT2Vt4qB 7maLe+N/7YPJmFxEayOLN9LizBZaJdkRUp4lxDBxyIS8IgUDMg3mdF5QnCJ6jJygGxkmd MQhKv4ibpxIMjni2POgeOsIrR0uRkGf6B5kaP1uf0EPwm+1Fd3HfHr/2INt1w49SoKA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass header.d=linux.alibaba.com header.i=@linux.alibaba.com header.a=rsa-sha256 header.s=default header.b=vCapseRt; arc=none smtp.remote-ip=115.124.30.113 Received: from out30-113.freemail.mail.aliyun.com (out30-113.freemail.mail.aliyun.com [115.124.30.113]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3AA1606A327 for ; Sat, 31 Oct 2026 08:30:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org E3AA1606A327 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.a=rsa-sha256 header.s=default header.b=vCapseRt DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1793435426; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=bHdV+uBKMbmZEFk857VJk5Itb2ycFnnVw8kcF5qHilM=; b=vCapseRthEn+lpW/qMBCxKpQUW6kAJOszjON60ngnHOaZicDyB6Z4xCkWmxSrQuPgWbpYSmI2rtF0gUP3gG7BD6vd1enDnCOq/74Txa5YTaWcW6aqp+IuUlZe9TGnReJWYGU4Q0CvEBj/N/eE4UVZEniaiwSqp526JvzczG+vhg= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R111e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033045098064;MF=fangyu.yu@linux.alibaba.com;NM=1;PH=DS;RN=28;SR=0;TI=SMTPD_---0XDo-2jU_1793435422; Received: from localhost.localdomain(mailfrom:fangyu.yu@linux.alibaba.com fp:SMTPD_---0XDo-2jU_1793435422 cluster:ay36) by smtp.aliyun-inc.com; Sat, 31 Oct 2026 16:30:23 +0800 From: fangyu.yu@linux.alibaba.com To: tomasz.jeznach@linux.dev, joro@8bytes.org, will@kernel.org, robin.murphy@arm.com, pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, baolu.lu@linux.intel.com, jroedel@suse.de, zong.li@sifive.com, andrew.jones@linux.dev, anup@brainfault.org, jgg@nvidia.com, jgg@ziepe.ca, kevin.tian@intel.com, atish.patra@linux.dev, skhawaja@google.com, vasant.hegde@amd.com, joerg.roedel@amd.com, tanchi25@mails.ucas.ac.cn, gong.shuai@sanechips.com.cn Cc: fangyu.yu@linux.alibaba.com, guoren@kernel.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, kvm-riscv@lists.infradead.org Subject: [PATCH v6 02/10] iommupt: Add RISC-V Second-stage (iohgatp) page table support Date: Sat, 31 Oct 2026 16:30:06 +0800 Message-Id: <20261031083014.15040-3-fangyu.yu@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20261031083014.15040-1-fangyu.yu@linux.alibaba.com> References: <20261031083014.15040-1-fangyu.yu@linux.alibaba.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Fangyu Yu Add support for Sv39x4/Sv48x4/Sv57x4 Second-stage page tables used by the RISC-V IOMMU iohgatp register. The x4 root page table is 16 KiB instead of the usual 4 KiB, covering 2 extra GPA bits (hw_max_vasz_lg2 = 41/50/59). Signed-off-by: Fangyu Yu Reviewed-by: Jason Gunthorpe --- drivers/iommu/generic_pt/fmt/iommu_riscv64.c | 2 +- drivers/iommu/generic_pt/fmt/riscv.h | 109 +++++++++++++++---- include/linux/generic_pt/common.h | 4 + include/linux/generic_pt/iommu.h | 11 ++ 4 files changed, 102 insertions(+), 24 deletions(-) diff --git a/drivers/iommu/generic_pt/fmt/iommu_riscv64.c b/drivers/iommu/generic_pt/fmt/iommu_riscv64.c index 1bb74114fb02..fa61839e5599 100644 --- a/drivers/iommu/generic_pt/fmt/iommu_riscv64.c +++ b/drivers/iommu/generic_pt/fmt/iommu_riscv64.c @@ -8,7 +8,7 @@ (BIT(PT_FEAT_SIGN_EXTEND) | BIT(PT_FEAT_FLUSH_RANGE) | \ BIT(PT_FEAT_RISCV_SVNAPOT_64K) | \ BIT(PT_FEAT_DETAILED_GATHER) | \ - BIT(PT_FEAT_RISCV_SVPBMT)) + BIT(PT_FEAT_RISCV_SVPBMT) | BIT(PT_FEAT_RISCV_S2)) #define PT_FORCE_ENABLED_FEATURES BIT(PT_FEAT_DETAILED_GATHER) #include "iommu_template.h" diff --git a/drivers/iommu/generic_pt/fmt/riscv.h b/drivers/iommu/generic_pt/fmt/riscv.h index ae9a76514416..d4445e463fa9 100644 --- a/drivers/iommu/generic_pt/fmt/riscv.h +++ b/drivers/iommu/generic_pt/fmt/riscv.h @@ -37,7 +37,16 @@ enum { PT_MAX_OUTPUT_ADDRESS_LG2 = 34, PT_MAX_TOP_LEVEL = 1, #else - PT_MAX_VA_ADDRESS_LG2 = 57, + /* + * PT_MAX_VA_ADDRESS_LG2 is the upper bound accepted by the generic + * pt_iommu_init() range check. It must cover both first-stage and + * second-stage (G-stage) modes: + * + * First-stage (fsc/iosatp): Sv39=39, Sv48=48, Sv57=57 + * Second-stage (iohgatp): Sv39x4=41, Sv48x4=50, Sv57x4=59 + * + */ + PT_MAX_VA_ADDRESS_LG2 = 59, PT_MAX_OUTPUT_ADDRESS_LG2 = 56, PT_MAX_TOP_LEVEL = 4, #endif @@ -126,6 +135,12 @@ riscvpt_entry_num_contig_lg2(const struct pt_state *pts) static inline unsigned int riscvpt_num_items_lg2(const struct pt_state *pts) { + /* + * It is not allowed to call pt_num_items_lg2() at the top level, this + * API restriction is specifically an optimization avoid overheads + * dealing with concatenated tables here. + */ + PT_WARN_ON(pts->level == pts->range->top_level); return PT_TABLEMEM_LG2SZ - ilog2(sizeof(u64)); } #define pt_num_items_lg2 riscvpt_num_items_lg2 @@ -261,20 +276,41 @@ riscvpt_iommu_fmt_init(struct pt_iommu_riscv_64 *iommu_table, const struct pt_iommu_riscv_64_cfg *cfg) { struct pt_riscv *table = &iommu_table->riscv_64pt; - - switch (cfg->common.hw_max_vasz_lg2) { - case 39: - pt_top_set_level(&table->common, 2); - break; - case 48: - pt_top_set_level(&table->common, 3); - break; - case 57: - pt_top_set_level(&table->common, 4); - break; - default: - return -EINVAL; + unsigned int top_level; + + if (pt_feature(&table->common, PT_FEAT_RISCV_S2)) { + /* Second-stage (iohgatp): Sv39x4 / Sv48x4 / Sv57x4. */ + switch (cfg->common.hw_max_vasz_lg2) { + case 41: + top_level = 2; + break; + case 50: + top_level = 3; + break; + case 59: + top_level = 4; + break; + default: + return -EINVAL; + } + } else { + /* First-stage (fsc/iosatp): Sv39 / Sv48 / Sv57. */ + switch (cfg->common.hw_max_vasz_lg2) { + case 39: + top_level = 2; + break; + case 48: + top_level = 3; + break; + case 57: + top_level = 4; + break; + default: + return -EINVAL; + } } + + pt_top_set_level(&table->common, top_level); table->common.max_oasz_lg2 = min(PT_MAX_OUTPUT_ADDRESS_LG2, cfg->common.hw_max_oasz_lg2); return 0; @@ -292,30 +328,57 @@ riscvpt_iommu_fmt_hw_info(struct pt_iommu_riscv_64 *table, PT_WARN_ON(top_phys & ~PT_TOP_PHYS_MASK); /* - * See Table 3. Encodings of iosatp.MODE field" for DC.tx.SXL = 0: - * 8 = Sv39 = top level 2 - * 9 = Sv38 = top level 3 - * 10 = Sv57 = top level 4 + * Both first-stage (fsc/iosatp) and second-stage (iohgatp) share the + * same MODE numeric values for a given top level: + * top_level 2 -> MODE 8 (Sv39 / Sv39x4) + * top_level 3 -> MODE 9 (Sv48 / Sv48x4) + * top_level 4 -> MODE 10 (Sv57 / Sv57x4) + * + * See "Table 3. Encodings of iosatp.MODE field" (DC.tc.SXL = 0) and + * "Table 2. Encoding of iohgatp.MODE field" in the RISC-V IOMMU spec. */ - info->fsc_iosatp_mode = top_range->top_level + 6; + if (pt_feature(&table->riscv_64pt.common, PT_FEAT_RISCV_S2)) + info->iohgatp_mode = top_range->top_level + 6; + else + info->fsc_iosatp_mode = top_range->top_level + 6; } #define pt_iommu_fmt_hw_info riscvpt_iommu_fmt_hw_info #if defined(GENERIC_PT_KUNIT) static const struct pt_iommu_riscv_64_cfg riscv_64_kunit_fmt_cfgs[] = { - [0] = { .common.features = BIT(PT_FEAT_RISCV_SVNAPOT_64K), + /* First-stage (fsc/iosatp): Sv39 / Sv48 / Sv57 */ + [0] = { .common.features = BIT(PT_FEAT_SIGN_EXTEND) | + BIT(PT_FEAT_RISCV_SVNAPOT_64K), .common.hw_max_oasz_lg2 = 56, .common.hw_max_vasz_lg2 = 39 }, - [1] = { .common.features = 0, + [1] = { .common.features = BIT(PT_FEAT_SIGN_EXTEND), .common.hw_max_oasz_lg2 = 56, .common.hw_max_vasz_lg2 = 48 }, - [2] = { .common.features = BIT(PT_FEAT_RISCV_SVNAPOT_64K), + [2] = { .common.features = BIT(PT_FEAT_SIGN_EXTEND) | + BIT(PT_FEAT_RISCV_SVNAPOT_64K), .common.hw_max_oasz_lg2 = 56, .common.hw_max_vasz_lg2 = 57 }, + /* + * Second-stage (iohgatp): Sv39x4 / Sv48x4 / Sv57x4. + */ + [3] = { .common.features = BIT(PT_FEAT_RISCV_S2) | + BIT(PT_FEAT_RISCV_SVNAPOT_64K), + .common.hw_max_oasz_lg2 = 56, + .common.hw_max_vasz_lg2 = 41 }, + [4] = { .common.features = BIT(PT_FEAT_RISCV_S2), + .common.hw_max_oasz_lg2 = 56, + .common.hw_max_vasz_lg2 = 50 }, + [5] = { .common.features = BIT(PT_FEAT_RISCV_S2) | + BIT(PT_FEAT_RISCV_SVNAPOT_64K), + .common.hw_max_oasz_lg2 = 56, + .common.hw_max_vasz_lg2 = 59 }, }; #define kunit_fmt_cfgs riscv_64_kunit_fmt_cfgs +/* Sign extension is only valid for first-stage configs, not S2. */ enum { - KUNIT_FMT_FEATURES = BIT(PT_FEAT_RISCV_SVNAPOT_64K), + KUNIT_FMT_FEATURES = BIT(PT_FEAT_SIGN_EXTEND) | + BIT(PT_FEAT_RISCV_SVNAPOT_64K) | + BIT(PT_FEAT_RISCV_S2), }; #endif diff --git a/include/linux/generic_pt/common.h b/include/linux/generic_pt/common.h index 1b39b27f0cfa..a87d8e3dc26d 100644 --- a/include/linux/generic_pt/common.h +++ b/include/linux/generic_pt/common.h @@ -197,6 +197,10 @@ enum { * Support Svpbmt extension: encode page-based memory type (PBMT) in PTEs. */ PT_FEAT_RISCV_SVPBMT, + /* + * Using second-stage / iohgatp address translation. + */ + PT_FEAT_RISCV_S2, }; diff --git a/include/linux/generic_pt/iommu.h b/include/linux/generic_pt/iommu.h index 13ebb72a67de..59edb5cf9408 100644 --- a/include/linux/generic_pt/iommu.h +++ b/include/linux/generic_pt/iommu.h @@ -328,7 +328,18 @@ struct pt_iommu_riscv_64_cfg { struct pt_iommu_riscv_64_hw_info { u64 ppn; + /* + * First-stage (fsc/iosatp) MODE encoding: + * 8 = Sv39, 9 = Sv48, 10 = Sv57 + * Used to program DC.fsc.iosatp.MODE. + */ u8 fsc_iosatp_mode; + /* + * Second-stage (iohgatp) MODE encoding: + * 8 = Sv39x4, 9 = Sv48x4, 10 = Sv57x4 + * Used to program DC.iohgatp.MODE. + */ + u8 iohgatp_mode; }; IOMMU_FORMAT(riscv_64, riscv_64pt); -- 2.50.1