From nobody Thu Oct 30 16:37:40 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1760975914; cv=none; d=zohomail.com; s=zohoarc; b=CuDOxGUqfCqZms86/wDFcdVRdMUBF4IFahUUVaLgyt4yr02aVpz5ZwdtN4Y6Ca4KAc2I5OhBfCJp44vsnBs9deT0JPjTTtl0ljgDTtOOlIyHqeVaR4FCwXRGxsEzo+Uuur1/cWtBy9CwR7Y2PpzENpVlQ/0uWePQJajyVUtTHg0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760975914; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CweJfrPabX9qr27+BJlL85E9LD+o5VwLJH3d1PbUUo0=; b=kY84Ase37MzfS/uYIEjbsfiD0YeS27RFUDEhMpUbhezgdmDiYIoZOuEHqdYQ+Ru8+Er3YvWQfk7OI5Po8Z911p6hOMXkT6ICfQVvNdUvyJOKQBmy/yS3sdd1QIrUgNbm+vOCCH6XKKsj0uJOkbzN1XiOBFq4HYqacUumZuaDYq8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1760975914899476.1764410463877; Mon, 20 Oct 2025 08:58:34 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1146536.1479003 (Exim 4.92) (envelope-from ) id 1vAsH6-0005uI-Ei; Mon, 20 Oct 2025 15:58:20 +0000 Received: by outflank-mailman (output) from mailman id 1146536.1479003; Mon, 20 Oct 2025 15:58:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vAsH6-0005sv-2R; Mon, 20 Oct 2025 15:58:20 +0000 Received: by outflank-mailman (input) for mailman id 1146536; Mon, 20 Oct 2025 15:58:18 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vAsH4-0004DQ-28 for xen-devel@lists.xenproject.org; Mon, 20 Oct 2025 15:58:18 +0000 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [2a00:1450:4864:20::62f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 97a5e038-adcd-11f0-9d15-b5c5bf9af7f9; Mon, 20 Oct 2025 17:58:17 +0200 (CEST) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-b3c2db014easo998559666b.0 for ; Mon, 20 Oct 2025 08:58:17 -0700 (PDT) Received: from fedora (user-109-243-146-38.play-internet.pl. [109.243.146.38]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-63c48ab560esm6966067a12.12.2025.10.20.08.58.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Oct 2025 08:58:16 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 97a5e038-adcd-11f0-9d15-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760975897; x=1761580697; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CweJfrPabX9qr27+BJlL85E9LD+o5VwLJH3d1PbUUo0=; b=A1rJLV2Bojo32TjohZAYcakLk8owctkKxGQ+iyjit0dOpz7qTJWYRzEWhEZO74YVlA eKPUnUEC36B/sV1nDJJZPvZhIB/EW4kk4hN+UxnRwhN6hc6CGz5h+dVwM7daXcSfxPUS Fz6QaApOblqYOQs4zrJIP7GIMkYYCvbAXOd2ElFuEr4F7DiqfD7jfUhYP2cQ98Lus3P1 SUE7a5lt9Lb0b56GPvQ+2XM0854v0LUW9S6bAqdfFMNRBzXXvzTj3TZCztCNYEHckTHM zVUALk5xZFDtK7F0k/Hy+6WlXQy9EitzhhIp2OAqaOljfBPyekKSfCcWvFpPtgWRC4VP xNCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760975897; x=1761580697; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CweJfrPabX9qr27+BJlL85E9LD+o5VwLJH3d1PbUUo0=; b=vo8/Ud4NNfCnsN8zTYQdziGVGOXwy55E+3dSidu/5dQqYlP9gYNUiahXoNphouoSCs 5naVNV6GCzKsGhWiKrV0ylCly61BkNuRPq7N/m+8FCZ2PNLj7nVgK/Fmbel8W4YPnIP5 21vL7TTQa92OWD0EZHKN+pXrQCbUZ1w8+ohK4hNWJ9RMkYKPp9XurxyFBwbV5QIBMiCx vKqJ49hnLLYcFkVaT938DcXtBvgyUk73SaQZFr2SVJMasTAoblmxasedA8Ealzn9KzhY yB3uIGQeT7EZ5gSQqYca25P9SGbrW7yag7/uqBhmsuocrOtKV3OKQUthFPqtzOWodX/2 Rzyw== X-Gm-Message-State: AOJu0YwxBpJBAQGy80GpHETUQyt0rfOx3tZMn29Dn68AueV/p4dlS1bW ly851M1HDzS5RYAXEmLgWY9vjNU4914Rb3Rm9w5lyym9hQE0T4DK1fSnmS5Q8A== X-Gm-Gg: ASbGnctIaLzX0a2P7nGeZZn2+og9U6/LdLm+3JufSzz/6DtfiTjkjYPGUy1ebXErFN6 NBf0xarXBlOgPVVpAoR9fjkKO2n/ESsGBMlKo/pDakUN2hPrZq3lWyfraJgTK2KHM+Q6ahyGYS6 AFysOUPWvXaFrg87n19/yC6R1wh+Sviv5/Bu+ZJxG/SasmD9VqJmvUJEc6/KrKLuqGK17dUIBiC hrqjvO0EOq4sodYwDGAmwJWL7wwgCrGEvEau5BrNUNFcHq79wGDN7NUZvcT4bm4/7h6ZYvOdQGv 48XKpaOBjFwSDtgAIILfAgAQJhPBK9z0ZxenWzcoz63VxrZDbJ8fpt8aCqwpzzC6XB5CM3H2X0v BmGZQD9/vr8bR5B64ujlyHeGmtlKvUAEumNg1kTLd+De4vT/Dv0yt8Ifku9vDZNAqqmrfwd1p/R t8ScAxK1NnHMBv8OzprAGl50KVYxnOzU/Z1D9188RlK0BSoxw= X-Google-Smtp-Source: AGHT+IHoIhJtsof26UvSvFaoP8y38nf7VSxnKgXGly/gx12d4R9mgwEIQTznUSFJA/rx/fkav7aYaA== X-Received: by 2002:a17:907:1c9e:b0:b40:6d68:349a with SMTP id a640c23a62f3a-b647493fe5dmr1583199466b.39.1760975896477; Mon, 20 Oct 2025 08:58:16 -0700 (PDT) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Oleksii Kurochko , Alistair Francis , Bob Eshleman , Connor Davis , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini Subject: [for 4.22 v5 06/18] xen/riscv: introduce pte_{set,get}_mfn() Date: Mon, 20 Oct 2025 17:57:49 +0200 Message-ID: <15707c6a76bb3ac4680499dfd1272d6161a126e8.1760974017.git.oleksii.kurochko@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1760975915611154100 Content-Type: text/plain; charset="utf-8" Introduce helpers pte_{set,get}_mfn() to simplify setting and getting of mfn. Also, introduce PTE_PPN_MASK and add BUILD_BUG_ON() to be sure that PTE_PPN_MASK remains the same for all MMU modes except Sv32. Signed-off-by: Oleksii Kurochko Acked-by: Jan Beulich --- Changes in V4-V5: - Nothing changed. Only Rebase. --- Changes in V3: - Add Acked-by: Jan Beulich . --- Changes in V2: - Patch "[PATCH v1 4/6] xen/riscv: define pt_t and pt_walk_t structures" w= as renamed to xen/riscv: introduce pte_{set,get}_mfn() as after dropping of bitfields for PTE structure, this patch introduce only pte_{set,get}_mfn= (). - As pt_t and pt_walk_t were dropped, update implementation of pte_{set,get}_mfn() to use bit operations and shifts instead of bitfield= s. - Introduce PTE_PPN_MASK to be able to use MASK_INSR for setting/getting P= PN. - Add BUILD_BUG_ON(RV_STAGE1_MODE > SATP_MODE_SV57) to be sure that when new MMU mode will be added, someone checks that PPN is still bits 53:10. --- xen/arch/riscv/include/asm/page.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/xen/arch/riscv/include/asm/page.h b/xen/arch/riscv/include/asm= /page.h index ddcc4da0a3..66cb192316 100644 --- a/xen/arch/riscv/include/asm/page.h +++ b/xen/arch/riscv/include/asm/page.h @@ -112,6 +112,30 @@ typedef struct { #endif } pte_t; =20 +#if RV_STAGE1_MODE !=3D SATP_MODE_SV32 +#define PTE_PPN_MASK _UL(0x3FFFFFFFFFFC00) +#else +#define PTE_PPN_MASK _U(0xFFFFFC00) +#endif + +static inline void pte_set_mfn(pte_t *p, mfn_t mfn) +{ + /* + * At the moment spec provides Sv32 - Sv57. + * If one day new MMU mode will be added it will be needed + * to check that PPN mask still continue to cover bits 53:10. + */ + BUILD_BUG_ON(RV_STAGE1_MODE > SATP_MODE_SV57); + + p->pte &=3D ~PTE_PPN_MASK; + p->pte |=3D MASK_INSR(mfn_x(mfn), PTE_PPN_MASK); +} + +static inline mfn_t pte_get_mfn(pte_t p) +{ + return _mfn(MASK_EXTR(p.pte, PTE_PPN_MASK)); +} + static inline bool pte_is_valid(pte_t p) { return p.pte & PTE_VALID; --=20 2.51.0