From: Oliver Hartkopp <socketcan@hartkopp.net>
To: Eric Dumazet <eric.dumazet@gmail.com>,
David Miller <davem@davemloft.net>
Cc: Linux Netdev List <netdev@vger.kernel.org>,
Andre Naujoks <nautsch2@gmail.com>
Subject: [PATCH stable 3.11+] can: bcm: add skb destructor
Date: Tue, 28 Jan 2014 21:42:25 +0100 [thread overview]
Message-ID: <52E81631.50607@hartkopp.net> (raw)
Commit 376c7311bdb6 (net: add a temporary sanity check in skb_orphan())
leads to a BUG in can_put_echo_skb() when skb_orphan() is executed.
When skbuffs created automatically in bcm_can_tx() in softirq (netrx, timer)
and userspace context the precise timing has to be met. A sock wmem accouting
is pointless for this use case.
This patch introduces an empty skb destructor like in commit 072017b41e49
(net: sctp: Add rudimentary infrastructure to account for control chunks)
to make the cyclic transmission of CAN frames work again on real CAN
netdevices. Virtual CAN interfaces do not need skb_orphan().
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
---
diff --git a/net/can/bcm.c b/net/can/bcm.c
index 3fc737b..82af1a5 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -237,6 +237,11 @@ static const struct file_operations bcm_proc_fops = {
.release = single_release,
};
+static void bcm_skb_destructor(struct sk_buff *skb)
+{
+ /* no accounting needed for bcm_can_tx() */
+}
+
/*
* bcm_can_tx - send the (next) CAN frame to the appropriate CAN interface
* of the given bcm tx op
@@ -267,6 +272,7 @@ static void bcm_can_tx(struct bcm_op *op)
memcpy(skb_put(skb, CFSIZ), cf, CFSIZ);
/* send with loopback */
+ skb->destructor = bcm_skb_destructor;
skb->dev = dev;
skb->sk = op->sk;
can_send(skb, 1);
next reply other threads:[~2014-01-28 20:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-28 20:42 Oliver Hartkopp [this message]
2014-01-28 22:28 ` [PATCH stable 3.11+] can: bcm: add skb destructor Eric Dumazet
2014-01-28 22:49 ` Oliver Hartkopp
2014-01-28 23:51 ` Eric Dumazet
2014-01-29 7:40 ` Andre Naujoks
2014-01-29 7:46 ` David Miller
2014-01-29 8:47 ` Andre Naujoks
2014-01-29 14:53 ` Eric Dumazet
2014-01-29 15:35 ` Andre Naujoks
2014-01-29 15:48 ` Eric Dumazet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52E81631.50607@hartkopp.net \
--to=socketcan@hartkopp.net \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=nautsch2@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.