From: Stefan Schmidt <stefan@datenfreihafen.org>
To: Alexander Aring <aring@mojatatu.com>, stefan@osg.samsung.com
Cc: linux-wpan@vger.kernel.org, netdev@vger.kernel.org,
kernel@mojatatu.com, David Palma <david.palma@ntnu.no>,
Rabi Narayan Sahoo <rabinarayans0828@gmail.com>
Subject: Re: [PATCH wpan 1/2] net: 6lowpan: fix reserved space for single frames
Date: Thu, 5 Jul 2018 13:16:03 +0200 [thread overview]
Message-ID: <a2cb217f-7e22-e603-bd46-13d8764fee64@datenfreihafen.org> (raw)
In-Reply-To: <20180702203203.21316-1-aring@mojatatu.com>
Hello.
[CC David Palma and Rabi Narayan Sahoo]
On 02.07.2018 22:32, Alexander Aring wrote:
> This patch fixes patch add handling to take care tail and headroom for
> single 6lowpan frames. We need to be sure we have a skb with the right
> head and tailroom for single frames. This patch do it by using
> skb_copy_expand() if head and tailroom is not enough allocated by upper
> layer.
>
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=195059
> Reported-by: David Palma <david.palma@ntnu.no>
> Reported-by: Rabi Narayan Sahoo <rabinarayans0828@gmail.com>
> Signed-off-by: Alexander Aring <aring@mojatatu.com>
David, Rabi and you please test these two patches and verify that it
fixes the problems you have?
regards
Stefan Schmidt
> ---
> net/ieee802154/6lowpan/tx.c | 21 ++++++++++++++++++---
> 1 file changed, 18 insertions(+), 3 deletions(-)
>
> diff --git a/net/ieee802154/6lowpan/tx.c b/net/ieee802154/6lowpan/tx.c
> index e6ff5128e61a..d0c4d220de08 100644
> --- a/net/ieee802154/6lowpan/tx.c
> +++ b/net/ieee802154/6lowpan/tx.c
> @@ -265,9 +265,24 @@ netdev_tx_t lowpan_xmit(struct sk_buff *skb, struct net_device *ldev)
> /* We must take a copy of the skb before we modify/replace the ipv6
> * header as the header could be used elsewhere
> */
> - skb = skb_unshare(skb, GFP_ATOMIC);
> - if (!skb)
> - return NET_XMIT_DROP;
> + if (unlikely(skb_headroom(skb) < ldev->needed_headroom ||
> + skb_tailroom(skb) < ldev->needed_tailroom)) {
> + struct sk_buff *nskb;
> +
> + nskb = skb_copy_expand(skb, ldev->needed_headroom,
> + ldev->needed_tailroom, GFP_ATOMIC);
> + if (likely(skb)) {
> + consume_skb(skb);
> + skb = nskb;
> + } else {
> + kfree_skb(skb);
> + return NET_XMIT_DROP;
> + }
> + } else {
> + skb = skb_unshare(skb, GFP_ATOMIC);
> + if (!skb)
> + return NET_XMIT_DROP;
> + }
>
> ret = lowpan_header(skb, ldev, &dgram_size, &dgram_offset);
> if (ret < 0) {
>
next prev parent reply other threads:[~2018-07-05 11:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-02 20:32 [PATCH wpan 1/2] net: 6lowpan: fix reserved space for single frames Alexander Aring
2018-07-02 20:32 ` [PATCH wpan 2/2] net: mac802154: tx: expand tailroom if necessary Alexander Aring
2018-08-06 9:26 ` Stefan Schmidt
2018-07-05 11:16 ` Stefan Schmidt [this message]
2018-07-06 7:54 ` [PATCH wpan 1/2] net: 6lowpan: fix reserved space for single frames David Palma
2018-07-06 8:07 ` Stefan Schmidt
2018-07-06 10:06 ` Stefan Schmidt
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=a2cb217f-7e22-e603-bd46-13d8764fee64@datenfreihafen.org \
--to=stefan@datenfreihafen.org \
--cc=aring@mojatatu.com \
--cc=david.palma@ntnu.no \
--cc=kernel@mojatatu.com \
--cc=linux-wpan@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rabinarayans0828@gmail.com \
--cc=stefan@osg.samsung.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).