From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by dpdk.org (Postfix) with ESMTP id 9FC6D1B6C1 for ; Tue, 15 May 2018 19:20:19 +0200 (CEST) Received: by mail-lf0-f65.google.com with SMTP id n18-v6so1366989lfh.10 for ; Tue, 15 May 2018 10:20:19 -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=QLfvSrsZpgd1fGe2roimkXQS2szhpqVdJKZVh8HqFac=; b=JWFSzz/YlkALrS2opeIp5AvXYwSpp/HTD2bDxHkqrz8nTXE5pN4gXphDx46CpUzYgp dZQpMdaXVt8uPRaySMcGVQjlolQHyqPB9M+3lSbz3UXDmpXwRT/BsSLjtZXg5f66kyRn 4XJQTgOmuD059GPuTkCi4WfMHWvmz2DwSZpg++JV6SfcEL1G1ch2CyR0UrLeg+vNe8fE LdNYRbV6VX+JbmYt/FOW1uKv4Ep90AgA0fWfvhOA3h/mlnr5mXo8G2tUg/UCtgnH5WDj NNIkTKXHBYrxgR5YtE4+zvTfgLzLx6eA5j2twHPrt924A2ZoMU0yarnVUczHtI1d6WBs aaKA== 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=QLfvSrsZpgd1fGe2roimkXQS2szhpqVdJKZVh8HqFac=; b=O3CYS2K8G0OLh8PDvZv+9UEDeIHdwzdm2BlTB7twjxr+C/OjGDSt6A7EOvQOJBTBzU vxWpiPUf3uEFocgcZNa4x5vMZAbLJg6zNRHjwGNbeTTzrGYco4FZhN6HZqqyzfCfhHKB z++C1Jk1lxVX3xBwVYCm6Of2V6e7+WzZlIZqAYQOXi7imw9ZXsnVXpFKiMPN+i2h1qqU 7Fxbih+7NxHufHONuwWZObht4rXHBqvb4xi6MH0m4HihdA9f1rWdD+DREodfUZQLw2iE ry26CzqZuTtblEUMTmBSyWJtskr8rk/Lvz80oxPbWFIxXw4GH2n7SAzFF1sD9n5wrlDh GUMQ== X-Gm-Message-State: ALKqPwdo8FA93TqewFQFEh2BJHhf5oFSb3/um2PWYAOdlrJF9AxxJcQ/ SJU0gN5/rQibEAAR/9gZ2iT+GT/Zy9A= X-Google-Smtp-Source: AB8JxZoB/rHQmrMNaGoGzNN5cm8h5E5zns1Rlip5XVM4/ipBHAZl+v+0vLcVkwzuHgFnWngNs17uFA== X-Received: by 2002:a19:7d85:: with SMTP id y127-v6mr9486514lfc.142.1526404819132; Tue, 15 May 2018 10:20:19 -0700 (PDT) Received: from localhost ([2a00:23c5:be9a:5200:ce4c:82c0:d567:ecbb]) by smtp.gmail.com with ESMTPSA id c1-v6sm74835ljk.80.2018.05.15.10.20.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 May 2018 10:20:18 -0700 (PDT) From: luca.boccassi@gmail.com To: Li Han Cc: Konstantin Ananyev , dpdk stable Date: Tue, 15 May 2018 18:19:22 +0100 Message-Id: <20180515171933.12882-21-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180515171933.12882-1-luca.boccassi@gmail.com> References: <20180501104509.17238-46-luca.boccassi@gmail.com> <20180515171933.12882-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'ip_frag: fix some debug logs' has been queued to LTS release 16.11.7 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 17:20:19 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.7 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 ab00e349b54636296c676d97ef12fc5e7dcdba1c 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 b679ff43a..2cee6f8ab 100644 --- a/lib/librte_ip_frag/ip_frag_internal.c +++ b/lib/librte_ip_frag/ip_frag_internal.c @@ -183,7 +183,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", @@ -241,7 +241,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", @@ -362,7 +362,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, @@ -388,7 +388,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