From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qg0-f46.google.com (mail-qg0-f46.google.com [209.85.192.46]) by dpdk.org (Postfix) with ESMTP id 64EDE2B9B for ; Tue, 8 Mar 2016 17:38:48 +0100 (CET) Received: by mail-qg0-f46.google.com with SMTP id w104so16864852qge.1 for ; Tue, 08 Mar 2016 08:38:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=A4mxfniVqISIP0XzrahLZldXjtrsOHO1nlsEbau/8XA=; b=AaPOcsSFojc1SpTNiiTcUC3qm7ZS/DPzmRVgZXx/A5hBgSg0+lOeLHNzu2uKH4OFGy J2qOv22Xs1BpTvi+iB9/yqO1Jp7YpTHpl1ja7h8vX7ROSxvBB8fzeEFchXZMg/Jyr2Xg Q8q5XhcKJqkjmFrzEoKhfliR5+MJ6cnNSZHnVVGVCy317ighDc5pG3etdVlIfCNlDnQW c6bNIxL6ZurTGuh6ZCdHEXXs2jVPlzix+3p+xVzuFf9v0ymaeaW+GtpD4lTqZHBAptWy paYHykMttIzqLA8awi7qIFQr/uFlPeQQOXeiSdWfcJ+u1YOIvr/P6mlA5riCfMezW/jW 20Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=A4mxfniVqISIP0XzrahLZldXjtrsOHO1nlsEbau/8XA=; b=kJ1JUOTe2u85FuIvVb4DKnDuuRRtwYgVSRz4Nwqgf9ms4eM9B3TI9D+I73oBkBZShm bpfxjP9JK0h0Zx5KLbxEyokEhMI37OktP0+SRL1tTzLBxG9P5/TI7j54J0RXtdtZqhb3 3cKTpfnCBLWlyFsypfNxqgxg7W3/o1FWd3t2BZTxJRleCgLzmuMpshwglj0RZY58HQ7W KOyNOzbGqqAKpd4tima9jUsDJm8xxS+0AjOxm+dXxFYjwAgM84Ui/4rC///Vx36Ihppa CkM6C0Ihikf9wTGZGS8M6qJhaVzpK9Zt8ocSj8BxtAY0w30FIx+jmIQSFdv3AWxlga71 2pKQ== X-Gm-Message-State: AD7BkJIyYRdOimomXvNM+8pwrob7z/BwUyIr9MR57jntmf0cHJj7nlq0dMP9FTI2tOACb2ivPTjbUw+V6eGGhv9J X-Received: by 10.140.153.135 with SMTP id 129mr39376702qhz.38.1457455127864; Tue, 08 Mar 2016 08:38:47 -0800 (PST) MIME-Version: 1.0 Received: by 10.55.207.20 with HTTP; Tue, 8 Mar 2016 08:38:28 -0800 (PST) In-Reply-To: <1457098145-13663-1-git-send-email-christian.ehrhardt@canonical.com> References: <1457098145-13663-1-git-send-email-christian.ehrhardt@canonical.com> From: Christian Ehrhardt Date: Tue, 8 Mar 2016 17:38:28 +0100 Message-ID: To: Christian Ehrhardt , dev Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-dev] [PATCH] lpm/lpm6: fix missing free of rules_tbl and lpm X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Mar 2016 16:38:48 -0000 Hi, Stephen acked the other LPM patch I had last week (thanks). There was no feedback to this one so far and none of the two patches is committed yet. So I wanted to give this another "ping" for feedback or acceptance. Thanks in advance, Christian Christian Ehrhardt Software Engineer, Ubuntu Server Canonical Ltd On Fri, Mar 4, 2016 at 2:29 PM, Christian Ehrhardt < christian.ehrhardt@canonical.com> wrote: > lpm6 autotests failed with the default alloc of 512M Memory. > While >=2500M was a workaround it became clear while debugging that it > had a leak. > One could see a lot of output like: > LPM Test tests6[i]: FAIL > LPM: LPM memory allocation failed > > It turned out that in rte_lpm6_free > - lpm might not be freed if it didn't find a te (early return) > - lpm->rules_tbl was not freed ever > > The first of the two also applies to lpm. > --- > lib/librte_lpm/rte_lpm.c | 7 ++----- > lib/librte_lpm/rte_lpm6.c | 9 ++++----- > 2 files changed, 6 insertions(+), 10 deletions(-) > > diff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c > index cfdf959..941720d 100644 > --- a/lib/librte_lpm/rte_lpm.c > +++ b/lib/librte_lpm/rte_lpm.c > @@ -236,13 +236,10 @@ rte_lpm_free(struct rte_lpm *lpm) > if (te->data == (void *) lpm) > break; > } > - if (te == NULL) { > - rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); > - return; > + if (te != NULL) { > + TAILQ_REMOVE(lpm_list, te, next); > } > > - TAILQ_REMOVE(lpm_list, te, next); > - > rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); > > rte_free(lpm); > diff --git a/lib/librte_lpm/rte_lpm6.c b/lib/librte_lpm/rte_lpm6.c > index 48931cc..5abfc78 100644 > --- a/lib/librte_lpm/rte_lpm6.c > +++ b/lib/librte_lpm/rte_lpm6.c > @@ -278,15 +278,14 @@ rte_lpm6_free(struct rte_lpm6 *lpm) > if (te->data == (void *) lpm) > break; > } > - if (te == NULL) { > - rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); > - return; > - } > > - TAILQ_REMOVE(lpm_list, te, next); > + if (te != NULL) { > + TAILQ_REMOVE(lpm_list, te, next); > + } > > rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); > > + rte_free(lpm->rules_tbl); > rte_free(lpm); > rte_free(te); > } > -- > 2.7.0 > >