Hi!

Please try the last commit in GIT, branch master. Commit ID 
2e7fb11a6e31324151c6db98df2fe26d2d6cffab.
Attaching the patch as well.

Thank you both for reporting this issue.

Jan

On 10/12/2016 02:10 PM, Justin Cattle wrote:
> Good stuff - once again, please let me know if you want to me test any 
> patching at this end :)
> 
> 
> 
> Cheers,
> Just
> 
> On 12 October 2016 at 13:02, Ondrej Zajicek <santi...@crfreenet.org 
> <mailto:santi...@crfreenet.org>> wrote:
> 
>     On Wed, Oct 12, 2016 at 12:09:17PM +0100, Justin Cattle wrote:
>     > Are there any thoughts as to why I still see quite large memory usage, 
> and
>     > only on some [ seemingly random ] hosts ?
> 
>     Hi
> 
>     We are doing some testing and trying to identify the cause of the problem.
>     We found some problems and strange behavior. One of them is excessive
>     memory consumption when kernel export filters are defined.
> 
>     --
>     Elen sila lumenn' omentielvo
> 
>     Ondrej 'Santiago' Zajicek (email: santi...@crfreenet.org 
> <mailto:santi...@crfreenet.org>)
>     OpenPGP encrypted e-mails preferred (KeyID 0x11DEADC3, wwwkeys.pgp.net 
> <http://wwwkeys.pgp.net>)
>     "To err is human -- to blame it on a computer is even more so."
> 
> 
> 
> Notice:  This email is confidential and may contain copyright material of 
> members of the Ocado Group. Opinions and views expressed in this message may 
> not necessarily reflect the opinions and views of the members of the Ocado 
> Group. 
> 
>  
> 
> If you are not the intended recipient, please notify us immediately and 
> delete all copies of this message. Please note that it is your responsibility 
> to scan this message for viruses. 
> 
>  
> 
> Fetch and Sizzle are trading names of Speciality Stores Limited and Fabled is 
> a trading name of Marie Claire Beauty Limited, both members of the Ocado 
> Group.
> 
>  
> 
> References to the “Ocado Group” are to Ocado Group plc (registered in England 
> and Wales with number 7098618) and its subsidiary undertakings (as that 
> expression is defined in the Companies Act 2006) from time to time.  The 
> registered office of Ocado Group plc is Titan Court, 3 Bishops Square, 
> Hatfield Business Park, Hatfield, Herts. AL10 9NE.
> 

>From 2e7fb11a6e31324151c6db98df2fe26d2d6cffab Mon Sep 17 00:00:00 2001
From: Jan Moskyto Matejka <m...@ucw.cz>
Date: Wed, 12 Oct 2016 14:16:34 +0200
Subject: [PATCH] Fixed memory bloating on kernel merge paths together with
 export filter.

Some memory was being allocated from bad linpool, not from the given one
as they should.

Thanks to Madhu and Justin Cattle for reporting this.
---
 nest/rt-table.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nest/rt-table.c b/nest/rt-table.c
index d3aba08..0047606 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -65,7 +65,7 @@ make_tmp_attrs(struct rte *rt, struct linpool *pool)
 {
   struct ea_list *(*mta)(struct rte *rt, struct linpool *pool);
   mta = rt->attrs->src->proto->make_tmp_attrs;
-  return mta ? mta(rt, rte_update_pool) : NULL;
+  return mta ? mta(rt, pool) : NULL;
 }
 
 /* Like fib_route(), but skips empty net entries */
@@ -596,7 +596,7 @@ mpnh_merge_rta(struct mpnh *nhs, rta *a, linpool *pool, int max)
 {
   struct mpnh nh = { .gw = a->gw, .iface = a->iface };
   struct mpnh *nh2 = (a->dest == RTD_MULTIPATH) ? a->nexthops : &nh;
-  return mpnh_merge(nhs, nh2, 1, 0, max, rte_update_pool);
+  return mpnh_merge(nhs, nh2, 1, 0, max, pool);
 }
 
 rte *
-- 
2.9.3

Reply via email to