| Message ID | ec68ca290a207a3e191e470fb19254b7f6f887f8.1710342968.git-series.marmarek@invisiblethingslab.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | MSI-X support with qemu in stubdomain, and other related changes | expand |
On 13.03.2024 16:16, Marek Marczykowski-Górecki wrote: > The arch_msix struct had a single "warned" field with a domid for which > warning was issued. Upcoming patch will need similar mechanism for few > more warnings, so change it to save a bit field of issued warnings. > > Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> > --- > Should I add also some helper for the boilerplate the handling requires > now? I tried some macro that also sets the bit field, but I couldn't get > it working. I guess I could make it working with a bitmask in a single > uint8_t - would that be preferred? Without you providing some hint as to where the problem was, it's hard to see why something like this couldn't work: #define MSIX_CHECK_WARN(msix, domid, which) ({ \ if ( (msix)->warned_domid != (domid) ) \ { \ (msix)->warned_domid = (domid); \ (msix)->warned_kind.all = 0; \ } \ (msix)->warned_kind.which ? false : ((msix)->warned_kind.which = true); \ }) > --- a/xen/arch/x86/include/asm/msi.h > +++ b/xen/arch/x86/include/asm/msi.h > @@ -217,7 +217,13 @@ struct arch_msix { > int table_idx[MAX_MSIX_TABLE_PAGES]; > spinlock_t table_lock; > bool host_maskall, guest_maskall; > - domid_t warned; > + domid_t warned_domid; > + union { > + uint8_t all; > + struct { > + bool maskall : 1; > + } u; No need for giving this struct a name, I don't think. Jan
diff --git a/xen/arch/x86/include/asm/msi.h b/xen/arch/x86/include/asm/msi.h index 997ccb87be0c..19b1e6631fdf 100644 --- a/xen/arch/x86/include/asm/msi.h +++ b/xen/arch/x86/include/asm/msi.h @@ -217,7 +217,13 @@ struct arch_msix { int table_idx[MAX_MSIX_TABLE_PAGES]; spinlock_t table_lock; bool host_maskall, guest_maskall; - domid_t warned; + domid_t warned_domid; + union { + uint8_t all; + struct { + bool maskall : 1; + } u; + } warned_kind; }; void early_msi_init(void); diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index e721aaf5c001..6433df30bd60 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -364,9 +364,14 @@ static bool msi_set_mask_bit(struct irq_desc *desc, bool host, bool guest) domid_t domid = pdev->domain->domain_id; maskall = true; - if ( pdev->msix->warned != domid ) + if ( pdev->msix->warned_domid != domid ) { - pdev->msix->warned = domid; + pdev->msix->warned_domid = domid; + pdev->msix->warned_kind.all = 0; + } + if ( !pdev->msix->warned_kind.u.maskall ) + { + pdev->msix->warned_kind.u.maskall = true; printk(XENLOG_G_WARNING "cannot mask IRQ %d: masking MSI-X on Dom%d's %pp\n", desc->irq, domid, &pdev->sbdf);
The arch_msix struct had a single "warned" field with a domid for which warning was issued. Upcoming patch will need similar mechanism for few more warnings, so change it to save a bit field of issued warnings. Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> --- Should I add also some helper for the boilerplate the handling requires now? I tried some macro that also sets the bit field, but I couldn't get it working. I guess I could make it working with a bitmask in a single uint8_t - would that be preferred? New in v5 --- xen/arch/x86/include/asm/msi.h | 8 +++++++- xen/arch/x86/msi.c | 9 +++++++-- 2 files changed, 14 insertions(+), 3 deletions(-)