Skip to contentSkip to conversation

hw/nvme: fix missing check for PMR capability

PATCH Applied Klaus Jensen 2 participants 5 messages Jun 7, 2021 – Jun 29, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/nvme: fix missing check for PMR capability

From: Klaus Jensen <[email protected]>

Qiang Liu reported that an access on an unknown address is triggered in memory_region_set_enabled because a check on CAP.PMRS is missing for the PMRCTL register write when no PMR is configured.

Fixes 75c3c9de961d ("hw/block/nvme: disable PMR at boot up")

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/362

---
 hw/nvme/ctrl.c | 4 ++++
 1 file changed, 4 insertions(+)
hw/nvme/ctrl.c +4 -0
index 0bcaf7192f99..463772602c4e 100644
@@ -5583,6 +5583,10 @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr offset, uint64_t data,
                        "invalid write to PMRCAP register, ignored");
         return;
     case 0xe04: /* PMRCTL */
+        if (!NVME_CAP_PMRS(n->bar.cap)) {
+            return;
+        }
+
         n->bar.pmrctl = data;
         if (NVME_PMRCTL_EN(data)) {
             memory_region_set_enabled(&n->pmr.dev->mr, true);
Signature · 1 line
2.31.1
#1 lore raw
Quoted 32 lines · Klaus Jensen

From: Klaus Jensen <[email protected]>

Qiang Liu reported that an access on an unknown address is triggered in memory_region_set_enabled because a check on CAP.PMRS is missing for the PMRCTL register write when no PMR is configured.

Fixes 75c3c9de961d ("hw/block/nvme: disable PMR at boot up")

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/362

---
hw/nvme/ctrl.c | 4 ++++

1 file changed, 4 insertions(+)
hw/nvme/ctrl.c +4 -0
index 0bcaf7192f99..463772602c4e 100644
@@ -5583,6 +5583,10 @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr offset, uint64_t data,
                       "invalid write to PMRCAP register, ignored");
        return;
    case 0xe04: /* PMRCTL */
+        if (!NVME_CAP_PMRS(n->bar.cap)) {
+            return;
+        }
+
        n->bar.pmrctl = data;
        if (NVME_PMRCTL_EN(data)) {
            memory_region_set_enabled(&n->pmr.dev->mr, true);
Signature · 1 line
2.31.1

Bump :)

#2 lore raw
Quoted 27 lines · Klaus Jensen
Quoted 26 lines · Klaus Jensen

From: Klaus Jensen <[email protected]>

Qiang Liu reported that an access on an unknown address is triggered in memory_region_set_enabled because a check on CAP.PMRS is missing for the PMRCTL register write when no PMR is configured.

Fixes 75c3c9de961d ("hw/block/nvme: disable PMR at boot up")

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/362

---
hw/nvme/ctrl.c | 4 ++++

1 file changed, 4 insertions(+)
hw/nvme/ctrl.c +4 -0
index 0bcaf7192f99..463772602c4e 100644
@@ -5583,6 +5583,10 @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr offset, uint64_t data,
                      "invalid write to PMRCAP register, ignored");
       return;
   case 0xe04: /* PMRCTL */
+        if (!NVME_CAP_PMRS(n->bar.cap)) {
+            return;
+        }
+
Quoted 8 lines
Quoted 6 lines
hw/nvme/ctrl.c +0 -0
       n->bar.pmrctl = data;
       if (NVME_PMRCTL_EN(data)) {
           memory_region_set_enabled(&n->pmr.dev->mr, true);
Signature · 1 line
2.31.1

Bump :)

Bump^2 :)

Reviewed-by on v1 1/1
#3 lore raw
In reply to Klaus Jensen
Quoted 10 lines · Klaus Jensen

From: Klaus Jensen <[email protected]>

Qiang Liu reported that an access on an unknown address is triggered in memory_region_set_enabled because a check on CAP.PMRS is missing for the PMRCTL register write when no PMR is configured.

Fixes 75c3c9de961d ("hw/block/nvme: disable PMR at boot up")

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/362

Looks good.

Quoted 21 lines
---
 hw/nvme/ctrl.c | 4 ++++
 1 file changed, 4 insertions(+)
hw/nvme/ctrl.c +4 -0
index 0bcaf7192f99..463772602c4e 100644
@@ -5583,6 +5583,10 @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr offset, uint64_t data,
                        "invalid write to PMRCAP register, ignored");
         return;
     case 0xe04: /* PMRCTL */
+        if (!NVME_CAP_PMRS(n->bar.cap)) {
+            return;
+        }
+
         n->bar.pmrctl = data;
         if (NVME_PMRCTL_EN(data)) {
             memory_region_set_enabled(&n->pmr.dev->mr, true);
Signature · 1 line
2.31.1
author Applied
#4 lore raw
In reply to Klaus Jensen
Quoted 32 lines · Klaus Jensen

From: Klaus Jensen <[email protected]>

Qiang Liu reported that an access on an unknown address is triggered in memory_region_set_enabled because a check on CAP.PMRS is missing for the PMRCTL register write when no PMR is configured.

Fixes 75c3c9de961d ("hw/block/nvme: disable PMR at boot up")

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/362

---
hw/nvme/ctrl.c | 4 ++++

1 file changed, 4 insertions(+)
hw/nvme/ctrl.c +4 -0
index 0bcaf7192f99..463772602c4e 100644
@@ -5583,6 +5583,10 @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr offset, uint64_t data,
                       "invalid write to PMRCAP register, ignored");
        return;
    case 0xe04: /* PMRCTL */
+        if (!NVME_CAP_PMRS(n->bar.cap)) {
+            return;
+        }
+
        n->bar.pmrctl = data;
        if (NVME_PMRCTL_EN(data)) {
            memory_region_set_enabled(&n->pmr.dev->mr, true);
Signature · 1 line
2.31.1

Applied to nvme-next!