From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: Samuel Thibault <samuel.thibault@ens-lyon.org>, qemu-devel@nongnu.org
Cc: thuth@redhat.com, jan.kiszka@siemens.com, ppandit@redhat.com,
wjjzhang@tencent.com
Subject: Re: [Qemu-devel] [PATCH] slirp: fix clearing ifq_so from pending packets
Date: Fri, 25 Aug 2017 19:45:17 -0300 [thread overview]
Message-ID: <08ed8fdc-8765-b18f-d021-31e4f05d4f9a@amsat.org> (raw)
In-Reply-To: <20170825223721.2052-1-samuel.thibault@ens-lyon.org>
Hi Sam, thanks for this patch :)
On 08/25/2017 07:37 PM, Samuel Thibault wrote:
> The if_fastq and if_batchq contain not only packets, but queues of packets
> for the same socket. When sofree frees a socket, it thus has to clear ifq_so
> from all the packets from the queues, not only the first.
>
> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
> Acked-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
so let's raise this to:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> slirp/socket.c | 39 +++++++++++++++++++++++----------------
> 1 file changed, 23 insertions(+), 16 deletions(-)
>
> diff --git a/slirp/socket.c b/slirp/socket.c
> index ecec0295a9..cb7b5b608d 100644
> --- a/slirp/socket.c
> +++ b/slirp/socket.c
> @@ -59,6 +59,27 @@ socreate(Slirp *slirp)
> return(so);
> }
>
> +/*
> + * Remove references to so from the given message queue.
> + */
> +static void
> +soqfree(struct socket *so, struct quehead *qh)
> +{
> + struct mbuf *ifq;
> +
> + for (ifq = (struct mbuf *) qh->qh_link;
> + (struct quehead *) ifq != qh;
> + ifq = ifq->ifq_next) {
> + if (ifq->ifq_so == so) {
> + struct mbuf *ifm;
> + ifq->ifq_so = NULL;
> + for (ifm = ifq->ifs_next; ifm != ifq; ifm = ifm->ifs_next) {
> + ifm->ifq_so = NULL;
> + }
> + }
> + }
> +}
> +
> /*
> * remque and free a socket, clobber cache
> */
> @@ -66,23 +87,9 @@ void
> sofree(struct socket *so)
> {
> Slirp *slirp = so->slirp;
> - struct mbuf *ifm;
>
> - for (ifm = (struct mbuf *) slirp->if_fastq.qh_link;
> - (struct quehead *) ifm != &slirp->if_fastq;
> - ifm = ifm->ifq_next) {
> - if (ifm->ifq_so == so) {
> - ifm->ifq_so = NULL;
> - }
> - }
> -
> - for (ifm = (struct mbuf *) slirp->if_batchq.qh_link;
> - (struct quehead *) ifm != &slirp->if_batchq;
> - ifm = ifm->ifq_next) {
> - if (ifm->ifq_so == so) {
> - ifm->ifq_so = NULL;
> - }
> - }
> + soqfree(so, &slirp->if_fastq);
> + soqfree(so, &slirp->if_batchq);
>
> if (so->so_emu==EMU_RSH && so->extra) {
> sofree(so->extra);
>
next prev parent reply other threads:[~2017-08-25 22:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-25 22:37 [Qemu-devel] [PATCH] slirp: fix clearing ifq_so from pending packets Samuel Thibault
2017-08-25 22:45 ` Philippe Mathieu-Daudé [this message]
2017-08-25 23:05 ` Samuel Thibault
2017-08-25 23:07 ` Samuel Thibault
2017-08-28 10:01 ` P J P
2017-08-30 7:50 ` Thomas Huth
2017-08-30 7:52 ` Samuel Thibault
2017-08-30 11:30 ` Peter Maydell
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=08ed8fdc-8765-b18f-d021-31e4f05d4f9a@amsat.org \
--to=f4bug@amsat.org \
--cc=jan.kiszka@siemens.com \
--cc=ppandit@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=samuel.thibault@ens-lyon.org \
--cc=thuth@redhat.com \
--cc=wjjzhang@tencent.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.