Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1421178 > unrolled thread
| Started by | Ben Hutchings <ben@decadent.org.uk> |
|---|---|
| First post | 2016-06-13 21:00 +0200 |
| Last post | 2016-06-14 08:10 +0200 |
| Articles | 5 — 3 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 3.16 046/114] batman-adv: Fix broadcast/ogm queue limit on a removed interface Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:00 +0200
Re: [PATCH 3.16 046/114] batman-adv: Fix broadcast/ogm queue limit on a removed interface Linus Lüssing <linus.luessing@c0d3.blue> - 2016-06-13 21:40 +0200
Re: [PATCH 3.16 046/114] batman-adv: Fix broadcast/ogm queue limit on a removed interface Sven Eckelmann <sven@narfation.org> - 2016-06-13 21:40 +0200
Re: [PATCH 3.16 046/114] batman-adv: Fix broadcast/ogm queue limit on a removed interface Ben Hutchings <ben@decadent.org.uk> - 2016-06-14 01:00 +0200
Re: [PATCH 3.16 046/114] batman-adv: Fix broadcast/ogm queue limit on a removed interface Sven Eckelmann <sven@narfation.org> - 2016-06-14 08:10 +0200
| From | Ben Hutchings <ben@decadent.org.uk> |
|---|---|
| Date | 2016-06-13 21:00 +0200 |
| Subject | [PATCH 3.16 046/114] batman-adv: Fix broadcast/ogm queue limit on a removed interface |
| Message-ID | <rJFfH-1JY-83@gated-at.bofh.it> |
3.16.36-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Linus Lüssing <linus.luessing@c0d3.blue>
commit c4fdb6cff2aa0ae740c5f19b6f745cbbe786d42f upstream.
When removing a single interface while a broadcast or ogm packet is
still pending then we will free the forward packet without releasing the
queue slots again.
This patch is supposed to fix this issue.
Fixes: 6d5808d4ae1b ("batman-adv: Add missing hardif_free_ref in forw_packet_free")
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
[sven@narfation.org: fix conflicts with current version]
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
net/batman-adv/send.c | 6 ++++++
1 file changed, 6 insertions(+)
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -638,6 +638,12 @@ batadv_purge_outstanding_packets(struct
if (pending) {
hlist_del(&forw_packet->list);
+ if (!forw_packet->own)
+ atomic_inc(&bat_priv->bcast_queue_left);
+
+ if (!forw_packet->own)
+ atomic_inc(&bat_priv->batman_queue_left);
+
batadv_forw_packet_free(forw_packet);
}
}
[toc] | [next] | [standalone]
| From | Linus Lüssing <linus.luessing@c0d3.blue> |
|---|---|
| Date | 2016-06-13 21:40 +0200 |
| Subject | Re: [PATCH 3.16 046/114] batman-adv: Fix broadcast/ogm queue limit on a removed interface |
| Message-ID | <rJFSi-2fB-3@gated-at.bofh.it> |
| In reply to | #1421178 |
On Mon, Jun 13, 2016 at 07:36:37PM +0100, Ben Hutchings wrote:
> 3.16.36-rc1 review patch. If anyone has any objections, please let me know.
>
Hi Ben,
This one looks weird. The version you added for 3.2.81-rc1 looked
better.
Cheers, Linus
> ------------------
>
> From: Linus Lüssing <linus.luessing@c0d3.blue>
>
> commit c4fdb6cff2aa0ae740c5f19b6f745cbbe786d42f upstream.
>
> When removing a single interface while a broadcast or ogm packet is
> still pending then we will free the forward packet without releasing the
> queue slots again.
>
> This patch is supposed to fix this issue.
>
> Fixes: 6d5808d4ae1b ("batman-adv: Add missing hardif_free_ref in forw_packet_free")
> Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
> [sven@narfation.org: fix conflicts with current version]
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
> Signed-off-by: Antonio Quartulli <a@unstable.cc>
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> ---
> net/batman-adv/send.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> --- a/net/batman-adv/send.c
> +++ b/net/batman-adv/send.c
> @@ -638,6 +638,12 @@ batadv_purge_outstanding_packets(struct
>
> if (pending) {
> hlist_del(&forw_packet->list);
> + if (!forw_packet->own)
> + atomic_inc(&bat_priv->bcast_queue_left);
> +
> + if (!forw_packet->own)
> + atomic_inc(&bat_priv->batman_queue_left);
> +
> batadv_forw_packet_free(forw_packet);
> }
> }
>
[toc] | [prev] | [next] | [standalone]
| From | Sven Eckelmann <sven@narfation.org> |
|---|---|
| Date | 2016-06-13 21:40 +0200 |
| Subject | Re: [PATCH 3.16 046/114] batman-adv: Fix broadcast/ogm queue limit on a removed interface |
| Message-ID | <rJFSi-2fB-5@gated-at.bofh.it> |
| In reply to | #1421178 |
[Multipart message — attachments visible in raw view] — view raw
Hi,
looks like the patch is broken (at least it does something different than the
non-stable patch does).
On Monday 13 June 2016 19:36:37 Ben Hutchings wrote:
> 3.16.36-rc1 review patch. If anyone has any objections, please let me know.
[...]
> --- a/net/batman-adv/send.c
> +++ b/net/batman-adv/send.c
> @@ -638,6 +638,12 @@ batadv_purge_outstanding_packets(struct
>
> if (pending) {
> hlist_del(&forw_packet->list);
> + if (!forw_packet->own)
> + atomic_inc(&bat_priv->bcast_queue_left);
> +
> + if (!forw_packet->own)
> + atomic_inc(&bat_priv->batman_queue_left);
> +
> batadv_forw_packet_free(forw_packet);
> }
> }
It seems to be a problem with the way GNU patch solved the conflicts with the
slightly different orig file (moved the hunks together when it shouldn't
have). GregKH also had this problem [1]
Kind regards,
Sven
[1] http://mid.gmane.org/20160507195405.GA4376@kroah.com
[toc] | [prev] | [next] | [standalone]
| From | Ben Hutchings <ben@decadent.org.uk> |
|---|---|
| Date | 2016-06-14 01:00 +0200 |
| Subject | Re: [PATCH 3.16 046/114] batman-adv: Fix broadcast/ogm queue limit on a removed interface |
| Message-ID | <rJIZP-4pp-5@gated-at.bofh.it> |
| In reply to | #1421244 |
[Multipart message — attachments visible in raw view] — view raw
On Mon, 2016-06-13 at 21:33 +0200, Sven Eckelmann wrote:
> Hi,
>
> looks like the patch is broken (at least it does something different than the
> non-stable patch does).
>
> On Monday 13 June 2016 19:36:37 Ben Hutchings wrote:
> > 3.16.36-rc1 review patch. If anyone has any objections, please let me know.
> [...]
> > --- a/net/batman-adv/send.c
> > +++ b/net/batman-adv/send.c
> > @@ -638,6 +638,12 @@ batadv_purge_outstanding_packets(struct
> >
> > if (pending) {
> > hlist_del(&forw_packet->list);
> > + if (!forw_packet->own)
> > + atomic_inc(&bat_priv->bcast_queue_left);
> > +
> > + if (!forw_packet->own)
> > + atomic_inc(&bat_priv->batman_queue_left);
> > +
> > batadv_forw_packet_free(forw_packet);
> > }
> > }
>
> It seems to be a problem with the way GNU patch solved the conflicts with the
> slightly different orig file (moved the hunks together when it shouldn't
> have). GregKH also had this problem [1]
Yes, I recognise this bug. I've updated this patch to the version below.
Ben.
---
batman-adv: Fix broadcast/ogm queue limit on a removed interface
commit c4fdb6cff2aa0ae740c5f19b6f745cbbe786d42f upstream.
When removing a single interface while a broadcast or ogm packet is
still pending then we will free the forward packet without releasing the
queue slots again.
This patch is supposed to fix this issue.
Fixes: 6d5808d4ae1b ("batman-adv: Add missing hardif_free_ref in forw_packet_free")
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
[sven@narfation.org: fix conflicts with current version]
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
net/batman-adv/send.c | 6 ++++++
1 file changed, 6 insertions(+)
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -611,6 +611,9 @@ batadv_purge_outstanding_packets(struct
if (pending) {
hlist_del(&forw_packet->list);
+ if (!forw_packet->own)
+ atomic_inc(&bat_priv->bcast_queue_left);
+
batadv_forw_packet_free(forw_packet);
}
}
@@ -638,6 +641,9 @@ batadv_purge_outstanding_packets(struct
if (pending) {
hlist_del(&forw_packet->list);
+ if (!forw_packet->own)
+ atomic_inc(&bat_priv->batman_queue_left);
+
batadv_forw_packet_free(forw_packet);
}
}
--
Ben Hutchings
One of the nice things about standards is that there are so many of
them.
[toc] | [prev] | [next] | [standalone]
| From | Sven Eckelmann <sven@narfation.org> |
|---|---|
| Date | 2016-06-14 08:10 +0200 |
| Subject | Re: [PATCH 3.16 046/114] batman-adv: Fix broadcast/ogm queue limit on a removed interface |
| Message-ID | <rJPHX-P7-3@gated-at.bofh.it> |
| In reply to | #1421420 |
[Multipart message — attachments visible in raw view] — view raw
Hi,
On Monday 13 June 2016 23:53:06 Ben Hutchings wrote:
[...]
>
> Yes, I recognise this bug. I've updated this patch to the version below.
looks good to me. Thanks for updating the patch :)
Kind regards,
Sven
> ---
> batman-adv: Fix broadcast/ogm queue limit on a removed interface
>
> commit c4fdb6cff2aa0ae740c5f19b6f745cbbe786d42f upstream.
>
> When removing a single interface while a broadcast or ogm packet is
> still pending then we will free the forward packet without releasing the
> queue slots again.
>
> This patch is supposed to fix this issue.
>
> Fixes: 6d5808d4ae1b ("batman-adv: Add missing hardif_free_ref in
> forw_packet_free") Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
> [sven@narfation.org: fix conflicts with current version]
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
> Signed-off-by: Antonio Quartulli <a@unstable.cc>
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> ---
> net/batman-adv/send.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> --- a/net/batman-adv/send.c
> +++ b/net/batman-adv/send.c
> @@ -611,6 +611,9 @@ batadv_purge_outstanding_packets(struct
>
> if (pending) {
> hlist_del(&forw_packet->list);
> + if (!forw_packet->own)
> + atomic_inc(&bat_priv->bcast_queue_left);
> +
> batadv_forw_packet_free(forw_packet);
> }
> }
> @@ -638,6 +641,9 @@ batadv_purge_outstanding_packets(struct
>
> if (pending) {
> hlist_del(&forw_packet->list);
> + if (!forw_packet->own)
> + atomic_inc(&bat_priv->batman_queue_left);
> +
> batadv_forw_packet_free(forw_packet);
> }
> }
>
> --
> Ben Hutchings
> One of the nice things about standards is that there are so many of
> them.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web