|
 |
9ae3a8 |
From 082c19eeb7917a141bae4cf98d0ef941956adab6 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Xiao Wang <jasowang@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 27 Nov 2017 07:07:57 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 6/9] slirp: fix clearing ifq_so from pending packets
|
|
|
9ae3a8 |
MIME-Version: 1.0
|
|
|
9ae3a8 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9ae3a8 |
Content-Transfer-Encoding: 8bit
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Xiao Wang <jasowang@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1511766477-29559-5-git-send-email-jasowang@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 77901
|
|
|
9ae3a8 |
O-Subject: [RHEL7.5 qemu-kvm PATCH 4/4] slirp: fix clearing ifq_so from pending packets
|
|
|
9ae3a8 |
Bugzilla: 1508745
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: wexu@redhat.com
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
The if_fastq and if_batchq contain not only packets, but queues of packets
|
|
|
9ae3a8 |
for the same socket. When sofree frees a socket, it thus has to clear ifq_so
|
|
|
9ae3a8 |
from all the packets from the queues, not only the first.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
|
|
|
9ae3a8 |
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|
|
9ae3a8 |
Cc: qemu-stable@nongnu.org
|
|
|
9ae3a8 |
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
9ae3a8 |
(cherry picked from commit 1201d308519f1e915866d7583d5136d03cc1d384)
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
slirp/socket.c | 39 +++++++++++++++++++++++----------------
|
|
|
9ae3a8 |
1 file changed, 23 insertions(+), 16 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/slirp/socket.c b/slirp/socket.c
|
|
|
9ae3a8 |
index 09b5d3d..7837664 100644
|
|
|
9ae3a8 |
--- a/slirp/socket.c
|
|
|
9ae3a8 |
+++ b/slirp/socket.c
|
|
|
9ae3a8 |
@@ -57,29 +57,36 @@ socreate(Slirp *slirp)
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/*
|
|
|
9ae3a8 |
+ * Remove references to so from the given message queue.
|
|
|
9ae3a8 |
+ */
|
|
|
9ae3a8 |
+static void
|
|
|
9ae3a8 |
+soqfree(struct socket *so, struct quehead *qh)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ struct mbuf *ifq;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ for (ifq = (struct mbuf *) qh->qh_link;
|
|
|
9ae3a8 |
+ (struct quehead *) ifq != qh;
|
|
|
9ae3a8 |
+ ifq = ifq->ifq_next) {
|
|
|
9ae3a8 |
+ if (ifq->ifq_so == so) {
|
|
|
9ae3a8 |
+ struct mbuf *ifm;
|
|
|
9ae3a8 |
+ ifq->ifq_so = NULL;
|
|
|
9ae3a8 |
+ for (ifm = ifq->ifs_next; ifm != ifq; ifm = ifm->ifs_next) {
|
|
|
9ae3a8 |
+ ifm->ifq_so = NULL;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+/*
|
|
|
9ae3a8 |
* remque and free a socket, clobber cache
|
|
|
9ae3a8 |
*/
|
|
|
9ae3a8 |
void
|
|
|
9ae3a8 |
sofree(struct socket *so)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
Slirp *slirp = so->slirp;
|
|
|
9ae3a8 |
- struct mbuf *ifm;
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
- for (ifm = (struct mbuf *) slirp->if_fastq.qh_link;
|
|
|
9ae3a8 |
- (struct quehead *) ifm != &slirp->if_fastq;
|
|
|
9ae3a8 |
- ifm = ifm->ifq_next) {
|
|
|
9ae3a8 |
- if (ifm->ifq_so == so) {
|
|
|
9ae3a8 |
- ifm->ifq_so = NULL;
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- for (ifm = (struct mbuf *) slirp->if_batchq.qh_link;
|
|
|
9ae3a8 |
- (struct quehead *) ifm != &slirp->if_batchq;
|
|
|
9ae3a8 |
- ifm = ifm->ifq_next) {
|
|
|
9ae3a8 |
- if (ifm->ifq_so == so) {
|
|
|
9ae3a8 |
- ifm->ifq_so = NULL;
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
+ soqfree(so, &slirp->if_fastq);
|
|
|
9ae3a8 |
+ soqfree(so, &slirp->if_batchq);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
if (so->so_emu==EMU_RSH && so->extra) {
|
|
|
9ae3a8 |
sofree(so->extra);
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|