@@ -74,6 +74,7 @@ static int msi_get_domain_base_index(str
return domid * MSI_XA_DOMAIN_SIZE;
}
+static unsigned int msi_domain_get_hwsize(struct device *dev, unsigned int domid);
/**
* msi_alloc_desc - Allocate an initialized msi_desc
@@ -116,6 +117,7 @@ static int msi_insert_desc(struct device
unsigned int domid, unsigned int index)
{
struct msi_device_data *md = dev->msi.data;
+ unsigned int hwsize;
int baseidx, ret;
baseidx = msi_get_domain_base_index(dev, domid);
@@ -124,6 +126,12 @@ static int msi_insert_desc(struct device
goto fail;
}
+ hwsize = msi_domain_get_hwsize(dev, domid);
+ if (index >= hwsize) {
+ ret = -ERANGE;
+ goto fail;
+ }
+
desc->msi_index = index;
index += baseidx;
ret = xa_insert(&md->__store, index, desc, GFP_KERNEL);
@@ -179,9 +187,11 @@ static bool msi_desc_match(struct msi_de
static bool msi_ctrl_range_valid(struct device *dev, struct msi_ctrl *ctrl)
{
+ unsigned int hwsize = msi_domain_get_hwsize(dev, ctrl->domid);
+
if (WARN_ON_ONCE(ctrl->first > ctrl->last ||
- ctrl->first > MSI_MAX_INDEX ||
- ctrl->last > MSI_MAX_INDEX))
+ ctrl->first >= hwsize ||
+ ctrl->last >= hwsize))
return false;
return true;
}
@@ -446,7 +456,7 @@ unsigned int msi_domain_get_virq(struct
if (!dev->msi.data)
return 0;
- if (WARN_ON_ONCE(index > MSI_MAX_INDEX))
+ if (WARN_ON_ONCE(index >= msi_domain_get_hwsize(dev, domid)))
return 0;
/* This check is only valid for the PCI default MSI domain */
@@ -614,6 +624,25 @@ static struct irq_domain *msi_get_device
return domain;
}
+static unsigned int msi_domain_get_hwsize(struct device *dev, unsigned int domid)
+{
+ struct msi_domain_info *info;
+ struct irq_domain *domain;
+
+ /*
+ * Retrieve the MSI domain for range checking. If there is no
+ * domain or the domain is not a per device domain, then assume
+ * full MSI range and pray that the calling subsystem knows what it
+ * is doing.
+ */
+ domain = msi_get_device_domain(dev, domid);
+ if (domain && irq_domain_is_msi_device(domain)) {
+ info = domain->host_data;
+ return info->hwsize;
+ }
+ return MSI_MAX_INDEX + 1;
+}
+
static inline void irq_chip_write_msi_msg(struct irq_data *data,
struct msi_msg *msg)
{
@@ -1390,7 +1419,7 @@ int msi_domain_alloc_irqs_all_locked(str
struct msi_ctrl ctrl = {
.domid = domid,
.first = 0,
- .last = MSI_MAX_INDEX,
+ .last = msi_domain_get_hwsize(dev, domid) - 1,
.nirqs = nirqs,
};
@@ -1506,7 +1535,8 @@ void msi_domain_free_irqs_range(struct d
*/
void msi_domain_free_irqs_all_locked(struct device *dev, unsigned int domid)
{
- msi_domain_free_irqs_range_locked(dev, domid, 0, MSI_MAX_INDEX);
+ msi_domain_free_irqs_range_locked(dev, domid, 0,
+ msi_domain_get_hwsize(dev, domid) - 1);
}
/**
Per device domains provide the domain size to the core code. This allows range checking on insertion of MSI descriptors and also paves the way for dynamic index allocations which are required e.g. for IMS. This avoids external mechanisms like bitmaps on the device side and just utilizes the core internal MSI descriptor store for it. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- kernel/irq/msi.c | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-)