* [PATCH] Fix bugs in msix_set/unset_mask_notifier() routines
@ 2010-06-02 16:09 Sridhar Samudrala
2010-06-02 17:14 ` Michael S. Tsirkin
2010-06-02 17:47 ` Michael S. Tsirkin
0 siblings, 2 replies; 3+ messages in thread
From: Sridhar Samudrala @ 2010-06-02 16:09 UTC (permalink / raw)
To: Michael S. Tsirkin, Avi Kivity; +Cc: kvm@vger.kernel.org
I am hitting the following assertions in msix.c when doing a guest reboot or live migration
using vhost.
qemu-kvm/hw/msix.c:375: msix_mask_all: Assertion `r >= 0' failed.
qemu-kvm/hw/msix.c:640: msix_unset_mask_notifier: Assertion `dev->msix_mask_notifier_opaque[vector]' failed.
The following patch fixes the bugs in handling msix_is_masked() condition
in msix_set/unset_mask_notifier() routines.
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
diff --git a/hw/msix.c b/hw/msix.c
index 1398680..a191df1 100644
--- a/hw/msix.c
+++ b/hw/msix.c
@@ -609,7 +609,7 @@ void msix_unuse_all_vectors(PCIDevice *dev)
int msix_set_mask_notifier(PCIDevice *dev, unsigned vector, void *opaque)
{
- int r;
+ int r = 0;
if (vector >= dev->msix_entries_nr || !dev->msix_entry_used[vector])
return 0;
@@ -619,13 +619,15 @@ int msix_set_mask_notifier(PCIDevice *dev, unsigned vector, void *opaque)
/* Unmask the new notifier unless vector is masked. */
if (msix_is_masked(dev, vector)) {
- return 0;
+ goto out;
}
r = dev->msix_mask_notifier(dev, vector, opaque,
msix_is_masked(dev, vector));
if (r < 0) {
return r;
}
+
+out:
dev->msix_mask_notifier_opaque[vector] = opaque;
return r;
}
@@ -640,8 +642,8 @@ int msix_unset_mask_notifier(PCIDevice *dev, unsigned vector)
assert(dev->msix_mask_notifier_opaque[vector]);
/* Mask the old notifier unless it is already masked. */
- if (msix_is_masked(dev, vector)) {
- return 0;
+ if (!msix_is_masked(dev, vector)) {
+ goto out;
}
r = dev->msix_mask_notifier(dev, vector,
dev->msix_mask_notifier_opaque[vector],
@@ -649,6 +651,8 @@ int msix_unset_mask_notifier(PCIDevice *dev, unsigned vector)
if (r < 0) {
return r;
}
+
+out:
dev->msix_mask_notifier_opaque[vector] = NULL;
return r;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] Fix bugs in msix_set/unset_mask_notifier() routines
2010-06-02 16:09 [PATCH] Fix bugs in msix_set/unset_mask_notifier() routines Sridhar Samudrala
@ 2010-06-02 17:14 ` Michael S. Tsirkin
2010-06-02 17:47 ` Michael S. Tsirkin
1 sibling, 0 replies; 3+ messages in thread
From: Michael S. Tsirkin @ 2010-06-02 17:14 UTC (permalink / raw)
To: Sridhar Samudrala; +Cc: Avi Kivity, kvm@vger.kernel.org
On Wed, Jun 02, 2010 at 09:09:37AM -0700, Sridhar Samudrala wrote:
>
> I am hitting the following assertions in msix.c when doing a guest reboot or live migration
> using vhost.
> qemu-kvm/hw/msix.c:375: msix_mask_all: Assertion `r >= 0' failed.
> qemu-kvm/hw/msix.c:640: msix_unset_mask_notifier: Assertion `dev->msix_mask_notifier_opaque[vector]' failed.
>
> The following patch fixes the bugs in handling msix_is_masked() condition
> in msix_set/unset_mask_notifier() routines.
>
> Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Note: this is qemu-kvm only patch.
>
> diff --git a/hw/msix.c b/hw/msix.c
> index 1398680..a191df1 100644
> --- a/hw/msix.c
> +++ b/hw/msix.c
> @@ -609,7 +609,7 @@ void msix_unuse_all_vectors(PCIDevice *dev)
>
> int msix_set_mask_notifier(PCIDevice *dev, unsigned vector, void *opaque)
> {
> - int r;
> + int r = 0;
> if (vector >= dev->msix_entries_nr || !dev->msix_entry_used[vector])
> return 0;
>
> @@ -619,13 +619,15 @@ int msix_set_mask_notifier(PCIDevice *dev, unsigned vector, void *opaque)
>
> /* Unmask the new notifier unless vector is masked. */
> if (msix_is_masked(dev, vector)) {
> - return 0;
> + goto out;
> }
> r = dev->msix_mask_notifier(dev, vector, opaque,
> msix_is_masked(dev, vector));
> if (r < 0) {
> return r;
> }
> +
> +out:
> dev->msix_mask_notifier_opaque[vector] = opaque;
> return r;
> }
> @@ -640,8 +642,8 @@ int msix_unset_mask_notifier(PCIDevice *dev, unsigned vector)
> assert(dev->msix_mask_notifier_opaque[vector]);
>
> /* Mask the old notifier unless it is already masked. */
> - if (msix_is_masked(dev, vector)) {
> - return 0;
> + if (!msix_is_masked(dev, vector)) {
> + goto out;
> }
> r = dev->msix_mask_notifier(dev, vector,
> dev->msix_mask_notifier_opaque[vector],
> @@ -649,6 +651,8 @@ int msix_unset_mask_notifier(PCIDevice *dev, unsigned vector)
> if (r < 0) {
> return r;
> }
> +
> +out:
> dev->msix_mask_notifier_opaque[vector] = NULL;
> return r;
> }
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Fix bugs in msix_set/unset_mask_notifier() routines
2010-06-02 16:09 [PATCH] Fix bugs in msix_set/unset_mask_notifier() routines Sridhar Samudrala
2010-06-02 17:14 ` Michael S. Tsirkin
@ 2010-06-02 17:47 ` Michael S. Tsirkin
1 sibling, 0 replies; 3+ messages in thread
From: Michael S. Tsirkin @ 2010-06-02 17:47 UTC (permalink / raw)
To: Sridhar Samudrala; +Cc: Avi Kivity, kvm@vger.kernel.org
On Wed, Jun 02, 2010 at 09:09:37AM -0700, Sridhar Samudrala wrote:
>
> I am hitting the following assertions in msix.c when doing a guest reboot or live migration
> using vhost.
> qemu-kvm/hw/msix.c:375: msix_mask_all: Assertion `r >= 0' failed.
> qemu-kvm/hw/msix.c:640: msix_unset_mask_notifier: Assertion `dev->msix_mask_notifier_opaque[vector]' failed.
>
> The following patch fixes the bugs in handling msix_is_masked() condition
> in msix_set/unset_mask_notifier() routines.
>
> Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
>
I take back the ACK.
> diff --git a/hw/msix.c b/hw/msix.c
> index 1398680..a191df1 100644
> --- a/hw/msix.c
> +++ b/hw/msix.c
> @@ -609,7 +609,7 @@ void msix_unuse_all_vectors(PCIDevice *dev)
>
> int msix_set_mask_notifier(PCIDevice *dev, unsigned vector, void *opaque)
> {
> - int r;
> + int r = 0;
> if (vector >= dev->msix_entries_nr || !dev->msix_entry_used[vector])
> return 0;
>
> @@ -619,13 +619,15 @@ int msix_set_mask_notifier(PCIDevice *dev, unsigned vector, void *opaque)
>
> /* Unmask the new notifier unless vector is masked. */
> if (msix_is_masked(dev, vector)) {
> - return 0;
> + goto out;
> }
> r = dev->msix_mask_notifier(dev, vector, opaque,
> msix_is_masked(dev, vector));
> if (r < 0) {
> return r;
> }
> +
> +out:
> dev->msix_mask_notifier_opaque[vector] = opaque;
> return r;
> }
> @@ -640,8 +642,8 @@ int msix_unset_mask_notifier(PCIDevice *dev, unsigned vector)
> assert(dev->msix_mask_notifier_opaque[vector]);
>
> /* Mask the old notifier unless it is already masked. */
> - if (msix_is_masked(dev, vector)) {
> - return 0;
> + if (!msix_is_masked(dev, vector)) {
> + goto out;
> }
Wait a second, the logic is reverted here.
> r = dev->msix_mask_notifier(dev, vector,
> dev->msix_mask_notifier_opaque[vector],
> @@ -649,6 +651,8 @@ int msix_unset_mask_notifier(PCIDevice *dev, unsigned vector)
> if (r < 0) {
> return r;
> }
> +
> +out:
> dev->msix_mask_notifier_opaque[vector] = NULL;
> return r;
> }
>
>
I find the goto's confusing. I'll post a patch without.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-06-02 17:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-02 16:09 [PATCH] Fix bugs in msix_set/unset_mask_notifier() routines Sridhar Samudrala
2010-06-02 17:14 ` Michael S. Tsirkin
2010-06-02 17:47 ` Michael S. Tsirkin
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).