From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by dpdk.org (Postfix) with ESMTP id 599A01B854 for ; Tue, 15 May 2018 15:48:49 +0200 (CEST) Received: by mail-wm0-f66.google.com with SMTP id m129-v6so1242540wmb.3 for ; Tue, 15 May 2018 06:48:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Drf1S09JyONws+zXr2lbkgdzFGPkDjX0l0a70dvZVTc=; b=nHMr9iSpE9bk2ANLm/jQKimSdqnUuaJkrLyjv0JEdOF2Esrl5DlOuGbBhx35GcppJd llHWTYEIBXUsHicXFyPai1/XQ51UlUPd2hL1YKW7veTizcZ0otRQwNV0pgXr1AZWpyXu iEJIVZ3+TDWrZes1iuIcK8ZpTd6klTUPCCEEI7ugp3N1rgvUHN//isD4T/ynw9Ipe8Yo lflO+Sp3/CE3c6QWrG41tl0h6XXhcHgwaMQcZlPBeUCPL56w23MYGYp1arHQU8kHozA7 NYRnlDYa4l12GSYymZpHRW88ZdM5n0qkTObO28jXNihmA/tJPDtEQGD3MDTAmhcTtNFm quyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Drf1S09JyONws+zXr2lbkgdzFGPkDjX0l0a70dvZVTc=; b=LjOPkCsZsrhxAmS5FD4YfRXqdFsJTZZKvxf20sigY1HtAIxtcyutluKZcvPd7dhybi EBLt64ADTN+FfDJlCVmlx/0Lb8tLB4ZmdnnbeLhobR2I8CXsjLWv6iPJPw2RUyKdY2Nr CjrVmWajvw2Gs1eKTD2+LjmJpsfnJGM6TpOoWv7SlwgoJ2cGIzQcDZa96I3/HOgYiGRC TdIdxZVHOTyZ9Qlc3lYMgzh5mG5xrncOL1fgDrvxFcU/RKEkYRxD7SKHF0Q2miSpTTok exN5plE84Zs3H7czKdnh9yvhyFSruwFLWIehvZTkuwlzHj5aaxxyzZiSNFe/Hicr1N6n lKGA== X-Gm-Message-State: ALKqPwfjfi2GGAh2rNfEwTSG5roJYi8ZaBR+0dQxQb4aazgDJ+8SmtmR le/m2ltHjZNVPK6fnGZCfLACkYPXEVI= X-Google-Smtp-Source: AB8JxZoIol5/aHP4REEEGkxfMkkCZWHooOQIfVfOlwO+WhTFII6MxOThqJY9eZumiQrOZcHfoxojJw== X-Received: by 2002:a1c:d546:: with SMTP id m67-v6mr8755236wmg.117.1526392129080; Tue, 15 May 2018 06:48:49 -0700 (PDT) Received: from localhost (slip139-92-244-193.lon.uk.prserv.net. [139.92.244.193]) by smtp.gmail.com with ESMTPSA id l69-v6sm691135wmb.30.2018.05.15.06.48.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 May 2018 06:48:48 -0700 (PDT) From: luca.boccassi@gmail.com To: Li Han Cc: Konstantin Ananyev , dpdk stable Date: Tue, 15 May 2018 14:46:51 +0100 Message-Id: <20180515134731.9337-40-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180515134731.9337-1-luca.boccassi@gmail.com> References: <20180503110612.12146-2-luca.boccassi@gmail.com> <20180515134731.9337-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'ip_frag: fix some debug logs' has been queued to stable release 18.02.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2018 13:48:49 -0000 Hi, FYI, your patch has been queued to stable release 18.02.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/16/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From a6bc07a7188a6cafd51d36776696f3368fd218aa Mon Sep 17 00:00:00 2001 From: Li Han Date: Wed, 18 Apr 2018 04:51:37 -0400 Subject: [PATCH] ip_frag: fix some debug logs [ upstream commit 3375e7f28649881fc53d83ee91772d97c8b1eb9b ] In ip_frag_process, some IP_FRAG_LOG content is wrong. Fixes: 4f1a8f633862 ("ip_frag: add IPv6 reassembly") Signed-off-by: Li Han Acked-by: Konstantin Ananyev --- lib/librte_ip_frag/ip_frag_internal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_ip_frag/ip_frag_internal.c b/lib/librte_ip_frag/ip_frag_internal.c index 7397aa69a..2560c7713 100644 --- a/lib/librte_ip_frag/ip_frag_internal.c +++ b/lib/librte_ip_frag/ip_frag_internal.c @@ -152,7 +152,7 @@ ip_frag_process(struct ip_frag_pkt *fp, struct rte_ip_frag_death_row *dr, fp->frags[IP_LAST_FRAG_IDX].len); else IP_FRAG_LOG(DEBUG, "%s:%d invalid fragmented packet:\n" - "ipv4_frag_pkt: %p, key: <" IPv6_KEY_BYTES_FMT ", %#x>, " + "ipv6_frag_pkt: %p, key: <" IPv6_KEY_BYTES_FMT ", %#x>, " "total_size: %u, frag_size: %u, last_idx: %u\n" "first fragment: ofs: %u, len: %u\n" "last fragment: ofs: %u, len: %u\n\n", @@ -210,7 +210,7 @@ ip_frag_process(struct ip_frag_pkt *fp, struct rte_ip_frag_death_row *dr, fp->frags[IP_LAST_FRAG_IDX].len); else IP_FRAG_LOG(DEBUG, "%s:%d invalid fragmented packet:\n" - "ipv4_frag_pkt: %p, key: <" IPv6_KEY_BYTES_FMT ", %#x>, " + "ipv6_frag_pkt: %p, key: <" IPv6_KEY_BYTES_FMT ", %#x>, " "total_size: %u, frag_size: %u, last_idx: %u\n" "first fragment: ofs: %u, len: %u\n" "last fragment: ofs: %u, len: %u\n\n", @@ -331,7 +331,7 @@ ip_frag_lookup(struct rte_ip_frag_tbl *tbl, if (p1->key.key_len == IPV4_KEYLEN) IP_FRAG_LOG(DEBUG, "%s:%d:\n" "tbl: %p, max_entries: %u, use_entries: %u\n" - "ipv6_frag_pkt line0: %p, index: %u from %u\n" + "ipv4_frag_pkt line0: %p, index: %u from %u\n" "key: <%" PRIx64 ", %#x>, start: %" PRIu64 "\n", __func__, __LINE__, tbl, tbl->max_entries, tbl->use_entries, @@ -357,7 +357,7 @@ ip_frag_lookup(struct rte_ip_frag_tbl *tbl, if (p2->key.key_len == IPV4_KEYLEN) IP_FRAG_LOG(DEBUG, "%s:%d:\n" "tbl: %p, max_entries: %u, use_entries: %u\n" - "ipv6_frag_pkt line1: %p, index: %u from %u\n" + "ipv4_frag_pkt line1: %p, index: %u from %u\n" "key: <%" PRIx64 ", %#x>, start: %" PRIu64 "\n", __func__, __LINE__, tbl, tbl->max_entries, tbl->use_entries, -- 2.14.2