Skip to contentSkip to conversation

PCI: hv: fix reading of PCI_INTERRUPT_PIN

PATCH In review Wei Liu 3 participants 6 messages Jun 21, 2024 – Jul 1, 2024

Subsystems (4)
lore
Share & tools
lore

Wei Liu

author maintainer
#0 lore raw

PATCH v2 1/1 PCI: hv: fix reading of PCI_INTERRUPT_PIN

The intent of the code snippet is to always return 0 for both PCI_INTERRUPT_LINE and PCI_INTERRUPT_PIN.

The check misses PCI_INTERRUPT_PIN. This patch fixes that.

This is discovered by this call in VFIO:

    pci_read_config_byte(vdev->pdev, PCI_INTERRUPT_PIN, &pin);

The old code does not set *val to 0 because it misses the check for PCI_INTERRUPT_PIN.

Fixes 4daace0d8ce8 ("PCI: hv: Add paravirtual PCI front-end for Microsoft Hyper-V VMs")

---
v2:
* Change the commit subject line and message
* Change the code according to feedback

---
 drivers/pci/controller/pci-hyperv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/pci-hyperv.c +2 -2
index 5992280e8110..cdd5be16021d 100644
@@ -1130,8 +1130,8 @@ static void _hv_pcifront_read_config(struct hv_pci_dev *hpdev, int where,
 		   PCI_CAPABILITY_LIST) {
 		/* ROM BARs are unimplemented */
 		*val = 0;
-	} else if (where >= PCI_INTERRUPT_LINE && where + size <=
-		   PCI_INTERRUPT_PIN) {
+	} else if ((where >= PCI_INTERRUPT_LINE && where + size <= PCI_INTERRUPT_PIN) ||
+		   (where >= PCI_INTERRUPT_PIN && where + size <= PCI_MIN_GNT)) {
 		/*
 		 * Interrupt Line and Interrupt PIN are hard-wired to zero
 		 * because this front-end only supports message-signaled
Signature · 1 line
2.43.0
Reviewed-by on v2 1/1
#1 lore raw

From: Wei Liu <[email protected]> Sent: Friday, June 21, 2024 2:00 PM

Quoted 43 lines

The intent of the code snippet is to always return 0 for both PCI_INTERRUPT_LINE and PCI_INTERRUPT_PIN.

The check misses PCI_INTERRUPT_PIN. This patch fixes that.

This is discovered by this call in VFIO:

    pci_read_config_byte(vdev->pdev, PCI_INTERRUPT_PIN, &pin);

The old code does not set *val to 0 because it misses the check for PCI_INTERRUPT_PIN.

Fixes 4daace0d8ce8 ("PCI: hv: Add paravirtual PCI front-end for Microsoft Hyper-V

VMs")

---
v2:
* Change the commit subject line and message
* Change the code according to feedback

---
 drivers/pci/controller/pci-hyperv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/pci-hyperv.c +1 -2
index 5992280e8110..cdd5be16021d 100644
@@ -1130,8 +1130,8 @@ static void _hv_pcifront_read_config(struct hv_pci_dev
 *hpdev, int where,
 		   PCI_CAPABILITY_LIST) {
 		/* ROM BARs are unimplemented */
 		*val = 0;
-	} else if (where >= PCI_INTERRUPT_LINE && where + size <=
-		   PCI_INTERRUPT_PIN) {
+	} else if ((where >= PCI_INTERRUPT_LINE && where + size <=

PCI_INTERRUPT_PIN) ||

drivers/pci/controller/pci-hyperv.c +1 -1
+		   (where >= PCI_INTERRUPT_PIN && where + size <= PCI_MIN_GNT)) {
 		/*
 		 * Interrupt Line and Interrupt PIN are hard-wired to zero
 		 * because this front-end only supports message-signaled
--
Quoted 2 lines

2.43.0

#2 lore raw
In reply to Wei Liu

1) Capitalize subject to match history
2) Say something more specific than "fix reading ..."

Apparently this returns garbage in some case where you want to return zero?

Quoted 41 lines · Wei Liu

The intent of the code snippet is to always return 0 for both PCI_INTERRUPT_LINE and PCI_INTERRUPT_PIN.

The check misses PCI_INTERRUPT_PIN. This patch fixes that.

This is discovered by this call in VFIO:

    pci_read_config_byte(vdev->pdev, PCI_INTERRUPT_PIN, &pin);

The old code does not set *val to 0 because it misses the check for PCI_INTERRUPT_PIN.

Fixes 4daace0d8ce8 ("PCI: hv: Add paravirtual PCI front-end for Microsoft Hyper-V VMs")

---
v2:
* Change the commit subject line and message
* Change the code according to feedback

---
 drivers/pci/controller/pci-hyperv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/pci-hyperv.c +2 -2
index 5992280e8110..cdd5be16021d 100644
@@ -1130,8 +1130,8 @@ static void _hv_pcifront_read_config(struct hv_pci_dev *hpdev, int where,
 		   PCI_CAPABILITY_LIST) {
 		/* ROM BARs are unimplemented */
 		*val = 0;
-	} else if (where >= PCI_INTERRUPT_LINE && where + size <=
-		   PCI_INTERRUPT_PIN) {
+	} else if ((where >= PCI_INTERRUPT_LINE && where + size <= PCI_INTERRUPT_PIN) ||
+		   (where >= PCI_INTERRUPT_PIN && where + size <= PCI_MIN_GNT)) {
 		/*
 		 * Interrupt Line and Interrupt PIN are hard-wired to zero
 		 * because this front-end only supports message-signaled
Signature · 1 line
2.43.0
author maintainer
#3 lore raw
Quoted 1 line · Bjorn Helgaas

1) Capitalize subject to match history

What do you mean here? I got the "PCI: hv: ..." format from recent commits. "PCI" is capitalized. You want to to capitalize "fix"?

Quoted 4 lines

2) Say something more specific than "fix reading ..."

Apparently this returns garbage in some case where you want to return zero?

Yes. *val is not changed in the old code, so garbage is returned.

Here is the updated commit message. I can resend once you confirm you're happy with it.

PCI: hv: Fix reading of PCI_INTERRUPT_PIN

The intent of the code snippet is to always return 0 for both PCI_INTERRUPT_LINE and PCI_INTERRUPT_PIN.

The check misses PCI_INTERRUPT_PIN. This patch fixes that.

This is discovered by this call in VFIO:

pci_read_config_byte(vdev->pdev, PCI_INTERRUPT_PIN, &pin);

The old code does not set *val to 0 because it misses the check for PCI_INTERRUPT_PIN. Garbage is returned in this case.

Fixes 4daace0d8ce8 ("PCI: hv: Add paravirtual PCI front-end for Microsoft Hyper-V VMs")

Thanks,
Wei.

Quoted 43 lines · Wei Liu
Quoted 41 lines

The intent of the code snippet is to always return 0 for both PCI_INTERRUPT_LINE and PCI_INTERRUPT_PIN.

The check misses PCI_INTERRUPT_PIN. This patch fixes that.

This is discovered by this call in VFIO:

    pci_read_config_byte(vdev->pdev, PCI_INTERRUPT_PIN, &pin);

The old code does not set *val to 0 because it misses the check for PCI_INTERRUPT_PIN.

Fixes 4daace0d8ce8 ("PCI: hv: Add paravirtual PCI front-end for Microsoft Hyper-V VMs")

---
v2:
* Change the commit subject line and message
* Change the code according to feedback

---
 drivers/pci/controller/pci-hyperv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/pci-hyperv.c +2 -2
index 5992280e8110..cdd5be16021d 100644
@@ -1130,8 +1130,8 @@ static void _hv_pcifront_read_config(struct hv_pci_dev *hpdev, int where,
 		   PCI_CAPABILITY_LIST) {
 		/* ROM BARs are unimplemented */
 		*val = 0;
-	} else if (where >= PCI_INTERRUPT_LINE && where + size <=
-		   PCI_INTERRUPT_PIN) {
+	} else if ((where >= PCI_INTERRUPT_LINE && where + size <= PCI_INTERRUPT_PIN) ||
+		   (where >= PCI_INTERRUPT_PIN && where + size <= PCI_MIN_GNT)) {
 		/*
 		 * Interrupt Line and Interrupt PIN are hard-wired to zero
 		 * because this front-end only supports message-signaled
Signature · 1 line
2.43.0
#4 lore raw
Quoted 5 lines · Wei Liu
Quoted 1 line · Bjorn Helgaas

1) Capitalize subject to match history

What do you mean here? I got the "PCI: hv: ..." format from recent commits. "PCI" is capitalized. You want to to capitalize "fix"?

Yes. Look at the history:

  $ git log --oneline --no-merges drivers/pci/controller/pci-hyperv.c
  b5ff74c1ef50 PCI: hv: Fix ring buffer size calculation
  07e8f88568f5 x86/apic: Drop apic::delivery_mode
  f741bcadfe52 PCI: hv: Annotate struct hv_dr_state with __counted_by
  04bbe863241a PCI: hv: Fix a crash in hv_pci_restore_msi_msg() during hibernation
  067d6ec7ed5b PCI: hv: Add a per-bus mutex state_lock
  a847234e24d0 Revert "PCI: hv: Fix a timing issue which causes kdump to fail occasionally"
  add9195e69c9 PCI: hv: Remove the useless hv_pcichild_state from struct hv_pci_dev
  2738d5ab7929 PCI: hv: Fix a race condition in hv_irq_unmask() that can cause panic
  ...
Quoted 11 lines
Quoted 4 lines

2) Say something more specific than "fix reading ..."

Apparently this returns garbage in some case where you want to return zero?

Yes. *val is not changed in the old code, so garbage is returned.

Here is the updated commit message. I can resend once you confirm you're happy with it.

PCI: hv: Fix reading of PCI_INTERRUPT_PIN

Maybe:

PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN

Quoted 7 lines

The intent of the code snippet is to always return 0 for both PCI_INTERRUPT_LINE and PCI_INTERRUPT_PIN.

The check misses PCI_INTERRUPT_PIN. This patch fixes that.

This is discovered by this call in VFIO:

Quoted 8 lines

pci_read_config_byte(vdev->pdev, PCI_INTERRUPT_PIN, &pin);

The old code does not set *val to 0 because it misses the check for PCI_INTERRUPT_PIN. Garbage is returned in this case.

Fixes 4daace0d8ce8 ("PCI: hv: Add paravirtual PCI front-end for Microsoft Hyper-V VMs")

Looks fine.

author maintainer
#5 lore raw
Quoted 45 lines · Bjorn Helgaas
Quoted 5 lines · Wei Liu
Quoted 1 line · Bjorn Helgaas

1) Capitalize subject to match history

What do you mean here? I got the "PCI: hv: ..." format from recent commits. "PCI" is capitalized. You want to to capitalize "fix"?

Yes. Look at the history:

  $ git log --oneline --no-merges drivers/pci/controller/pci-hyperv.c
  b5ff74c1ef50 PCI: hv: Fix ring buffer size calculation
  07e8f88568f5 x86/apic: Drop apic::delivery_mode
  f741bcadfe52 PCI: hv: Annotate struct hv_dr_state with __counted_by
  04bbe863241a PCI: hv: Fix a crash in hv_pci_restore_msi_msg() during hibernation
  067d6ec7ed5b PCI: hv: Add a per-bus mutex state_lock
  a847234e24d0 Revert "PCI: hv: Fix a timing issue which causes kdump to fail occasionally"
  add9195e69c9 PCI: hv: Remove the useless hv_pcichild_state from struct hv_pci_dev
  2738d5ab7929 PCI: hv: Fix a race condition in hv_irq_unmask() that can cause panic
  ...
Quoted 11 lines
Quoted 4 lines

2) Say something more specific than "fix reading ..."

Apparently this returns garbage in some case where you want to return zero?

Yes. *val is not changed in the old code, so garbage is returned.

Here is the updated commit message. I can resend once you confirm you're happy with it.

PCI: hv: Fix reading of PCI_INTERRUPT_PIN

Maybe:

PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN

Quoted 9 lines

The intent of the code snippet is to always return 0 for both PCI_INTERRUPT_LINE and PCI_INTERRUPT_PIN.

The check misses PCI_INTERRUPT_PIN. This patch fixes that.

This is discovered by this call in VFIO:

pci_read_config_byte(vdev->pdev, PCI_INTERRUPT_PIN, &pin);

Quoted 8 lines
Quoted 6 lines

The old code does not set *val to 0 because it misses the check for PCI_INTERRUPT_PIN. Garbage is returned in this case.

Fixes 4daace0d8ce8 ("PCI: hv: Add paravirtual PCI front-end for Microsoft Hyper-V VMs")

Looks fine.

Thanks. I will resend with the updated commit message.