From: "Eugenio Pérez" <eperezma@redhat.com>
To: qemu-devel@nongnu.org
Cc: Lei Yang <leiyang@redhat.com>, Jason Wang <jasowang@redhat.com>,
Laurent Vivier <lvivier@redhat.com>, Cindy Lu <lulu@redhat.com>,
Peter Xu <peterx@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: [PATCH 3/7] util: make a copy of iova_tree_remove_parameter
Date: Fri, 19 Aug 2022 18:53:53 +0200 [thread overview]
Message-ID: <20220819165357.3591965-4-eperezma@redhat.com> (raw)
In-Reply-To: <20220819165357.3591965-1-eperezma@redhat.com>
It's convenient to call iova_tree_remove from a map returned from
iova_tree_find or iova_tree_find_iova. With the current code this is not
possible, since we will free it, and then we will try to search for it
again.
Fix it making a copy of the argument. Not applying a fixes tag, since
there is no use like that at the moment.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
util/iova-tree.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/util/iova-tree.c b/util/iova-tree.c
index fee530a579..713e3edd7b 100644
--- a/util/iova-tree.c
+++ b/util/iova-tree.c
@@ -166,9 +166,11 @@ void iova_tree_foreach(IOVATree *tree, iova_tree_iterator iterator)
void iova_tree_remove(IOVATree *tree, const DMAMap *map)
{
+ /* Just in case caller is calling iova_tree_remove from a result of find */
+ const DMAMap needle = *map;
const DMAMap *overlap;
- while ((overlap = iova_tree_find(tree, map))) {
+ while ((overlap = iova_tree_find(tree, &needle))) {
g_tree_remove(tree->tree, overlap);
}
}
--
2.31.1
next prev parent reply other threads:[~2022-08-19 17:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-19 16:53 [PATCH 0/7] vDPA shadow virtqueue iova tree fixes Eugenio Pérez
2022-08-19 16:53 ` [PATCH 1/7] vdpa: Skip the maps not in the iova tree Eugenio Pérez
2022-08-19 16:53 ` [PATCH 2/7] vdpa: do not save failed dma maps in SVQ " Eugenio Pérez
2022-08-19 16:53 ` Eugenio Pérez [this message]
2022-08-23 6:18 ` [PATCH 3/7] util: make a copy of iova_tree_remove_parameter Jason Wang
2022-08-23 9:55 ` Eugenio Perez Martin
2022-08-19 16:53 ` [PATCH 4/7] vdpa: Remove SVQ vring from iova_tree at shutdown Eugenio Pérez
2022-08-23 6:25 ` Jason Wang
2022-08-23 11:29 ` Eugenio Perez Martin
2022-08-19 16:53 ` [PATCH 5/7] vdpa: Make SVQ vring unmapping return void Eugenio Pérez
2022-08-23 6:33 ` Jason Wang
2022-08-19 16:53 ` [PATCH 6/7] vhost: Always store new kick fd on vhost_svq_set_svq_kick_fd Eugenio Pérez
2022-08-23 6:38 ` Jason Wang
2022-08-19 16:53 ` [PATCH 7/7] vdpa: Use ring hwaddr at vhost_vdpa_svq_unmap_ring Eugenio Pérez
2022-08-23 6:40 ` Jason Wang
2022-08-23 11:32 ` Eugenio Perez Martin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220819165357.3591965-4-eperezma@redhat.com \
--to=eperezma@redhat.com \
--cc=jasowang@redhat.com \
--cc=leiyang@redhat.com \
--cc=lulu@redhat.com \
--cc=lvivier@redhat.com \
--cc=mst@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).