From: Zhang Chen <chen.zhang@intel.com >
To: Jason Wang <jasowang@redhat.com>
Cc: Derek Su <dereksu@qnap.com>, Zhang Chen <chen.zhang@intel.com>,
qemu-dev <qemu-devel@nongnu.org>,
Zhang Chen <zhangckid@gmail.com>
Subject: [PATCH 1/7] colo-compare: Fix memory leak in packet_enqueue()
Date: Wed, 20 May 2020 04:02:01 +0800 [thread overview]
Message-ID: <20200519200207.17773-2-chen.zhang@intel.com> (raw)
In-Reply-To: <20200519200207.17773-1-chen.zhang@intel.com>
From: Derek Su <dereksu@qnap.com>
The patch is to fix the "pkt" memory leak in packet_enqueue().
The allocated "pkt" needs to be freed if the colo compare
primary or secondary queue is too big.
Replace the error_report of full queue with a trace event.
Signed-off-by: Derek Su <dereksu@qnap.com>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
---
net/colo-compare.c | 23 +++++++++++++++--------
net/trace-events | 1 +
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index c07e7c1c09..56d8976537 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -122,6 +122,10 @@ enum {
SECONDARY_IN,
};
+static const char *colo_mode[] = {
+ [PRIMARY_IN] = "primary",
+ [SECONDARY_IN] = "secondary",
+};
static int compare_chr_send(CompareState *s,
const uint8_t *buf,
@@ -217,6 +221,7 @@ static int packet_enqueue(CompareState *s, int mode, Connection **con)
ConnectionKey key;
Packet *pkt = NULL;
Connection *conn;
+ int ret;
if (mode == PRIMARY_IN) {
pkt = packet_new(s->pri_rs.buf,
@@ -245,16 +250,18 @@ static int packet_enqueue(CompareState *s, int mode, Connection **con)
}
if (mode == PRIMARY_IN) {
- if (!colo_insert_packet(&conn->primary_list, pkt, &conn->pack)) {
- error_report("colo compare primary queue size too big,"
- "drop packet");
- }
+ ret = colo_insert_packet(&conn->primary_list, pkt, &conn->pack);
} else {
- if (!colo_insert_packet(&conn->secondary_list, pkt, &conn->sack)) {
- error_report("colo compare secondary queue size too big,"
- "drop packet");
- }
+ ret = colo_insert_packet(&conn->secondary_list, pkt, &conn->sack);
}
+
+ if (!ret) {
+ trace_colo_compare_drop_packet(colo_mode[mode],
+ "queue size too big, drop packet");
+ packet_destroy(pkt, NULL);
+ pkt = NULL;
+ }
+
*con = conn;
return 0;
diff --git a/net/trace-events b/net/trace-events
index 02c13fd0ba..fa49c71533 100644
--- a/net/trace-events
+++ b/net/trace-events
@@ -12,6 +12,7 @@ colo_proxy_main(const char *chr) ": %s"
# colo-compare.c
colo_compare_main(const char *chr) ": %s"
+colo_compare_drop_packet(const char *queue, const char *chr) ": %s: %s"
colo_compare_udp_miscompare(const char *sta, int size) ": %s = %d"
colo_compare_icmp_miscompare(const char *sta, int size) ": %s = %d"
colo_compare_ip_info(int psize, const char *sta, const char *stb, int ssize, const char *stc, const char *std) "ppkt size = %d, ip_src = %s, ip_dst = %s, spkt size = %d, ip_src = %s, ip_dst = %s"
--
2.17.1
next prev parent reply other threads:[~2020-05-19 20:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 20:02 [PATCH 0/7] Latest COLO tree queued patches Zhang Chen
2020-05-19 20:02 ` Zhang Chen [this message]
2020-05-20 5:52 ` [PATCH 1/7] colo-compare: Fix memory leak in packet_enqueue() Philippe Mathieu-Daudé
2020-05-19 20:02 ` [PATCH 2/7] net/colo-compare.c: Create event_bh with the right AioContext Zhang Chen
2020-05-19 20:02 ` [PATCH 3/7] chardev/char.c: Use qemu_co_sleep_ns if in coroutine Zhang Chen
2020-05-20 5:34 ` Philippe Mathieu-Daudé
2020-05-19 20:02 ` [PATCH 4/7] net/colo-compare.c: Fix deadlock in compare_chr_send Zhang Chen
2020-05-19 20:02 ` [PATCH 5/7] net/colo-compare.c: Only hexdump packets if tracing is enabled Zhang Chen
2020-05-19 20:02 ` [PATCH 6/7] net/colo-compare.c, softmmu/vl.c: Check that colo-compare is active Zhang Chen
2020-05-19 20:02 ` [PATCH 7/7] net/colo-compare.c: Correct ordering in complete and finalize Zhang Chen
2020-05-20 2:47 ` [PATCH 0/7] Latest COLO tree queued patches Jason Wang
2020-05-20 4:41 ` no-reply
2020-05-20 9:07 ` Zhang, Chen
2020-05-20 12:22 ` Jason Wang
2020-05-21 1:30 ` Zhang, Chen
2020-05-21 19:54 ` Lukas Straub
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=20200519200207.17773-2-chen.zhang@intel.com \
--to=chen.zhang@intel.com \
--cc=dereksu@qnap.com \
--cc=jasowang@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=zhangckid@gmail.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 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).