| Message ID | 1565177297-27087-1-git-send-email-damjan.skvarc@gmail.com |
|---|---|
| State | Accepted |
| Commit | c1ba3f68a78af3b852aa5709a0d96f001b63b243 |
| Headers | show |
| Series | [ovs-dev,1/1] ovn-northd: fix memory leak in add_distributed_nat_routes() function | expand |
Bleep bloop. Greetings Damijan Skvarc, I am a robot and I have tried out your patch. Thanks for your contribution. I encountered some error that I wasn't expecting. See the details below. git-am: fatal: sha1 information is lacking or useless (northd/ovn-northd.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 ovn-northd: fix memory leak in add_distributed_nat_routes() function The copy of the patch that failed is found in: /var/lib/jenkins/jobs/upstream_build_from_pw/workspace/.git/rebase-apply/patch When you have resolved this problem, run "git am --resolved". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Please check this out. If you feel there has been an error, please email aconole@bytheb.org Thanks, 0-day Robot
On Wed, Aug 7, 2019 at 4:59 PM Damijan Skvarc <damjan.skvarc@gmail.com> wrote: > Within this function actions & match dynamic strings are used as helper > variables for adding entries into logical flow table. Variables are > used several times in order to optimize number of memory allocations, > however at the end memory was forgotten to be deallocated. > > Signed-off-by: Damijan Skvarc <damjan.skvarc@gmail.com> > Hi Damijan, This patch is already applied to ovn master repo a couple of days back - https://github.com/ovn-org/ovn/commit/c1ba3f68a78af3b852aa5709a0d96f001b63b243 Would you please submit the patch to OVS branch 2.12 so that it can be backported (with the subject prefix - "branch 2.12") Thanks Numan > --- > northd/ovn-northd.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c > index 979dea4..8588961 100644 > --- a/northd/ovn-northd.c > +++ b/northd/ovn-northd.c > @@ -5667,6 +5667,8 @@ add_distributed_nat_routes(struct hmap *lflows, > const struct ovn_port *op) > ds_clear(&actions); > } > } > + ds_destroy(&match); > + ds_destroy(&actions); > } > > static void > -- > 2.7.4 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
On Wed, Aug 7, 2019 at 3:50 PM Numan Siddique <nusiddiq@redhat.com> wrote: > > > On Wed, Aug 7, 2019 at 4:59 PM Damijan Skvarc <damjan.skvarc@gmail.com> > wrote: > >> Within this function actions & match dynamic strings are used as helper >> variables for adding entries into logical flow table. Variables are >> used several times in order to optimize number of memory allocations, >> however at the end memory was forgotten to be deallocated. >> >> Signed-off-by: Damijan Skvarc <damjan.skvarc@gmail.com> >> > > Hi Damijan, > > This patch is already applied to ovn master repo a couple of days back - > https://github.com/ovn-org/ovn/commit/c1ba3f68a78af3b852aa5709a0d96f001b63b243 > Sorry, my mistake, I have incorrectly resent the same leftover artifact file. > > Would you please submit the patch to OVS branch 2.12 so that it can be > backported (with the subject prefix - "branch 2.12") > I've already tried, but 0-day robot refused it, complaining about not having Mark Michelson in a list of authors... ( https://mail.openvswitch.org/pipermail/ovs-dev/2019-August/361326.html). Also branch 2.12 token was not specified in a subject. I'll retry once more... > Thanks > Numan > > > >> --- >> northd/ovn-northd.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c >> index 979dea4..8588961 100644 >> --- a/northd/ovn-northd.c >> +++ b/northd/ovn-northd.c >> @@ -5667,6 +5667,8 @@ add_distributed_nat_routes(struct hmap *lflows, >> const struct ovn_port *op) >> ds_clear(&actions); >> } >> } >> + ds_destroy(&match); >> + ds_destroy(&actions); >> } >> >> static void >> -- >> 2.7.4 >> >> _______________________________________________ >> dev mailing list >> dev@openvswitch.org >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev >> >
diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index 979dea4..8588961 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -5667,6 +5667,8 @@ add_distributed_nat_routes(struct hmap *lflows, const struct ovn_port *op) ds_clear(&actions); } } + ds_destroy(&match); + ds_destroy(&actions); } static void
Within this function actions & match dynamic strings are used as helper variables for adding entries into logical flow table. Variables are used several times in order to optimize number of memory allocations, however at the end memory was forgotten to be deallocated. Signed-off-by: Damijan Skvarc <damjan.skvarc@gmail.com> --- northd/ovn-northd.c | 2 ++ 1 file changed, 2 insertions(+)