Skip to contentSkip to conversation

vDPA/ifcvf: implement doorbell mapping feature

PATCH RESEND In review Zhu Lingshan 2 participants 4 messages Jun 2, 2021

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

v4 cover vDPA/ifcvf: implement doorbell mapping feature

(resend, add Jason's ack and remove unused vars)

This series implements doorbell mapping feature for ifcvf.

Please help review

Thanks!

Changes from V3:
remove the warning for doorbell non-page-alignment(Jason)

Zhu Lingshan (2):
vDPA/ifcvf: record virtio notify base vDPA/ifcvf: implement doorbell mapping for ifcvf

 drivers/vdpa/ifcvf/ifcvf_base.c |  4 ++++
 drivers/vdpa/ifcvf/ifcvf_base.h |  2 ++
 drivers/vdpa/ifcvf/ifcvf_main.c | 16 ++++++++++++++++
 3 files changed, 22 insertions(+)
Signature · 1 line
2.27.0
#1 lore raw

PATCH RESEND v4 1/2 vDPA/ifcvf: record virtio notify base

This commit records virtio notify base physical addr and calculate doorbell physical address for vqs.

---
 drivers/vdpa/ifcvf/ifcvf_base.c | 4 ++++
 drivers/vdpa/ifcvf/ifcvf_base.h | 2 ++
 2 files changed, 6 insertions(+)
drivers/vdpa/ifcvf/ifcvf_base.c +4 -0
index 1a661ab45af5..6e197fe0fcf9 100644
@@ -133,6 +133,8 @@ int ifcvf_init_hw(struct ifcvf_hw *hw, struct pci_dev *pdev)
 					      &hw->notify_off_multiplier);
 			hw->notify_bar = cap.bar;
 			hw->notify_base = get_cap_addr(hw, &cap);
+			hw->notify_base_pa = pci_resource_start(pdev, cap.bar) +
+					le32_to_cpu(cap.offset);
 			IFCVF_DBG(pdev, "hw->notify_base = %p\n",
 				  hw->notify_base);
 			break;
@@ -161,6 +163,8 @@ int ifcvf_init_hw(struct ifcvf_hw *hw, struct pci_dev *pdev)
 		notify_off = ifc_ioread16(&hw->common_cfg->queue_notify_off);
 		hw->vring[i].notify_addr = hw->notify_base +
 			notify_off * hw->notify_off_multiplier;
+		hw->vring[i].notify_pa = hw->notify_base_pa +
+			notify_off * hw->notify_off_multiplier;
 	}
 
 	hw->lm_cfg = hw->base[IFCVF_LM_BAR];
drivers/vdpa/ifcvf/ifcvf_base.h +2 -0
index 0111bfdeb342..447f4ad9c0bf 100644
@@ -73,6 +73,7 @@ struct vring_info {
 	u16 last_avail_idx;
 	bool ready;
 	void __iomem *notify_addr;
+	phys_addr_t notify_pa;
 	u32 irq;
 	struct vdpa_callback cb;
 	char msix_name[256];
@@ -87,6 +88,7 @@ struct ifcvf_hw {
 	u8 notify_bar;
 	/* Notificaiton bar address */
 	void __iomem *notify_base;
+	phys_addr_t notify_base_pa;
 	u32 notify_off_multiplier;
 	u64 req_features;
 	u64 hw_features;
Signature · 1 line
2.27.0
#2 lore raw

PATCH RESEND v4 2/2 vDPA/ifcvf: implement doorbell mapping for ifcvf

In reply to Zhu Lingshan

This commit implements doorbell mapping feature for ifcvf. This feature maps the notify page to userspace, to eliminate vmexit when kick a vq.

---
 drivers/vdpa/ifcvf/ifcvf_main.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
drivers/vdpa/ifcvf/ifcvf_main.c +16 -0
index ab0ab5cf0f6e..46a992eab3e5 100644
@@ -413,6 +413,21 @@ static int ifcvf_vdpa_get_vq_irq(struct vdpa_device *vdpa_dev,
 	return vf->vring[qid].irq;
 }
 
+static struct vdpa_notification_area ifcvf_get_vq_notification(struct vdpa_device *vdpa_dev,
+							       u16 idx)
+{
+	struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev);
+	struct vdpa_notification_area area;
+
+	area.addr = vf->vring[idx].notify_pa;
+	if (!vf->notify_off_multiplier)
+		area.size = PAGE_SIZE;
+	else
+		area.size = vf->notify_off_multiplier;
+
+	return area;
+}
+
 /*
  * IFCVF currently does't have on-chip IOMMU, so not
  * implemented set_map()/dma_map()/dma_unmap()
@@ -440,6 +455,7 @@ static const struct vdpa_config_ops ifc_vdpa_ops = {
 	.get_config	= ifcvf_vdpa_get_config,
 	.set_config	= ifcvf_vdpa_set_config,
 	.set_config_cb  = ifcvf_vdpa_set_config_cb,
+	.get_vq_notification = ifcvf_get_vq_notification,
 };
 
 static int ifcvf_probe(struct pci_dev *pdev, const struct pci_device_id *id)
Signature · 1 line
2.27.0
Acked-by on v4 2/2
#3 lore raw

Re: [RESEND PATCH V4 2/2] vDPA/ifcvf: implement doorbell mapping for ifcvf

Quoted 5 lines · Zhu Lingshan

This commit implements doorbell mapping feature for ifcvf. This feature maps the notify page to userspace, to eliminate vmexit when kick a vq.

Quoted 38 lines
---
  drivers/vdpa/ifcvf/ifcvf_main.c | 16 ++++++++++++++++
  1 file changed, 16 insertions(+)
drivers/vdpa/ifcvf/ifcvf_main.c +16 -0
index ab0ab5cf0f6e..46a992eab3e5 100644
@@ -413,6 +413,21 @@ static int ifcvf_vdpa_get_vq_irq(struct vdpa_device *vdpa_dev,
  	return vf->vring[qid].irq;
  }
 
+static struct vdpa_notification_area ifcvf_get_vq_notification(struct vdpa_device *vdpa_dev,
+							       u16 idx)
+{
+	struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev);
+	struct vdpa_notification_area area;
+
+	area.addr = vf->vring[idx].notify_pa;
+	if (!vf->notify_off_multiplier)
+		area.size = PAGE_SIZE;
+	else
+		area.size = vf->notify_off_multiplier;
+
+	return area;
+}
+
  /*
   * IFCVF currently does't have on-chip IOMMU, so not
   * implemented set_map()/dma_map()/dma_unmap()
@@ -440,6 +455,7 @@ static const struct vdpa_config_ops ifc_vdpa_ops = {
  	.get_config	= ifcvf_vdpa_get_config,
  	.set_config	= ifcvf_vdpa_set_config,
  	.set_config_cb  = ifcvf_vdpa_set_config_cb,
+	.get_vq_notification = ifcvf_get_vq_notification,
  };
 
  static int ifcvf_probe(struct pci_dev *pdev, const struct pci_device_id *id)