* [PATCH net-next 0/2] cls_flower: Various fixes
@ 2018-05-30 8:17 Paul Blakey
2018-05-30 8:17 ` [PATCH net-next 1/2] cls_flower: Fix missing free of rhashtable Paul Blakey
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Paul Blakey @ 2018-05-30 8:17 UTC (permalink / raw)
To: Jiri Pirko, Cong Wang, Jamal Hadi Salim, David Miller, netdev
Cc: Yevgeny Kliteynik, Roi Dayan, Shahar Klein, Mark Bloch,
Or Gerlitz, Paul Blakey
Two of the fixes are for my multiple mask patch
Paul Blakey (2):
cls_flower: Fix missing free of rhashtable
cls_flower: Fix comparing of old filter mask with new filter
net/sched/cls_flower.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
2.7.4
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH net-next 1/2] cls_flower: Fix missing free of rhashtable
2018-05-30 8:17 [PATCH net-next 0/2] cls_flower: Various fixes Paul Blakey
@ 2018-05-30 8:17 ` Paul Blakey
2018-05-30 8:17 ` [PATCH net-next 2/2] cls_flower: Fix comparing of old filter mask with new filter Paul Blakey
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Paul Blakey @ 2018-05-30 8:17 UTC (permalink / raw)
To: Jiri Pirko, Cong Wang, Jamal Hadi Salim, David Miller, netdev
Cc: Yevgeny Kliteynik, Roi Dayan, Shahar Klein, Mark Bloch,
Or Gerlitz, Paul Blakey
When destroying the instance, destroy the head rhashtable.
Fixes: 05cd271fd61a ("cls_flower: Support multiple masks per priority")
Reported-by: Vlad Buslov <vladbu@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Paul Blakey <paulb@mellanox.com>
---
net/sched/cls_flower.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index d06e398..ce5983b 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -338,6 +338,8 @@ static void fl_destroy_sleepable(struct work_struct *work)
{
struct cls_fl_head *head = container_of(work, struct cls_fl_head,
work);
+
+ rhashtable_destroy(&head->ht);
kfree(head);
module_put(THIS_MODULE);
}
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH net-next 2/2] cls_flower: Fix comparing of old filter mask with new filter
2018-05-30 8:17 [PATCH net-next 0/2] cls_flower: Various fixes Paul Blakey
2018-05-30 8:17 ` [PATCH net-next 1/2] cls_flower: Fix missing free of rhashtable Paul Blakey
@ 2018-05-30 8:17 ` Paul Blakey
2018-05-31 18:36 ` [PATCH net-next 0/2] cls_flower: Various fixes David Miller
2018-06-03 18:33 ` Cong Wang
3 siblings, 0 replies; 8+ messages in thread
From: Paul Blakey @ 2018-05-30 8:17 UTC (permalink / raw)
To: Jiri Pirko, Cong Wang, Jamal Hadi Salim, David Miller, netdev
Cc: Yevgeny Kliteynik, Roi Dayan, Shahar Klein, Mark Bloch,
Or Gerlitz, Paul Blakey
We incorrectly compare the mask and the result is that we can't modify
an already existing rule.
Fix that by comparing correctly.
Fixes: 05cd271fd61a ("cls_flower: Support multiple masks per priority")
Reported-by: Vlad Buslov <vladbu@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Paul Blakey <paulb@mellanox.com>
---
net/sched/cls_flower.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index ce5983b..3dc9a66 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -897,7 +897,7 @@ static int fl_check_assign_mask(struct cls_fl_head *head,
return PTR_ERR(newmask);
fnew->mask = newmask;
- } else if (fold && fold->mask == fnew->mask) {
+ } else if (fold && fold->mask != fnew->mask) {
return -EINVAL;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH net-next 0/2] cls_flower: Various fixes
2018-05-30 8:17 [PATCH net-next 0/2] cls_flower: Various fixes Paul Blakey
2018-05-30 8:17 ` [PATCH net-next 1/2] cls_flower: Fix missing free of rhashtable Paul Blakey
2018-05-30 8:17 ` [PATCH net-next 2/2] cls_flower: Fix comparing of old filter mask with new filter Paul Blakey
@ 2018-05-31 18:36 ` David Miller
2018-06-03 18:33 ` Cong Wang
3 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2018-05-31 18:36 UTC (permalink / raw)
To: paulb
Cc: jiri, xiyou.wangcong, jhs, netdev, kliteyn, roid, shahark, markb,
ogerlitz
From: Paul Blakey <paulb@mellanox.com>
Date: Wed, 30 May 2018 11:17:36 +0300
> Two of the fixes are for my multiple mask patch
This series doesn't apply cleanly to net-next.
Please respin.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next 0/2] cls_flower: Various fixes
2018-05-30 8:17 [PATCH net-next 0/2] cls_flower: Various fixes Paul Blakey
` (2 preceding siblings ...)
2018-05-31 18:36 ` [PATCH net-next 0/2] cls_flower: Various fixes David Miller
@ 2018-06-03 18:33 ` Cong Wang
2018-06-03 19:39 ` Jiri Pirko
3 siblings, 1 reply; 8+ messages in thread
From: Cong Wang @ 2018-06-03 18:33 UTC (permalink / raw)
To: Paul Blakey
Cc: Jiri Pirko, Jamal Hadi Salim, David Miller,
Linux Kernel Network Developers, Yevgeny Kliteynik, Roi Dayan,
Shahar Klein, Mark Bloch, Or Gerlitz
On Wed, May 30, 2018 at 1:17 AM, Paul Blakey <paulb@mellanox.com> wrote:
> Two of the fixes are for my multiple mask patch
>
> Paul Blakey (2):
> cls_flower: Fix missing free of rhashtable
> cls_flower: Fix comparing of old filter mask with new filter
Both are bug fixes and one-line fixes, so definitely should go
to -net tree and -stable tree.
I don't understand why you decide to rebase on net-next.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next 0/2] cls_flower: Various fixes
2018-06-03 18:33 ` Cong Wang
@ 2018-06-03 19:39 ` Jiri Pirko
2018-06-04 7:35 ` Roi Dayan
0 siblings, 1 reply; 8+ messages in thread
From: Jiri Pirko @ 2018-06-03 19:39 UTC (permalink / raw)
To: Cong Wang
Cc: Paul Blakey, Jiri Pirko, Jamal Hadi Salim, David Miller,
Linux Kernel Network Developers, Yevgeny Kliteynik, Roi Dayan,
Shahar Klein, Mark Bloch, Or Gerlitz
Sun, Jun 03, 2018 at 08:33:25PM CEST, xiyou.wangcong@gmail.com wrote:
>On Wed, May 30, 2018 at 1:17 AM, Paul Blakey <paulb@mellanox.com> wrote:
>> Two of the fixes are for my multiple mask patch
>>
>> Paul Blakey (2):
>> cls_flower: Fix missing free of rhashtable
>> cls_flower: Fix comparing of old filter mask with new filter
>
>Both are bug fixes and one-line fixes, so definitely should go
>to -net tree and -stable tree.
I agree.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next 0/2] cls_flower: Various fixes
2018-06-03 19:39 ` Jiri Pirko
@ 2018-06-04 7:35 ` Roi Dayan
2018-06-04 16:45 ` Cong Wang
0 siblings, 1 reply; 8+ messages in thread
From: Roi Dayan @ 2018-06-04 7:35 UTC (permalink / raw)
To: Jiri Pirko, Cong Wang
Cc: Paul Blakey, Jiri Pirko, Jamal Hadi Salim, David Miller,
Linux Kernel Network Developers, Yevgeny Kliteynik, Shahar Klein,
Mark Bloch, Or Gerlitz
On 03/06/2018 22:39, Jiri Pirko wrote:
> Sun, Jun 03, 2018 at 08:33:25PM CEST, xiyou.wangcong@gmail.com wrote:
>> On Wed, May 30, 2018 at 1:17 AM, Paul Blakey <paulb@mellanox.com> wrote:
>>> Two of the fixes are for my multiple mask patch
>>>
>>> Paul Blakey (2):
>>> cls_flower: Fix missing free of rhashtable
>>> cls_flower: Fix comparing of old filter mask with new filter
>>
>> Both are bug fixes and one-line fixes, so definitely should go
>> to -net tree and -stable tree.
>
> I agree.
>
it's because the commit they fix doesn't exists in net yet.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next 0/2] cls_flower: Various fixes
2018-06-04 7:35 ` Roi Dayan
@ 2018-06-04 16:45 ` Cong Wang
0 siblings, 0 replies; 8+ messages in thread
From: Cong Wang @ 2018-06-04 16:45 UTC (permalink / raw)
To: Roi Dayan
Cc: Jiri Pirko, Paul Blakey, Jiri Pirko, Jamal Hadi Salim,
David Miller, Linux Kernel Network Developers, Yevgeny Kliteynik,
Shahar Klein, Mark Bloch, Or Gerlitz
On Mon, Jun 4, 2018 at 12:35 AM, Roi Dayan <roid@mellanox.com> wrote:
>
>
> On 03/06/2018 22:39, Jiri Pirko wrote:
>>
>> Sun, Jun 03, 2018 at 08:33:25PM CEST, xiyou.wangcong@gmail.com wrote:
>>>
>>> On Wed, May 30, 2018 at 1:17 AM, Paul Blakey <paulb@mellanox.com> wrote:
>>>>
>>>> Two of the fixes are for my multiple mask patch
>>>>
>>>> Paul Blakey (2):
>>>> cls_flower: Fix missing free of rhashtable
>>>> cls_flower: Fix comparing of old filter mask with new filter
>>>
>>>
>>> Both are bug fixes and one-line fixes, so definitely should go
>>> to -net tree and -stable tree.
>>
>>
>> I agree.
>>
>
> it's because the commit they fix doesn't exists in net yet.
>
Oh, sorry, my bad, I thought Apr 30 is in a previous release...
Anyway, v2 should be applied cleanly to -net-next or -net after
net-next is merged into it.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-06-04 16:45 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-30 8:17 [PATCH net-next 0/2] cls_flower: Various fixes Paul Blakey
2018-05-30 8:17 ` [PATCH net-next 1/2] cls_flower: Fix missing free of rhashtable Paul Blakey
2018-05-30 8:17 ` [PATCH net-next 2/2] cls_flower: Fix comparing of old filter mask with new filter Paul Blakey
2018-05-31 18:36 ` [PATCH net-next 0/2] cls_flower: Various fixes David Miller
2018-06-03 18:33 ` Cong Wang
2018-06-03 19:39 ` Jiri Pirko
2018-06-04 7:35 ` Roi Dayan
2018-06-04 16:45 ` Cong Wang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.