From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 12B39239 for ; Tue, 21 Nov 2017 14:24:31 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id BB9D1207F5; Tue, 21 Nov 2017 08:24:30 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 21 Nov 2017 08:24:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=W7npneUrOgRcnXHzh Dh13a5jb2R2nrbGW4pX+9hWEtE=; b=F7ymbAUJFfFZ145ZVZ7RMiZdQKy4YBaeb x1UbUiOO1Zjjymvs5jJr+zHTnvS6CreZ5oPXGNgXfyzNxGgMWvwIUyprS8eOiD2S xpZrVn1nzPzvZsEfofqQuwMLgsQuMkOdC9pM4b0ENUeyAfrTbdi1CkiCvtgPiRWu 16FTLQD+aMVAdIbnNQS7iZrnSQ1avfaxyVThf4HHq8E/xn9L2LbzhPt1NvVvCAd/ n82D2dqXgm90BgPVaP3BH9OtOibkl3QnHnrz42Zd1hmAwSjYjLoCSwcVmlci8BiH Ft4JQHI6t1O7b/cmVq8kuddvU0SYohLEOljGTtfbyXK+PgrWcr8ww== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=W7npneUrOgRcnXHzhDh13a5jb2R2nrbGW4pX+9hWEtE=; b=HKWrZ1CH 6AjFD7qCaBZRg8zwKef57Vfp3qGHdBjphh/WiGhr1s+YispOv1QqDQIgMUlBGFbg 0saj54fSHDPvedeUzonFVJSw/GiTCMXUCdNAgk+0I8Nv3yePByle2Q6z0rsI9LVr i4HkWQ0KnJvXNY5SHATtZqaP10do9ooYxADgY6rT+Ya7qDhx3f9JdCXxsvhePEDf pYAPHQQT57g1k+UQ0w7ETvy8A5US3CbJXuNR7M2fJXgNXntd4SVVnHDpWPfFQQpP vIaGuoqFiJQECDL2YKYH0dngjvkbHxoGvY77ciNCPMpcu/OqrRPzdk3jPyOQrB+m RfY8lt3xbZZkAg== X-ME-Sender: Received: from localhost.localdomain (unknown [180.158.62.0]) by mail.messagingengine.com (Postfix) with ESMTPA id 5306524810; Tue, 21 Nov 2017 08:24:27 -0500 (EST) From: Yuanhan Liu To: Xueming Li Cc: Sergio Gonzalez Monroy , dpdk stable Date: Tue, 21 Nov 2017 21:17:02 +0800 Message-Id: <1511270333-31002-80-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> References: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'mem: fix malloc debug config' has been queued to stable release 17.08.1 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, 21 Nov 2017 13:24:31 -0000 Hi, FYI, your patch has been queued to stable release 17.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/17. So please shout if anyone has objections. Thanks. --yliu --- >>From 93c4fe47db3526d01cae4acc49410c63ec54c805 Mon Sep 17 00:00:00 2001 From: Xueming Li Date: Sat, 9 Sep 2017 15:33:18 +0800 Subject: [PATCH] mem: fix malloc debug config [ upstream commit 3cd4e0e88349510413c90e2602c8fd7a14cfe6ab ] This patch replaces broken macro RTE_LIBRTE_MALLOC_DEBUG with RTE_MALLOC_DEBUG. Fixes: af75078fece3 ("first public release") Signed-off-by: Xueming Li Acked-by: Sergio Gonzalez Monroy --- lib/librte_eal/common/malloc_elem.h | 4 ++-- test/test/test_malloc.c | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/librte_eal/common/malloc_elem.h b/lib/librte_eal/common/malloc_elem.h index f04b2d1..ce39129 100644 --- a/lib/librte_eal/common/malloc_elem.h +++ b/lib/librte_eal/common/malloc_elem.h @@ -53,13 +53,13 @@ struct malloc_elem { volatile enum elem_state state; uint32_t pad; size_t size; -#ifdef RTE_LIBRTE_MALLOC_DEBUG +#ifdef RTE_MALLOC_DEBUG uint64_t header_cookie; /* Cookie marking start of data */ /* trailer cookie at start + size */ #endif } __rte_cache_aligned; -#ifndef RTE_LIBRTE_MALLOC_DEBUG +#ifndef RTE_MALLOC_DEBUG static const unsigned MALLOC_ELEM_TRAILER_LEN = 0; /* dummy function - just check if pointer is non-null */ diff --git a/test/test/test_malloc.c b/test/test/test_malloc.c index 013fd44..cee6469 100644 --- a/test/test/test_malloc.c +++ b/test/test/test_malloc.c @@ -108,8 +108,7 @@ test_align_overlap_per_lcore(__attribute__((unused)) void *arg) } for(j = 0; j < 1000 ; j++) { if( *(char *)p1 != 0) { - printf("rte_zmalloc didn't zero" - "the allocated memory\n"); + printf("rte_zmalloc didn't zero the allocated memory\n"); ret = -1; } } @@ -180,8 +179,7 @@ test_reordered_free_per_lcore(__attribute__((unused)) void *arg) } for(j = 0; j < 1000 ; j++) { if( *(char *)p1 != 0) { - printf("rte_zmalloc didn't zero" - "the allocated memory\n"); + printf("rte_zmalloc didn't zero the allocated memory\n"); ret = -1; } } @@ -293,7 +291,7 @@ test_multi_alloc_statistics(void) struct rte_malloc_socket_stats pre_stats, post_stats ,first_stats, second_stats; size_t size = 2048; int align = 1024; -#ifndef RTE_LIBRTE_MALLOC_DEBUG +#ifndef RTE_MALLOC_DEBUG int trailer_size = 0; #else int trailer_size = RTE_CACHE_LINE_SIZE; @@ -623,7 +621,7 @@ test_rte_malloc_validate(void) const size_t request_size = 1024; size_t allocated_size; char *data_ptr = rte_malloc(NULL, request_size, RTE_CACHE_LINE_SIZE); -#ifdef RTE_LIBRTE_MALLOC_DEBUG +#ifdef RTE_MALLOC_DEBUG int retval; char *over_write_vals = NULL; #endif @@ -645,7 +643,7 @@ test_rte_malloc_validate(void) if (allocated_size < request_size) err_return(); -#ifdef RTE_LIBRTE_MALLOC_DEBUG +#ifdef RTE_MALLOC_DEBUG /****** change the header to be bad */ char save_buf[64]; -- 2.7.4