From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 0DA211B49D for ; Fri, 4 Jan 2019 14:27:17 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 74E65C07455E; Fri, 4 Jan 2019 13:27:16 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-13.ams2.redhat.com [10.36.117.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A9425C1A1; Fri, 4 Jan 2019 13:27:15 +0000 (UTC) From: Kevin Traynor To: Anatoly Burakov Cc: dpdk stable Date: Fri, 4 Jan 2019 13:24:14 +0000 Message-Id: <20190104132455.15170-32-ktraynor@redhat.com> In-Reply-To: <20190104132455.15170-1-ktraynor@redhat.com> References: <20190104132455.15170-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 04 Jan 2019 13:27:16 +0000 (UTC) Subject: [dpdk-stable] patch 'malloc: fix duplicate mem event notification' has been queued to LTS release 18.11.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: Fri, 04 Jan 2019 13:27:17 -0000 Hi, FYI, your patch has been queued to LTS release 18.11.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 01/11/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Kevin Traynor --- >>From 3c66bad246c40c5eeadf8c2f222c818a5d4f6739 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Tue, 11 Dec 2018 16:48:28 +0000 Subject: [PATCH] malloc: fix duplicate mem event notification [ upstream commit b3e735e16e07de79fb09dfb485eae2965c952d74 ] We already trigger a mem event notification inside the walk function, no need to do it twice. Fixes: f32c7c9de961 ("malloc: enable event callbacks for external memory") Signed-off-by: Anatoly Burakov --- lib/librte_eal/common/rte_malloc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c index 0da5ad5e8..5f07b981a 100644 --- a/lib/librte_eal/common/rte_malloc.c +++ b/lib/librte_eal/common/rte_malloc.c @@ -518,11 +518,6 @@ sync_memory(const char *heap_name, void *va_addr, size_t len, bool attach) rte_errno = -wa.result; ret = -1; - } else { - /* notify all subscribers that a new memory area was added */ - if (attach) - eal_memalloc_mem_event_notify(RTE_MEM_EVENT_ALLOC, - va_addr, len); + } else ret = 0; - } unlock: rte_rwlock_read_unlock(&mcfg->memory_hotplug_lock); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-04 13:23:08.209896592 +0000 +++ 0032-malloc-fix-duplicate-mem-event-notification.patch 2019-01-04 13:23:07.000000000 +0000 @@ -1,13 +1,14 @@ -From b3e735e16e07de79fb09dfb485eae2965c952d74 Mon Sep 17 00:00:00 2001 +From 3c66bad246c40c5eeadf8c2f222c818a5d4f6739 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Tue, 11 Dec 2018 16:48:28 +0000 Subject: [PATCH] malloc: fix duplicate mem event notification +[ upstream commit b3e735e16e07de79fb09dfb485eae2965c952d74 ] + We already trigger a mem event notification inside the walk function, no need to do it twice. Fixes: f32c7c9de961 ("malloc: enable event callbacks for external memory") -Cc: stable@dpdk.org Signed-off-by: Anatoly Burakov ---