Patchwork [net-next] af_packet: relax BUG statement in tpacket_destruct_skb

login
register
mail settings
Submitter danborkmann@iogearbox.net
Date Aug. 9, 2012, 4:39 p.m.
Message ID <1344530345.28842.11.camel@thinkbox>
Download mbox | patch
Permalink /patch/176191/
State Changes Requested
Delegated to: David Miller
Headers show

Comments

danborkmann@iogearbox.net - Aug. 9, 2012, 4:39 p.m.
Here's a quote of the comment about the BUG macro from asm-generic/bug.h:

 Don't use BUG() or BUG_ON() unless there's really no way out; one
 example might be detecting data structure corruption in the middle
 of an operation that can't be backed out of.  If the (sub)system
 can somehow continue operating, perhaps with reduced functionality,
 it's probably not BUG-worthy.

 If you're tempted to BUG(), think again:  is completely giving up
 really the *only* solution?  There are usually better options, where
 users don't need to reboot ASAP and can mostly shut down cleanly.

In our case, the status flag of a ring buffer slot is managed from both sides,
the kernel space and the user space. This means that even though the kernel
side might work as expected, the user space screws up and changes this flag
right between the send(2) is triggered when the flag is changed to
TP_STATUS_SENDING and a given skb is destructed after some time. Then, this
will hit the BUG macro. Instead, we relax this condition with a WARN_ON_ONCE
macro, so that the user is aware of this situation. I've tested it and the
system still behaves /stable/, so in accordance with the above comment, we
should rather relax this behavior with a warning.

Signed-off-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
---
 net/packet/af_packet.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Aug. 10, 2012, 11:54 p.m.
From: Daniel Borkmann <danborkmann@iogearbox.net>
Date: Thu, 09 Aug 2012 18:39:05 +0200

> Here's a quote of the comment about the BUG macro from asm-generic/bug.h:
> 
>  Don't use BUG() or BUG_ON() unless there's really no way out; one
>  example might be detecting data structure corruption in the middle
>  of an operation that can't be backed out of.  If the (sub)system
>  can somehow continue operating, perhaps with reduced functionality,
>  it's probably not BUG-worthy.
> 
>  If you're tempted to BUG(), think again:  is completely giving up
>  really the *only* solution?  There are usually better options, where
>  users don't need to reboot ASAP and can mostly shut down cleanly.
> 
> In our case, the status flag of a ring buffer slot is managed from both sides,
> the kernel space and the user space. This means that even though the kernel
> side might work as expected, the user space screws up and changes this flag
> right between the send(2) is triggered when the flag is changed to
> TP_STATUS_SENDING and a given skb is destructed after some time. Then, this
> will hit the BUG macro. Instead, we relax this condition with a WARN_ON_ONCE
> macro, so that the user is aware of this situation. I've tested it and the
> system still behaves /stable/, so in accordance with the above comment, we
> should rather relax this behavior with a warning.
> 
> Signed-off-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>

I would like this check to simply be deleted completely.

As you said, it's a user changable value, therefore we cannot use it
for kernel side internal consistency checks at all.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
danborkmann@iogearbox.net - Aug. 11, 2012, 7:11 a.m.
On Sat, Aug 11, 2012 at 1:54 AM, David Miller <davem@davemloft.net> wrote:
> From: Daniel Borkmann <danborkmann@iogearbox.net>
> Date: Thu, 09 Aug 2012 18:39:05 +0200
>
>> Here's a quote of the comment about the BUG macro from asm-generic/bug.h:
>>
>>  Don't use BUG() or BUG_ON() unless there's really no way out; one
>>  example might be detecting data structure corruption in the middle
>>  of an operation that can't be backed out of.  If the (sub)system
>>  can somehow continue operating, perhaps with reduced functionality,
>>  it's probably not BUG-worthy.
>>
>>  If you're tempted to BUG(), think again:  is completely giving up
>>  really the *only* solution?  There are usually better options, where
>>  users don't need to reboot ASAP and can mostly shut down cleanly.
>>
>> In our case, the status flag of a ring buffer slot is managed from both sides,
>> the kernel space and the user space. This means that even though the kernel
>> side might work as expected, the user space screws up and changes this flag
>> right between the send(2) is triggered when the flag is changed to
>> TP_STATUS_SENDING and a given skb is destructed after some time. Then, this
>> will hit the BUG macro. Instead, we relax this condition with a WARN_ON_ONCE
>> macro, so that the user is aware of this situation. I've tested it and the
>> system still behaves /stable/, so in accordance with the above comment, we
>> should rather relax this behavior with a warning.
>>
>> Signed-off-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
>
> I would like this check to simply be deleted completely.
>
> As you said, it's a user changable value, therefore we cannot use it
> for kernel side internal consistency checks at all.

Thanks for the feedback, I will resend a proper patch!

Best,
Daniel
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index ceaca7c..4def36f 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1936,7 +1936,7 @@  static void tpacket_destruct_skb(struct sk_buff *skb)
 
 	if (likely(po->tx_ring.pg_vec)) {
 		ph = skb_shinfo(skb)->destructor_arg;
-		BUG_ON(__packet_get_status(po, ph) != TP_STATUS_SENDING);
+		WARN_ON_ONCE(__packet_get_status(po, ph) != TP_STATUS_SENDING);
 		BUG_ON(atomic_read(&po->tx_ring.pending) == 0);
 		atomic_dec(&po->tx_ring.pending);
 		__packet_set_status(po, ph, TP_STATUS_AVAILABLE);