From: Dmytro Maluka <dmaluka@chromium.org>
To: David Woodhouse <dwmw2@infradead.org>,
Lu Baolu <baolu.lu@linux.intel.com>,
iommu@lists.linux.dev
Cc: Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
linux-kernel@vger.kernel.org,
"Vineeth Pillai (Google)" <vineeth@bitbyteword.org>,
Aashish Sharma <aashish@aashishsharma.net>,
Grzegorz Jaszczyk <jaszczyk@chromium.org>,
Chuanxiao Dong <chuanxiao.dong@intel.com>,
Kevin Tian <kevin.tian@intel.com>,
Dmytro Maluka <dmaluka@chromium.org>
Subject: [PATCH v2 2/5] iommu/vt-d: Generalize pasid_set_bits()
Date: Sat, 27 Dec 2025 18:57:25 +0100 [thread overview]
Message-ID: <20251227175728.4358-3-dmaluka@chromium.org> (raw)
In-Reply-To: <20251227175728.4358-1-dmaluka@chromium.org>
To prepare for reusing the pasid_set_bits() for context entries as well,
rename it to entry_set_bits() and move its definition to iommu.h.
Signed-off-by: Dmytro Maluka <dmaluka@chromium.org>
---
drivers/iommu/intel/iommu.h | 9 ++++++++
drivers/iommu/intel/pasid.h | 42 +++++++++++++++----------------------
2 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h
index 25c5e22096d4..2fab7ff4b932 100644
--- a/drivers/iommu/intel/iommu.h
+++ b/drivers/iommu/intel/iommu.h
@@ -897,6 +897,15 @@ static inline int pfn_level_offset(u64 pfn, int level)
return (pfn >> level_to_offset_bits(level)) & LEVEL_MASK;
}
+static inline void entry_set_bits(u64 *ptr, u64 mask, u64 bits)
+{
+ u64 old;
+
+ WARN_ON_ONCE(bits & ~mask);
+
+ old = READ_ONCE(*ptr);
+ WRITE_ONCE(*ptr, (old & ~mask) | (bits & mask));
+}
static inline void context_set_present(struct context_entry *context)
{
diff --git a/drivers/iommu/intel/pasid.h b/drivers/iommu/intel/pasid.h
index 39acd3efa3ab..f8fc73676192 100644
--- a/drivers/iommu/intel/pasid.h
+++ b/drivers/iommu/intel/pasid.h
@@ -10,6 +10,8 @@
#ifndef __INTEL_PASID_H
#define __INTEL_PASID_H
+#include "iommu.h"
+
#define PASID_MAX 0x100000
#define PASID_PTE_MASK 0x3F
#define PASID_PTE_PRESENT 1
@@ -109,16 +111,6 @@ static inline void pasid_clear_entry_with_fpd(struct pasid_entry *pe)
WRITE_ONCE(pe->val[7], 0);
}
-static inline void pasid_set_bits(u64 *ptr, u64 mask, u64 bits)
-{
- u64 old;
-
- WARN_ON_ONCE(bits & ~mask);
-
- old = READ_ONCE(*ptr);
- WRITE_ONCE(*ptr, (old & ~mask) | (bits & mask));
-}
-
static inline u64 pasid_get_bits(u64 *ptr)
{
return READ_ONCE(*ptr);
@@ -131,7 +123,7 @@ static inline u64 pasid_get_bits(u64 *ptr)
static inline void
pasid_set_domain_id(struct pasid_entry *pe, u64 value)
{
- pasid_set_bits(&pe->val[1], GENMASK_ULL(15, 0), value);
+ entry_set_bits(&pe->val[1], GENMASK_ULL(15, 0), value);
}
/*
@@ -150,7 +142,7 @@ pasid_get_domain_id(struct pasid_entry *pe)
static inline void
pasid_set_slptr(struct pasid_entry *pe, u64 value)
{
- pasid_set_bits(&pe->val[0], VTD_PAGE_MASK, value);
+ entry_set_bits(&pe->val[0], VTD_PAGE_MASK, value);
}
/*
@@ -160,7 +152,7 @@ pasid_set_slptr(struct pasid_entry *pe, u64 value)
static inline void
pasid_set_address_width(struct pasid_entry *pe, u64 value)
{
- pasid_set_bits(&pe->val[0], GENMASK_ULL(4, 2), value << 2);
+ entry_set_bits(&pe->val[0], GENMASK_ULL(4, 2), value << 2);
}
/*
@@ -170,7 +162,7 @@ pasid_set_address_width(struct pasid_entry *pe, u64 value)
static inline void
pasid_set_translation_type(struct pasid_entry *pe, u64 value)
{
- pasid_set_bits(&pe->val[0], GENMASK_ULL(8, 6), value << 6);
+ entry_set_bits(&pe->val[0], GENMASK_ULL(8, 6), value << 6);
}
/*
@@ -179,7 +171,7 @@ pasid_set_translation_type(struct pasid_entry *pe, u64 value)
*/
static inline void pasid_set_fault_enable(struct pasid_entry *pe)
{
- pasid_set_bits(&pe->val[0], 1 << 1, 0);
+ entry_set_bits(&pe->val[0], 1 << 1, 0);
}
/*
@@ -189,7 +181,7 @@ static inline void pasid_set_fault_enable(struct pasid_entry *pe)
*/
static inline void pasid_set_ssade(struct pasid_entry *pe)
{
- pasid_set_bits(&pe->val[0], 1 << 9, 1 << 9);
+ entry_set_bits(&pe->val[0], 1 << 9, 1 << 9);
}
/*
@@ -199,7 +191,7 @@ static inline void pasid_set_ssade(struct pasid_entry *pe)
*/
static inline void pasid_clear_ssade(struct pasid_entry *pe)
{
- pasid_set_bits(&pe->val[0], 1 << 9, 0);
+ entry_set_bits(&pe->val[0], 1 << 9, 0);
}
/*
@@ -218,7 +210,7 @@ static inline bool pasid_get_ssade(struct pasid_entry *pe)
*/
static inline void pasid_set_sre(struct pasid_entry *pe)
{
- pasid_set_bits(&pe->val[2], 1 << 0, 1);
+ entry_set_bits(&pe->val[2], 1 << 0, 1);
}
/*
@@ -227,7 +219,7 @@ static inline void pasid_set_sre(struct pasid_entry *pe)
*/
static inline void pasid_set_wpe(struct pasid_entry *pe)
{
- pasid_set_bits(&pe->val[2], 1 << 4, 1 << 4);
+ entry_set_bits(&pe->val[2], 1 << 4, 1 << 4);
}
/*
@@ -236,7 +228,7 @@ static inline void pasid_set_wpe(struct pasid_entry *pe)
*/
static inline void pasid_set_present(struct pasid_entry *pe)
{
- pasid_set_bits(&pe->val[0], 1 << 0, 1);
+ entry_set_bits(&pe->val[0], 1 << 0, 1);
}
/*
@@ -245,7 +237,7 @@ static inline void pasid_set_present(struct pasid_entry *pe)
*/
static inline void pasid_set_page_snoop(struct pasid_entry *pe, bool value)
{
- pasid_set_bits(&pe->val[1], 1 << 23, value << 23);
+ entry_set_bits(&pe->val[1], 1 << 23, value << 23);
}
/*
@@ -255,7 +247,7 @@ static inline void pasid_set_page_snoop(struct pasid_entry *pe, bool value)
static inline void
pasid_set_pgsnp(struct pasid_entry *pe)
{
- pasid_set_bits(&pe->val[1], 1ULL << 24, 1ULL << 24);
+ entry_set_bits(&pe->val[1], 1ULL << 24, 1ULL << 24);
}
/*
@@ -265,7 +257,7 @@ pasid_set_pgsnp(struct pasid_entry *pe)
static inline void
pasid_set_flptr(struct pasid_entry *pe, u64 value)
{
- pasid_set_bits(&pe->val[2], VTD_PAGE_MASK, value);
+ entry_set_bits(&pe->val[2], VTD_PAGE_MASK, value);
}
/*
@@ -275,7 +267,7 @@ pasid_set_flptr(struct pasid_entry *pe, u64 value)
static inline void
pasid_set_flpm(struct pasid_entry *pe, u64 value)
{
- pasid_set_bits(&pe->val[2], GENMASK_ULL(3, 2), value << 2);
+ entry_set_bits(&pe->val[2], GENMASK_ULL(3, 2), value << 2);
}
/*
@@ -284,7 +276,7 @@ pasid_set_flpm(struct pasid_entry *pe, u64 value)
*/
static inline void pasid_set_eafe(struct pasid_entry *pe)
{
- pasid_set_bits(&pe->val[2], 1 << 7, 1 << 7);
+ entry_set_bits(&pe->val[2], 1 << 7, 1 << 7);
}
extern unsigned int intel_pasid_max_id;
--
2.47.3
next prev parent reply other threads:[~2025-12-27 17:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-27 17:57 [PATCH v2 0/5] iommu/vt-d: Ensure memory ordering in context & root entry updates Dmytro Maluka
2025-12-27 17:57 ` [PATCH v2 1/5] iommu/vt-d: Sanitize set bits in pasid_set_bits() Dmytro Maluka
2025-12-27 17:57 ` Dmytro Maluka [this message]
2025-12-27 17:57 ` [PATCH v2 3/5] iommu/vt-d: Ensure memory ordering in context entry updates Dmytro Maluka
2025-12-27 17:57 ` [PATCH v2 4/5] iommu/vt-d: Use smp_wmb() before setting context/pasid present bit Dmytro Maluka
2025-12-27 17:57 ` [PATCH v2 5/5] iommu/vt-d: Use WRITE_ONCE for setting root table entries Dmytro Maluka
2026-01-05 18:12 ` [PATCH v2 0/5] iommu/vt-d: Ensure memory ordering in context & root entry updates Jason Gunthorpe
2026-01-05 18:54 ` Dmytro Maluka
2026-01-05 19:14 ` Jason Gunthorpe
2026-01-05 20:05 ` Dmytro Maluka
2026-01-06 0:14 ` Jason Gunthorpe
2026-01-06 7:48 ` Tian, Kevin
2026-01-06 14:40 ` Dmytro Maluka
2026-01-08 2:22 ` Tian, Kevin
2026-01-06 13:51 ` Dmytro Maluka
2026-01-06 14:23 ` Jason Gunthorpe
2026-01-06 15:50 ` Dmytro Maluka
2026-01-06 16:45 ` Jason Gunthorpe
2026-01-06 17:14 ` Dmytro Maluka
2026-01-08 2:09 ` Tian, Kevin
2026-01-09 6:32 ` Baolu Lu
[not found] ` <BN9PR11MB5276FB0F465DBFB4EE4D742B8C85A@BN9PR11MB5276.namprd11.prod.outlook.com>
2026-01-08 7:00 ` Tian, Kevin
2026-01-06 3:37 ` Baolu Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251227175728.4358-3-dmaluka@chromium.org \
--to=dmaluka@chromium.org \
--cc=aashish@aashishsharma.net \
--cc=baolu.lu@linux.intel.com \
--cc=chuanxiao.dong@intel.com \
--cc=dwmw2@infradead.org \
--cc=iommu@lists.linux.dev \
--cc=jaszczyk@chromium.org \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=vineeth@bitbyteword.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®