mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Eugenio Pérez" <eperezma@redhat.com>
To: mst@redhat.com, elic@nvidia.com
Cc: linux-kernel@vger.kernel.org, parav@nvidia.com, lulu@redhat.com,
	jasowang@redhat.com, virtualization@lists.linux-foundation.org,
	sgarzare@redhat.com, si-wei.liu@oracle.com
Subject: [RFC 3/3] vdpa/mlx5: take iommu_lock at dup_iotlb
Date: Thu, 12 Jan 2023 15:22:18 +0100	[thread overview]
Message-ID: <20230112142218.725622-4-eperezma@redhat.com> (raw)
In-Reply-To: <20230112142218.725622-1-eperezma@redhat.com>

Both iommu changes and lookup are protected by mlx5_vdpa_net->reslock at
this moment, but:
* These iotlb changes / queries are not in the fast data path.
* reslock belongs to netdev, while dup_iotlb seems generic.
* It's located in a different file than the lock it needs to hold

Justifies the lock acquisition.

Fixes: 5262912ef3cf ("vdpa/mlx5: Add support for control VQ and MAC setting")
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
 drivers/vdpa/mlx5/core/mr.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/vdpa/mlx5/core/mr.c b/drivers/vdpa/mlx5/core/mr.c
index 878ee94efa78..e9c8a7f8ee1d 100644
--- a/drivers/vdpa/mlx5/core/mr.c
+++ b/drivers/vdpa/mlx5/core/mr.c
@@ -454,13 +454,15 @@ static int dup_iotlb(struct mlx5_vdpa_dev *mvdev, struct vhost_iotlb *src)
 {
 	struct vhost_iotlb_map *map;
 	u64 start = 0, last = ULLONG_MAX;
-	int err;
+	int err = 0;
+
+	spin_lock(&mvdev->cvq.iommu_lock);
 
 	vhost_iotlb_reset(mvdev->cvq.iotlb);
 
 	if (!src) {
 		err = vhost_iotlb_add_range(mvdev->cvq.iotlb, start, last, start, VHOST_ACCESS_RW);
-		return err;
+		goto out;
 	}
 
 	for (map = vhost_iotlb_itree_first(src, start, last); map;
@@ -468,9 +470,12 @@ static int dup_iotlb(struct mlx5_vdpa_dev *mvdev, struct vhost_iotlb *src)
 		err = vhost_iotlb_add_range(mvdev->cvq.iotlb, map->start, map->last,
 					    map->addr, map->perm);
 		if (err)
-			return err;
+			goto out;
 	}
-	return 0;
+
+out:
+	spin_unlock(&mvdev->cvq.iommu_lock);
+	return err;
 }
 
 static void prune_iotlb(struct mlx5_vdpa_dev *mvdev)
-- 
2.31.1


  parent reply	other threads:[~2023-01-12 14:32 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-12 14:22 [RFC 0/3] MLX Adress Space ID + Control VirtQueue fixes Eugenio Pérez
2023-01-12 14:22 ` [RFC 1/3] vdpa/mlx5: reset iotlb at dup_iotlb Eugenio Pérez
2023-01-16  6:31   ` Eli Cohen
2023-01-16 18:16     ` Eugenio Perez Martin
2023-01-12 14:22 ` [RFC 2/3] vdpa/mlx5: conditionally delete cvq iotlb in destroy_mr Eugenio Pérez
2023-01-16  7:03   ` Eli Cohen
2023-01-16 18:03     ` Eugenio Perez Martin
2023-01-17  7:07       ` Eli Cohen
2023-01-17  7:25         ` Eugenio Perez Martin
2023-01-12 14:22 ` Eugenio Pérez [this message]
2023-01-16  7:13   ` [RFC 3/3] vdpa/mlx5: take iommu_lock at dup_iotlb Eli Cohen
2023-01-16 10:39     ` Eugenio Perez Martin

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=20230112142218.725622-4-eperezma@redhat.com \
    --to=eperezma@redhat.com \
    --cc=elic@nvidia.com \
    --cc=jasowang@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lulu@redhat.com \
    --cc=mst@redhat.com \
    --cc=parav@nvidia.com \
    --cc=sgarzare@redhat.com \
    --cc=si-wei.liu@oracle.com \
    --cc=virtualization@lists.linux-foundation.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

all inboxes | Powered by JetHome®