From: Jiri Benc <jbenc@redhat.com>
To: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Cc: netdev@vger.kernel.org, davem@davemloft.net,
hannes@stressinduktion.org, aduyck@mirantis.com,
daniel@iogearbox.net, pabeni@redhat.com
Subject: Re: [PATCH net-next] net/vxlan: Avoid unaligned access in vxlan_build_skb()
Date: Tue, 20 Sep 2016 18:11:14 +0200 [thread overview]
Message-ID: <20160920181114.0ac7cfa0@griffin> (raw)
In-Reply-To: <20160920142700.GJ8920@oracle.com>
On Tue, 20 Sep 2016 10:27:00 -0400, Sowmini Varadhan wrote:
> The vxlan header is at offset (14 + 20 + 8) into the packet,
> so the vxh is not aligned in vxlan_build_skb. Use [get/put]_unaligned
> functions to modify flags and vni field in the vxh.
How did you calculate that? IP header should be aligned to 4 bytes, UDP
header is 8 bytes, thus VXLAN header is also aligned to 4 bytes.
> diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
> index e7d1668..f903fa4 100644
> --- a/drivers/net/vxlan.c
> +++ b/drivers/net/vxlan.c
> @@ -1751,15 +1751,17 @@ static int vxlan_build_skb(struct sk_buff *skb, struct dst_entry *dst,
> goto out_free;
>
> vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));
> - vxh->vx_flags = VXLAN_HF_VNI;
> - vxh->vx_vni = vxlan_vni_field(vni);
> + put_unaligned(VXLAN_HF_VNI, &vxh->vx_flags);
> + put_unaligned(vxlan_vni_field(vni), &vxh->vx_vni);
>
> if (type & SKB_GSO_TUNNEL_REMCSUM) {
> unsigned int start;
> + __be32 tmpvni = get_unaligned(&vxh->vx_vni);
>
> start = skb_checksum_start_offset(skb) - sizeof(struct vxlanhdr);
> - vxh->vx_vni |= vxlan_compute_rco(start, skb->csum_offset);
> - vxh->vx_flags |= VXLAN_HF_RCO;
> + tmpvni |= vxlan_compute_rco(start, skb->csum_offset);
> + put_unaligned(tmpvni, &vxh->vx_vni);
> + put_unaligned(VXLAN_HF_VNI | VXLAN_HF_RCO, &vxh->vx_flags);
If you went this way, it would be better to make two local variables
for vx_flags and vx_vni, store to them and do a single put_unaligned
after the condition. That way, you would have two less put_unaligned and
no get_unaligned in the remote csum case. And the code would be
cleaner. And you're missing vx_flags being accessed in
vxlan_build_gbp_hdr.
But I think this is not needed at all, see above.
Jiri
next prev parent reply other threads:[~2016-09-20 16:11 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-20 14:27 [PATCH net-next] net/vxlan: Avoid unaligned access in vxlan_build_skb() Sowmini Varadhan
2016-09-20 15:31 ` Tom Herbert
2016-09-20 15:49 ` Sowmini Varadhan
2016-09-20 16:11 ` Jiri Benc [this message]
2016-09-20 16:31 ` Sowmini Varadhan
2016-09-20 16:43 ` Jiri Benc
2016-09-20 17:07 ` Sowmini Varadhan
2016-09-20 17:15 ` Jiri Benc
2016-09-20 17:09 ` Jiri Benc
2016-09-20 17:19 ` Tom Herbert
2016-09-20 17:24 ` Sowmini Varadhan
2016-09-22 5:52 ` David Miller
2016-09-22 21:30 ` Sowmini Varadhan
2016-09-23 12:06 ` David Miller
2016-09-23 14:17 ` Alexander Duyck
2016-09-23 17:20 ` Sowmini Varadhan
2016-09-23 17:38 ` Alexander Duyck
2016-09-23 23:41 ` Sowmini Varadhan
2016-09-24 0:43 ` Alexander Duyck
2016-09-28 17:03 ` Sowmini Varadhan
2016-09-28 18:08 ` Alexander Duyck
2016-09-28 19:56 ` Sowmini Varadhan
2016-09-20 16:45 ` Hannes Frederic Sowa
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=20160920181114.0ac7cfa0@griffin \
--to=jbenc@redhat.com \
--cc=aduyck@mirantis.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=hannes@stressinduktion.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sowmini.varadhan@oracle.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).