From: "Jan Beulich" <JBeulich@suse.com>
To: "xen-devel" <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Brian Woods <brian.woods@amd.com>,
Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Subject: [Xen-devel] [PATCH 3/9] AMD/IOMMU: use bit field for IRTE
Date: Thu, 13 Jun 2019 07:23:10 -0600 [thread overview]
Message-ID: <5D024E3E0200007800237E03@prv1-mh.provo.novell.com> (raw)
In-Reply-To: <5D024C500200007800237DD8@prv1-mh.provo.novell.com>
At the same time restrict its scope to just the single source file
actually using it, and abstract accesses by introducing a union of
pointers. (A union of the actual table entries is not used to make it
impossible to [wrongly, once the 128-bit form gets added] perform
pointer arithmetic / array accesses on derived types.)
Also move away from updating the entries piecemeal: Construct a full new
entry, and write it out.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
It would have been nice to use write_atomic() or ACCESS_ONCE() for the
actual writes, but both cast the value to a scalar one, which doesn't
suit us here (and I also didn't want to make the compound type a union
with a raw member just for this).
--- a/xen/drivers/passthrough/amd/iommu_intr.c
+++ b/xen/drivers/passthrough/amd/iommu_intr.c
@@ -23,6 +23,23 @@
#include <asm/io_apic.h>
#include <xen/keyhandler.h>
+struct irte_basic {
+ unsigned int remap_en:1;
+ unsigned int sup_io_pf:1;
+ unsigned int int_type:3;
+ unsigned int rq_eoi:1;
+ unsigned int dm:1;
+ unsigned int guest_mode:1; /* MBZ */
+ unsigned int dest:8;
+ unsigned int vector:8;
+ unsigned int :8;
+};
+
+union irte_ptr {
+ void *raw;
+ struct irte_basic *basic;
+};
+
#define INTREMAP_TABLE_ORDER 1
#define INTREMAP_LENGTH 0xB
#define INTREMAP_ENTRIES (1 << INTREMAP_LENGTH)
@@ -101,47 +118,44 @@ static unsigned int alloc_intremap_entry
return slot;
}
-static u32 *get_intremap_entry(int seg, int bdf, int offset)
+static union irte_ptr get_intremap_entry(unsigned int seg, unsigned int bdf,
+ unsigned int offset)
{
- u32 *table = get_ivrs_mappings(seg)[bdf].intremap_table;
+ union irte_ptr table = {
+ .raw = get_ivrs_mappings(seg)[bdf].intremap_table
+ };
+
+ ASSERT(table.raw && (offset < INTREMAP_ENTRIES));
- ASSERT( (table != NULL) && (offset < INTREMAP_ENTRIES) );
+ table.basic += offset;
- return table + offset;
+ return table;
}
-static void free_intremap_entry(int seg, int bdf, int offset)
+static void free_intremap_entry(unsigned int seg, unsigned int bdf, unsigned int offset)
{
- u32 *entry = get_intremap_entry(seg, bdf, offset);
+ union irte_ptr entry = get_intremap_entry(seg, bdf, offset);
+
+ *entry.basic = (struct irte_basic){};
- memset(entry, 0, sizeof(u32));
__clear_bit(offset, get_ivrs_mappings(seg)[bdf].intremap_inuse);
}
-static void update_intremap_entry(u32* entry, u8 vector, u8 int_type,
- u8 dest_mode, u8 dest)
-{
- set_field_in_reg_u32(IOMMU_CONTROL_ENABLED, 0,
- INT_REMAP_ENTRY_REMAPEN_MASK,
- INT_REMAP_ENTRY_REMAPEN_SHIFT, entry);
- set_field_in_reg_u32(IOMMU_CONTROL_DISABLED, *entry,
- INT_REMAP_ENTRY_SUPIOPF_MASK,
- INT_REMAP_ENTRY_SUPIOPF_SHIFT, entry);
- set_field_in_reg_u32(int_type, *entry,
- INT_REMAP_ENTRY_INTTYPE_MASK,
- INT_REMAP_ENTRY_INTTYPE_SHIFT, entry);
- set_field_in_reg_u32(IOMMU_CONTROL_DISABLED, *entry,
- INT_REMAP_ENTRY_REQEOI_MASK,
- INT_REMAP_ENTRY_REQEOI_SHIFT, entry);
- set_field_in_reg_u32((u32)dest_mode, *entry,
- INT_REMAP_ENTRY_DM_MASK,
- INT_REMAP_ENTRY_DM_SHIFT, entry);
- set_field_in_reg_u32((u32)dest, *entry,
- INT_REMAP_ENTRY_DEST_MAST,
- INT_REMAP_ENTRY_DEST_SHIFT, entry);
- set_field_in_reg_u32((u32)vector, *entry,
- INT_REMAP_ENTRY_VECTOR_MASK,
- INT_REMAP_ENTRY_VECTOR_SHIFT, entry);
+static void update_intremap_entry(union irte_ptr entry, unsigned int vector,
+ unsigned int int_type,
+ unsigned int dest_mode, unsigned int dest)
+{
+ struct irte_basic basic = {
+ .remap_en = 1,
+ .sup_io_pf = 0,
+ .int_type = int_type,
+ .rq_eoi = 0,
+ .dm = dest_mode,
+ .dest = dest,
+ .vector = vector,
+ };
+
+ *entry.basic = basic;
}
static inline int get_rte_index(const struct IO_APIC_route_entry *rte)
@@ -163,7 +177,7 @@ static int update_intremap_entry_from_io
u16 *index)
{
unsigned long flags;
- u32* entry;
+ union irte_ptr entry;
u8 delivery_mode, dest, vector, dest_mode;
int req_id;
spinlock_t *lock;
@@ -201,12 +215,8 @@ static int update_intremap_entry_from_io
* so need to recover vector and delivery mode from IRTE.
*/
ASSERT(get_rte_index(rte) == offset);
- vector = get_field_from_reg_u32(*entry,
- INT_REMAP_ENTRY_VECTOR_MASK,
- INT_REMAP_ENTRY_VECTOR_SHIFT);
- delivery_mode = get_field_from_reg_u32(*entry,
- INT_REMAP_ENTRY_INTTYPE_MASK,
- INT_REMAP_ENTRY_INTTYPE_SHIFT);
+ vector = entry.basic->vector;
+ delivery_mode = entry.basic->int_type;
}
update_intremap_entry(entry, vector, delivery_mode, dest_mode, dest);
@@ -228,7 +238,7 @@ int __init amd_iommu_setup_ioapic_remapp
{
struct IO_APIC_route_entry rte;
unsigned long flags;
- u32* entry;
+ union irte_ptr entry;
int apic, pin;
u8 delivery_mode, dest, vector, dest_mode;
u16 seg, bdf, req_id;
@@ -407,16 +417,12 @@ unsigned int amd_iommu_read_ioapic_from_
u16 bdf = ioapic_sbdf[idx].bdf;
u16 seg = ioapic_sbdf[idx].seg;
u16 req_id = get_intremap_requestor_id(seg, bdf);
- const u32 *entry = get_intremap_entry(seg, req_id, offset);
+ union irte_ptr entry = get_intremap_entry(seg, req_id, offset);
ASSERT(offset == (val & (INTREMAP_ENTRIES - 1)));
val &= ~(INTREMAP_ENTRIES - 1);
- val |= get_field_from_reg_u32(*entry,
- INT_REMAP_ENTRY_INTTYPE_MASK,
- INT_REMAP_ENTRY_INTTYPE_SHIFT) << 8;
- val |= get_field_from_reg_u32(*entry,
- INT_REMAP_ENTRY_VECTOR_MASK,
- INT_REMAP_ENTRY_VECTOR_SHIFT);
+ val |= MASK_INSR(entry.basic->int_type, IO_APIC_REDIR_DELIV_MODE_MASK);
+ val |= MASK_INSR(entry.basic->vector, IO_APIC_REDIR_VECTOR_MASK);
}
return val;
@@ -427,7 +433,7 @@ static int update_intremap_entry_from_ms
int *remap_index, const struct msi_msg *msg, u32 *data)
{
unsigned long flags;
- u32* entry;
+ union irte_ptr entry;
u16 req_id, alias_id;
u8 delivery_mode, dest, vector, dest_mode;
spinlock_t *lock;
@@ -581,7 +587,7 @@ void amd_iommu_read_msi_from_ire(
const struct pci_dev *pdev = msi_desc->dev;
u16 bdf = pdev ? PCI_BDF2(pdev->bus, pdev->devfn) : hpet_sbdf.bdf;
u16 seg = pdev ? pdev->seg : hpet_sbdf.seg;
- const u32 *entry;
+ union irte_ptr entry;
if ( IS_ERR_OR_NULL(_find_iommu_for_device(seg, bdf)) )
return;
@@ -597,12 +603,8 @@ void amd_iommu_read_msi_from_ire(
}
msg->data &= ~(INTREMAP_ENTRIES - 1);
- msg->data |= get_field_from_reg_u32(*entry,
- INT_REMAP_ENTRY_INTTYPE_MASK,
- INT_REMAP_ENTRY_INTTYPE_SHIFT) << 8;
- msg->data |= get_field_from_reg_u32(*entry,
- INT_REMAP_ENTRY_VECTOR_MASK,
- INT_REMAP_ENTRY_VECTOR_SHIFT);
+ msg->data |= MASK_INSR(entry.basic->int_type, MSI_DATA_DELIVERY_MODE_MASK);
+ msg->data |= MASK_INSR(entry.basic->vector, MSI_DATA_VECTOR_MASK);
}
int __init amd_iommu_free_intremap_table(
--- a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h
+++ b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h
@@ -468,22 +468,6 @@ struct amd_iommu_pte {
#define IOMMU_CONTROL_DISABLED 0
#define IOMMU_CONTROL_ENABLED 1
-/* interrupt remapping table */
-#define INT_REMAP_ENTRY_REMAPEN_MASK 0x00000001
-#define INT_REMAP_ENTRY_REMAPEN_SHIFT 0
-#define INT_REMAP_ENTRY_SUPIOPF_MASK 0x00000002
-#define INT_REMAP_ENTRY_SUPIOPF_SHIFT 1
-#define INT_REMAP_ENTRY_INTTYPE_MASK 0x0000001C
-#define INT_REMAP_ENTRY_INTTYPE_SHIFT 2
-#define INT_REMAP_ENTRY_REQEOI_MASK 0x00000020
-#define INT_REMAP_ENTRY_REQEOI_SHIFT 5
-#define INT_REMAP_ENTRY_DM_MASK 0x00000040
-#define INT_REMAP_ENTRY_DM_SHIFT 6
-#define INT_REMAP_ENTRY_DEST_MAST 0x0000FF00
-#define INT_REMAP_ENTRY_DEST_SHIFT 8
-#define INT_REMAP_ENTRY_VECTOR_MASK 0x00FF0000
-#define INT_REMAP_ENTRY_VECTOR_SHIFT 16
-
#define INV_IOMMU_ALL_PAGES_ADDRESS ((1ULL << 63) - 1)
#define IOMMU_RING_BUFFER_PTR_MASK 0x0007FFF0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-06-13 13:23 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-13 13:14 [Xen-devel] [PATCH 0/9] x86: AMD x2APIC support Jan Beulich
2019-06-13 13:22 ` [Xen-devel] [PATCH 1/9] AMD/IOMMU: use bit field for extended feature register Jan Beulich
2019-06-17 19:07 ` Woods, Brian
2019-06-18 9:37 ` Jan Beulich
2019-06-17 20:23 ` Andrew Cooper
2019-06-18 9:33 ` Jan Beulich
2019-06-13 13:22 ` [Xen-devel] [PATCH 2/9] AMD/IOMMU: use bit field for control register Jan Beulich
2019-06-18 9:54 ` Andrew Cooper
2019-06-18 10:45 ` Jan Beulich
2019-06-13 13:23 ` Jan Beulich [this message]
2019-06-18 10:37 ` [Xen-devel] [PATCH 3/9] AMD/IOMMU: use bit field for IRTE Andrew Cooper
2019-06-18 11:53 ` Jan Beulich
2019-06-18 12:16 ` Andrew Cooper
2019-06-18 12:55 ` Jan Beulich
2019-06-18 11:31 ` Andrew Cooper
2019-06-18 11:47 ` Jan Beulich
2019-06-13 13:23 ` [Xen-devel] [PATCH 4/9] AMD/IOMMU: introduce 128-bit IRTE non-guest-APIC IRTE format Jan Beulich
2019-06-18 11:57 ` Andrew Cooper
2019-06-18 15:31 ` Jan Beulich
2019-06-13 13:24 ` [Xen-devel] [PATCH 5/9] AMD/IOMMU: split amd_iommu_init_one() Jan Beulich
2019-06-18 12:17 ` Andrew Cooper
2019-06-13 13:25 ` [Xen-devel] [PATCH 6/9] AMD/IOMMU: allow enabling with IRQ not yet set up Jan Beulich
2019-06-18 12:22 ` Andrew Cooper
2019-06-13 13:26 ` [Xen-devel] [PATCH 7/9] AMD/IOMMU: adjust setup of internal interrupt for x2APIC mode Jan Beulich
2019-06-18 12:35 ` Andrew Cooper
2019-06-13 13:27 ` [Xen-devel] [PATCH 8/9] AMD/IOMMU: enable x2APIC mode when available Jan Beulich
2019-06-18 13:40 ` Andrew Cooper
2019-06-18 14:02 ` Jan Beulich
2019-06-13 13:28 ` [Xen-devel] [PATCH RFC 9/9] AMD/IOMMU: correct IRTE updating Jan Beulich
2019-06-18 13:28 ` Andrew Cooper
2019-06-18 14:58 ` Jan Beulich
2019-06-27 15:15 ` [Xen-devel] [PATCH v2 00/10] x86: AMD x2APIC support Jan Beulich
2019-06-27 15:19 ` [Xen-devel] [PATCH v2 01/10] AMD/IOMMU: restrict feature logging Jan Beulich
2019-07-01 15:37 ` Andrew Cooper
2019-07-01 15:59 ` Woods, Brian
2019-06-27 15:19 ` [Xen-devel] [PATCH v2 02/10] AMD/IOMMU: use bit field for extended feature register Jan Beulich
2019-07-02 12:09 ` Andrew Cooper
2019-07-02 13:48 ` Jan Beulich
2019-07-16 16:02 ` Jan Beulich
2019-06-27 15:20 ` [Xen-devel] [PATCH v2 03/10] AMD/IOMMU: use bit field for control register Jan Beulich
2019-07-02 12:20 ` Andrew Cooper
2019-06-27 15:20 ` [Xen-devel] [PATCH v2 04/10] AMD/IOMMU: use bit field for IRTE Jan Beulich
2019-07-02 12:33 ` Andrew Cooper
2019-07-02 13:56 ` Jan Beulich
2019-06-27 15:21 ` [Xen-devel] [PATCH v2 05/10] AMD/IOMMU: introduce 128-bit IRTE non-guest-APIC IRTE format Jan Beulich
2019-07-02 14:41 ` Andrew Cooper
2019-07-03 8:46 ` Jan Beulich
2019-07-16 6:39 ` Jan Beulich
2019-06-27 15:21 ` [Xen-devel] [PATCH v2 06/10] AMD/IOMMU: split amd_iommu_init_one() Jan Beulich
2019-06-27 15:22 ` [Xen-devel] [PATCH v2 07/10] AMD/IOMMU: allow enabling with IRQ not yet set up Jan Beulich
2019-06-27 15:22 ` [Xen-devel] [PATCH v2 08/10] AMD/IOMMU: adjust setup of internal interrupt for x2APIC mode Jan Beulich
2019-06-27 15:23 ` [Xen-devel] [PATCH v2 09/10] AMD/IOMMU: enable x2APIC mode when available Jan Beulich
2019-07-02 14:50 ` Andrew Cooper
2019-06-27 15:23 ` [Xen-devel] [PATCH RFC v2 10/10] AMD/IOMMU: correct IRTE updating Jan Beulich
2019-07-02 15:08 ` Andrew Cooper
2019-07-03 8:55 ` Jan Beulich
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=5D024E3E0200007800237E03@prv1-mh.provo.novell.com \
--to=jbeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=brian.woods@amd.com \
--cc=suravee.suthikulpanit@amd.com \
--cc=xen-devel@lists.xenproject.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;
as well as URLs for NNTP newsgroup(s).