Message ID | 7c8f0108-0d51-91bb-86b3-dd5ea6e0a269@suse.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | IOMMU: restrict visibility/scope if certain variables | expand |
> -----Original Message----- > From: Jan Beulich <jbeulich@suse.com> > Sent: 09 March 2020 10:44 > To: xen-devel@lists.xenproject.org > Cc: Kevin Tian <kevin.tian@intel.com>; Stefano Stabellini <sstabellini@kernel.org>; Julien Grall > <julien@xen.org>; Wei Liu <wl@xen.org>; Konrad Wilk <konrad.wilk@oracle.com>; George Dunlap > <George.Dunlap@eu.citrix.com>; Andrew Cooper <andrew.cooper3@citrix.com>; Ian Jackson > <ian.jackson@citrix.com>; Paul Durrant <paul@xen.org> > Subject: [PATCH v2 4/5] IOMMU: iommu_qinval is x86-only > > In fact it's VT-d specific, but we don't have a way yet to build code > for just one vendor. > > Signed-off-by: Jan Beulich <jbeulich@suse.com> Reviewed-by: Paul Durrant <paul@xen.org> > > --- a/xen/drivers/passthrough/iommu.c > +++ b/xen/drivers/passthrough/iommu.c > @@ -33,7 +33,6 @@ bool_t __read_mostly force_iommu; > bool_t __read_mostly iommu_verbose; > bool __read_mostly iommu_quarantine = true; > bool_t __read_mostly iommu_snoop = 1; > -bool_t __read_mostly iommu_qinval = 1; > bool_t __read_mostly iommu_crash_disable; > > static bool __hwdom_initdata iommu_hwdom_none; > @@ -75,13 +74,13 @@ static int __init parse_iommu_param(cons > #ifdef CONFIG_X86 > else if ( (val = parse_boolean("igfx", s, ss)) >= 0 ) > iommu_igfx = val; > + else if ( (val = parse_boolean("qinval", s, ss)) >= 0 ) > + iommu_qinval = val; > #endif > else if ( (val = parse_boolean("verbose", s, ss)) >= 0 ) > iommu_verbose = val; > else if ( (val = parse_boolean("snoop", s, ss)) >= 0 ) > iommu_snoop = val; > - else if ( (val = parse_boolean("qinval", s, ss)) >= 0 ) > - iommu_qinval = val; > #ifndef iommu_intremap > else if ( (val = parse_boolean("intremap", s, ss)) >= 0 ) > iommu_intremap = val ? iommu_intremap_full : iommu_intremap_off; > --- a/xen/drivers/passthrough/vtd/iommu.c > +++ b/xen/drivers/passthrough/vtd/iommu.c > @@ -51,6 +51,7 @@ struct mapped_rmrr { > bool __read_mostly untrusted_msi; > > bool __read_mostly iommu_igfx = true; > +bool __read_mostly iommu_qinval = true; > > int nr_iommus; > > --- a/xen/include/xen/iommu.h > +++ b/xen/include/xen/iommu.h > @@ -54,7 +54,7 @@ static inline bool_t dfn_eq(dfn_t x, dfn > > extern bool_t iommu_enable, iommu_enabled; > extern bool force_iommu, iommu_quarantine, iommu_verbose; > -extern bool_t iommu_snoop, iommu_qinval; > +extern bool_t iommu_snoop; > > #ifdef CONFIG_X86 > extern enum __packed iommu_intremap { > @@ -70,7 +70,7 @@ extern enum __packed iommu_intremap { > iommu_intremap_restricted, > iommu_intremap_full, > } iommu_intremap; > -extern bool iommu_igfx; > +extern bool iommu_igfx, iommu_qinval; > #else > # define iommu_intremap false > #endif
--- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -33,7 +33,6 @@ bool_t __read_mostly force_iommu; bool_t __read_mostly iommu_verbose; bool __read_mostly iommu_quarantine = true; bool_t __read_mostly iommu_snoop = 1; -bool_t __read_mostly iommu_qinval = 1; bool_t __read_mostly iommu_crash_disable; static bool __hwdom_initdata iommu_hwdom_none; @@ -75,13 +74,13 @@ static int __init parse_iommu_param(cons #ifdef CONFIG_X86 else if ( (val = parse_boolean("igfx", s, ss)) >= 0 ) iommu_igfx = val; + else if ( (val = parse_boolean("qinval", s, ss)) >= 0 ) + iommu_qinval = val; #endif else if ( (val = parse_boolean("verbose", s, ss)) >= 0 ) iommu_verbose = val; else if ( (val = parse_boolean("snoop", s, ss)) >= 0 ) iommu_snoop = val; - else if ( (val = parse_boolean("qinval", s, ss)) >= 0 ) - iommu_qinval = val; #ifndef iommu_intremap else if ( (val = parse_boolean("intremap", s, ss)) >= 0 ) iommu_intremap = val ? iommu_intremap_full : iommu_intremap_off; --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -51,6 +51,7 @@ struct mapped_rmrr { bool __read_mostly untrusted_msi; bool __read_mostly iommu_igfx = true; +bool __read_mostly iommu_qinval = true; int nr_iommus; --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -54,7 +54,7 @@ static inline bool_t dfn_eq(dfn_t x, dfn extern bool_t iommu_enable, iommu_enabled; extern bool force_iommu, iommu_quarantine, iommu_verbose; -extern bool_t iommu_snoop, iommu_qinval; +extern bool_t iommu_snoop; #ifdef CONFIG_X86 extern enum __packed iommu_intremap { @@ -70,7 +70,7 @@ extern enum __packed iommu_intremap { iommu_intremap_restricted, iommu_intremap_full, } iommu_intremap; -extern bool iommu_igfx; +extern bool iommu_igfx, iommu_qinval; #else # define iommu_intremap false #endif
In fact it's VT-d specific, but we don't have a way yet to build code for just one vendor. Signed-off-by: Jan Beulich <jbeulich@suse.com>