* [PATCH] hw/nvme: fix missing check for PMR capability
@ 2021-06-07 9:47 Klaus Jensen
2021-06-17 19:17 ` Klaus Jensen
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Klaus Jensen @ 2021-06-07 9:47 UTC (permalink / raw)
To: qemu-devel
Cc: Keith Busch, Klaus Jensen, qemu-stable, qemu-block, Klaus Jensen
From: Klaus Jensen <k.jensen@samsung.com>
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.
Cc: qemu-stable@nongnu.org
Fixes: 75c3c9de961d ("hw/block/nvme: disable PMR at boot up")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/362
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/nvme/ctrl.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index 0bcaf7192f99..463772602c4e 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -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);
--
2.31.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] hw/nvme: fix missing check for PMR capability
2021-06-07 9:47 [PATCH] hw/nvme: fix missing check for PMR capability Klaus Jensen
@ 2021-06-17 19:17 ` Klaus Jensen
2021-06-28 17:03 ` Klaus Jensen
2021-06-28 20:35 ` Keith Busch
2021-06-29 5:19 ` Klaus Jensen
2 siblings, 1 reply; 5+ messages in thread
From: Klaus Jensen @ 2021-06-17 19:17 UTC (permalink / raw)
To: qemu-devel; +Cc: Keith Busch, Klaus Jensen, qemu-stable, qemu-block
[-- Attachment #1: Type: text/plain, Size: 1171 bytes --]
On Jun 7 11:47, Klaus Jensen wrote:
>From: Klaus Jensen <k.jensen@samsung.com>
>
>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.
>
>Cc: qemu-stable@nongnu.org
>Fixes: 75c3c9de961d ("hw/block/nvme: disable PMR at boot up")
>Resolves: https://gitlab.com/qemu-project/qemu/-/issues/362
>Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
>---
> hw/nvme/ctrl.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
>index 0bcaf7192f99..463772602c4e 100644
>--- a/hw/nvme/ctrl.c
>+++ b/hw/nvme/ctrl.c
>@@ -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);
>--
>2.31.1
>
Bump :)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] hw/nvme: fix missing check for PMR capability
2021-06-17 19:17 ` Klaus Jensen
@ 2021-06-28 17:03 ` Klaus Jensen
0 siblings, 0 replies; 5+ messages in thread
From: Klaus Jensen @ 2021-06-28 17:03 UTC (permalink / raw)
To: qemu-devel; +Cc: Keith Busch, Klaus Jensen, qemu-stable, qemu-block
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
On Jun 17 21:17, Klaus Jensen wrote:
>On Jun 7 11:47, Klaus Jensen wrote:
>>From: Klaus Jensen <k.jensen@samsung.com>
>>
>>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.
>>
>>Cc: qemu-stable@nongnu.org
>>Fixes: 75c3c9de961d ("hw/block/nvme: disable PMR at boot up")
>>Resolves: https://gitlab.com/qemu-project/qemu/-/issues/362
>>Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
>>---
>>hw/nvme/ctrl.c | 4 ++++
>>1 file changed, 4 insertions(+)
>>
>>diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
>>index 0bcaf7192f99..463772602c4e 100644
>>--- a/hw/nvme/ctrl.c
>>+++ b/hw/nvme/ctrl.c
>>@@ -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);
>>--
>>2.31.1
>>
>
>Bump :)
Bump^2 :)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] hw/nvme: fix missing check for PMR capability
2021-06-07 9:47 [PATCH] hw/nvme: fix missing check for PMR capability Klaus Jensen
2021-06-17 19:17 ` Klaus Jensen
@ 2021-06-28 20:35 ` Keith Busch
2021-06-29 5:19 ` Klaus Jensen
2 siblings, 0 replies; 5+ messages in thread
From: Keith Busch @ 2021-06-28 20:35 UTC (permalink / raw)
To: Klaus Jensen; +Cc: Klaus Jensen, qemu-devel, qemu-block, qemu-stable
On Mon, Jun 07, 2021 at 11:47:57AM +0200, Klaus Jensen wrote:
> From: Klaus Jensen <k.jensen@samsung.com>
>
> 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.
>
> Cc: qemu-stable@nongnu.org
> Fixes: 75c3c9de961d ("hw/block/nvme: disable PMR at boot up")
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/362
> Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Looks good.
Reviewed-by: Keith Busch <kbusch@kernel.org>
> ---
> hw/nvme/ctrl.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
> index 0bcaf7192f99..463772602c4e 100644
> --- a/hw/nvme/ctrl.c
> +++ b/hw/nvme/ctrl.c
> @@ -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);
> --
> 2.31.1
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] hw/nvme: fix missing check for PMR capability
2021-06-07 9:47 [PATCH] hw/nvme: fix missing check for PMR capability Klaus Jensen
2021-06-17 19:17 ` Klaus Jensen
2021-06-28 20:35 ` Keith Busch
@ 2021-06-29 5:19 ` Klaus Jensen
2 siblings, 0 replies; 5+ messages in thread
From: Klaus Jensen @ 2021-06-29 5:19 UTC (permalink / raw)
To: qemu-devel; +Cc: Keith Busch, Klaus Jensen, qemu-stable, qemu-block
[-- Attachment #1: Type: text/plain, Size: 1185 bytes --]
On Jun 7 11:47, Klaus Jensen wrote:
>From: Klaus Jensen <k.jensen@samsung.com>
>
>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.
>
>Cc: qemu-stable@nongnu.org
>Fixes: 75c3c9de961d ("hw/block/nvme: disable PMR at boot up")
>Resolves: https://gitlab.com/qemu-project/qemu/-/issues/362
>Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
>---
> hw/nvme/ctrl.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
>index 0bcaf7192f99..463772602c4e 100644
>--- a/hw/nvme/ctrl.c
>+++ b/hw/nvme/ctrl.c
>@@ -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);
>--
>2.31.1
>
Applied to nvme-next!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-06-29 5:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-07 9:47 [PATCH] hw/nvme: fix missing check for PMR capability Klaus Jensen
2021-06-17 19:17 ` Klaus Jensen
2021-06-28 17:03 ` Klaus Jensen
2021-06-28 20:35 ` Keith Busch
2021-06-29 5:19 ` Klaus Jensen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).