lkml.org 
[lkml]   [2020]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 040/255] iommu/vt-d: Fix sid not set issue in intel_svm_bind_gpasid()
    Date
    From: Liu Yi L <yi.l.liu@intel.com>

    [ Upstream commit eea4e29ab8bef254b228d6e1e3de188087b2c7d0 ]

    Should get correct sid and set it into sdev. Because we execute
    'sdev->sid != req->rid' in the loop of prq_event_thread().

    Fixes: eb8d93ea3c1d ("iommu/vt-d: Report page request faults for guest SVA")
    Signed-off-by: Liu Yi L <yi.l.liu@intel.com>
    Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com>
    Acked-by: Lu Baolu <baolu.lu@linux.intel.com>
    Link: https://lore.kernel.org/r/1604025444-6954-2-git-send-email-yi.y.sun@linux.intel.com
    Signed-off-by: Joerg Roedel <jroedel@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/iommu/intel/svm.c | 6 ++++++
    1 file changed, 6 insertions(+)

    diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c
    index 95c3164a2302f..a71fbbddaa66e 100644
    --- a/drivers/iommu/intel/svm.c
    +++ b/drivers/iommu/intel/svm.c
    @@ -278,6 +278,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev,
    struct intel_iommu *iommu = device_to_iommu(dev, NULL, NULL);
    struct intel_svm_dev *sdev = NULL;
    struct dmar_domain *dmar_domain;
    + struct device_domain_info *info;
    struct intel_svm *svm = NULL;
    int ret = 0;

    @@ -302,6 +303,10 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev,
    if (data->hpasid <= 0 || data->hpasid >= PASID_MAX)
    return -EINVAL;

    + info = get_domain_info(dev);
    + if (!info)
    + return -EINVAL;
    +
    dmar_domain = to_dmar_domain(domain);

    mutex_lock(&pasid_mutex);
    @@ -349,6 +354,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev,
    goto out;
    }
    sdev->dev = dev;
    + sdev->sid = PCI_DEVID(info->bus, info->devfn);

    /* Only count users if device has aux domains */
    if (iommu_dev_feature_enabled(dev, IOMMU_DEV_FEAT_AUX))
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-11-17 14:39    [W:4.063 / U:0.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site