Skip to contentSkip to conversation

vdpa/mlx5: Add support for doorbell bypassing

PATCH In review Eli Cohen 2 participants 2 messages Jun 3, 2021 – Jun 4, 2021

Subsystems (2)
lore
Share & tools
lore

Eli Cohen

author
#0 lore raw

PATCH v2 1/1 vdpa/mlx5: Add support for doorbell bypassing

Implement mlx5_get_vq_notification() to return the doorbell address. Since the notification area is mapped to userspace, make sure that the BAR size is at least PAGE_SIZE large.

---
v0 --> v1:
Make sure SF bar size is not smaller than PAGE_SIZE
v1 --> v2:
Remove test on addr alignment since it's alrady done by the caller.

 drivers/vdpa/mlx5/core/mlx5_vdpa.h |  1 +
 drivers/vdpa/mlx5/core/resources.c |  1 +
 drivers/vdpa/mlx5/net/mlx5_vnet.c  | 14 ++++++++++++++
 3 files changed, 16 insertions(+)
drivers/vdpa/mlx5/core/mlx5_vdpa.h +1 -0
index 09a16a3d1b2a..0002b2136b48 100644
@@ -42,6 +42,7 @@ struct mlx5_vdpa_resources {
 	u32 pdn;
 	struct mlx5_uars_page *uar;
 	void __iomem *kick_addr;
+	u64 phys_kick_addr;
 	u16 uid;
 	u32 null_mkey;
 	bool valid;
drivers/vdpa/mlx5/core/resources.c +1 -0
index 836ab9ef0fa6..d4606213f88a 100644
@@ -253,6 +253,7 @@ int mlx5_vdpa_alloc_resources(struct mlx5_vdpa_dev *mvdev)
 		goto err_key;
 
 	kick_addr = mdev->bar_addr + offset;
+	res->phys_kick_addr = kick_addr;
 
 	res->kick_addr = ioremap(kick_addr, PAGE_SIZE);
 	if (!res->kick_addr) {
drivers/vdpa/mlx5/net/mlx5_vnet.c +14 -0
index 689d3fa61e08..bc33f2c523d3 100644
@@ -1879,8 +1879,22 @@ static void mlx5_vdpa_free(struct vdpa_device *vdev)
 
 static struct vdpa_notification_area mlx5_get_vq_notification(struct vdpa_device *vdev, u16 idx)
 {
+	struct mlx5_vdpa_dev *mvdev = to_mvdev(vdev);
 	struct vdpa_notification_area ret = {};
+	struct mlx5_vdpa_net *ndev;
+	phys_addr_t addr;
 
+	/* If SF BAR size is smaller than PAGE_SIZE, do not use direct
+	 * notification to avoid the risk of mapping pages that contain BAR of more
+	 * than one SF
+	 */
+	if (MLX5_CAP_GEN(mvdev->mdev, log_min_sf_size) + 12 < PAGE_SHIFT)
+		return ret;
+
+	ndev = to_mlx5_vdpa_ndev(mvdev);
+	addr = (phys_addr_t)ndev->mvdev.res.phys_kick_addr;
+	ret.addr = addr;
+	ret.size = PAGE_SIZE;
 	return ret;
 }
 
Signature · 1 line
2.31.1
Acked-by on v2 1/1
#1 lore raw
Quoted 10 lines · Eli Cohen

Implement mlx5_get_vq_notification() to return the doorbell address. Since the notification area is mapped to userspace, make sure that the BAR size is at least PAGE_SIZE large.

---
v0 --> v1:
Make sure SF bar size is not smaller than PAGE_SIZE
v1 --> v2:
Remove test on addr alignment since it's alrady done by the caller.

Quoted 57 lines
  drivers/vdpa/mlx5/core/mlx5_vdpa.h |  1 +
  drivers/vdpa/mlx5/core/resources.c |  1 +
  drivers/vdpa/mlx5/net/mlx5_vnet.c  | 14 ++++++++++++++
  3 files changed, 16 insertions(+)
drivers/vdpa/mlx5/core/mlx5_vdpa.h +1 -0
index 09a16a3d1b2a..0002b2136b48 100644
@@ -42,6 +42,7 @@ struct mlx5_vdpa_resources {
  	u32 pdn;
  	struct mlx5_uars_page *uar;
  	void __iomem *kick_addr;
+	u64 phys_kick_addr;
  	u16 uid;
  	u32 null_mkey;
  	bool valid;
drivers/vdpa/mlx5/core/resources.c +1 -0
index 836ab9ef0fa6..d4606213f88a 100644
@@ -253,6 +253,7 @@ int mlx5_vdpa_alloc_resources(struct mlx5_vdpa_dev *mvdev)
  		goto err_key;
 
  	kick_addr = mdev->bar_addr + offset;
+	res->phys_kick_addr = kick_addr;
 
  	res->kick_addr = ioremap(kick_addr, PAGE_SIZE);
  	if (!res->kick_addr) {
drivers/vdpa/mlx5/net/mlx5_vnet.c +14 -0
index 689d3fa61e08..bc33f2c523d3 100644
@@ -1879,8 +1879,22 @@ static void mlx5_vdpa_free(struct vdpa_device *vdev)
 
  static struct vdpa_notification_area mlx5_get_vq_notification(struct vdpa_device *vdev, u16 idx)
  {
+	struct mlx5_vdpa_dev *mvdev = to_mvdev(vdev);
  	struct vdpa_notification_area ret = {};
+	struct mlx5_vdpa_net *ndev;
+	phys_addr_t addr;
 
+	/* If SF BAR size is smaller than PAGE_SIZE, do not use direct
+	 * notification to avoid the risk of mapping pages that contain BAR of more
+	 * than one SF
+	 */
+	if (MLX5_CAP_GEN(mvdev->mdev, log_min_sf_size) + 12 < PAGE_SHIFT)
+		return ret;
+
+	ndev = to_mlx5_vdpa_ndev(mvdev);
+	addr = (phys_addr_t)ndev->mvdev.res.phys_kick_addr;
+	ret.addr = addr;
+	ret.size = PAGE_SIZE;
  	return ret;
  }