From patchwork Fri Oct 28 13:25:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 79926 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1177305qge; Fri, 28 Oct 2016 06:27:34 -0700 (PDT) X-Received: by 10.55.47.198 with SMTP id v189mr10212651qkh.250.1477661253994; Fri, 28 Oct 2016 06:27:33 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g12si8363088qkh.166.2016.10.28.06.27.33 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 28 Oct 2016 06:27:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49131 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c07C0-00029M-R3 for patch@linaro.org; Fri, 28 Oct 2016 09:27:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50920) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c07Aj-0001cc-Pi for qemu-devel@nongnu.org; Fri, 28 Oct 2016 09:26:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c07Af-00014I-Rm for qemu-devel@nongnu.org; Fri, 28 Oct 2016 09:26:13 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:33732) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c07Af-000148-JU for qemu-devel@nongnu.org; Fri, 28 Oct 2016 09:26:09 -0400 Received: by mail-wm0-x235.google.com with SMTP id 79so13593761wmy.0 for ; Fri, 28 Oct 2016 06:26:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JF0di3P1ePs6+Ep0Zj7/b4AOEtoTkwUt7yXfLsTmE6Q=; b=WV/ahNOfoh64BSfpofyQD25yjeAvuyPvGErGfcBrwf4wXaJRJVGkwDUBjCgJCFW7aY kGIwSoLNztOiFglgY9LOeh+kG28gTt50kkI0/PaXU+o59Vt1xQkKAUuWob5aZBv8KslP kGPoOQA/ycb45Ah9bIzb/Kfavsbqo2OT2flig= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JF0di3P1ePs6+Ep0Zj7/b4AOEtoTkwUt7yXfLsTmE6Q=; b=ByIZXXoEc/1rR6+wgBJvUP06BEvBhaKarCq0ObcQrKM0TRp78lBpsD7XwxiR5KpJA4 pChmfhxiDvrvqtNSyudGDT3G/1NU3FUjMcO2DWNVN/txbE9vB/L9/e0JE0fjQ4Iz+skr iWaPZHbG2LxV8lsbWtkDzOj31X5961BjBTSQWzRea+V5CjORQsGKulKzidv4/W7QfSg1 CGrFhGWLuQn7fN8UzVrwItxCZVE+hLPlmvb6X4x7Mdr7Wr7fSCEK3BCiSh7WuiHQ+Chf sCZbOcsCiG3MzAMotk7afxGWD4mDW1KBfBnBbq8im/DFgzwkzT7Wfjtw6o+Y71FScNfh Ht7w== X-Gm-Message-State: ABUngvd2vnVGb3sXo8DoPNMWkwLzf6cbYL+2Q39oqDQVpuxxmOj1yWzDc2GIJ+Wqgi38q5cr X-Received: by 10.28.212.198 with SMTP id l189mr2966225wmg.103.1477661168021; Fri, 28 Oct 2016 06:26:08 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t129sm6096213wmg.23.2016.10.28.06.26.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Oct 2016 06:26:07 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id DCEB93E01AB; Fri, 28 Oct 2016 14:26:06 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 28 Oct 2016 14:25:59 +0100 Message-Id: <20161028132559.8324-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.10.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::235 Subject: [Qemu-devel] [PATCH] net: split colo_compare_pkt_info into two trace events X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , Li Zhijian , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Zhang Chen Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" It seems there is a limit to the number of arguments a UST trace event can take and at 11 the previous trace command broke the build. Split the trace into a src pkt and dst pkt trace to fix this. Signed-off-by: Alex Bennée --- net/colo-compare.c | 21 +++++++++++---------- net/trace-events | 3 ++- 2 files changed, 13 insertions(+), 11 deletions(-) -- 2.10.1 Reviewed-by: Zhang Chen diff --git a/net/colo-compare.c b/net/colo-compare.c index f791383..4ac916a 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -218,16 +218,17 @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt) (spkt->size - ETH_HLEN)); if (res != 0 && trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) { - trace_colo_compare_pkt_info(inet_ntoa(ppkt->ip->ip_src), - inet_ntoa(ppkt->ip->ip_dst), - ntohl(ptcp->th_seq), - ntohl(ptcp->th_ack), - ntohl(stcp->th_seq), - ntohl(stcp->th_ack), - res, ptcp->th_flags, - stcp->th_flags, - ppkt->size, - spkt->size); + trace_colo_compare_pkt_info_src(inet_ntoa(ppkt->ip->ip_src), + ntohl(stcp->th_seq), + ntohl(stcp->th_ack), + res, stcp->th_flags, + spkt->size); + + trace_colo_compare_pkt_info_dst(inet_ntoa(ppkt->ip->ip_dst), + ntohl(ptcp->th_seq), + ntohl(ptcp->th_ack), + res, ptcp->th_flags, + ppkt->size); qemu_hexdump((char *)ppkt->data, stderr, "colo-compare ppkt", ppkt->size); diff --git a/net/trace-events b/net/trace-events index b1913a6..35198bc 100644 --- a/net/trace-events +++ b/net/trace-events @@ -13,7 +13,8 @@ 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" colo_old_packet_check_found(int64_t old_time) "%" PRId64 colo_compare_miscompare(void) "" -colo_compare_pkt_info(const char *src, const char *dst, uint32_t pseq, uint32_t pack, uint32_t sseq, uint32_t sack, int res, uint32_t pflag, uint32_t sflag, int psize, int ssize) "src/dst: %s/%s p: seq/ack=%u/%u s: seq/ack=%u/%u res=%d flags=%x/%x ppkt_size: %d spkt_size: %d\n" +colo_compare_pkt_info_src(const char *src, uint32_t sseq, uint32_t sack, int res, uint32_t sflag, int ssize) "src/dst: %s s: seq/ack=%u/%u res=%d flags=%x spkt_size: %d\n" +colo_compare_pkt_info_dst(const char *dst, uint32_t dseq, uint32_t dack, int res, uint32_t dflag, int dsize) "src/dst: %s d: seq/ack=%u/%u res=%d flags=%x dpkt_size: %d\n" # net/filter-rewriter.c colo_filter_rewriter_debug(void) ""