nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

ipv6: use skb_expand_head in ip6_xmit

Browse source 
Unlike skb_realloc_headroom, new helper skb_expand_head
does not allocate a new skb if possible.

Additionally this patch replaces commonly used dereferencing with variables.

Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vasily Averin 2021-08-02 11:52:29 +03:00 committed by David S. Miller
parent e415ed3a4b
commit 0c9f227bee
1 changed files with 11 additions and 16 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

27
net/ipv6/ip6_output.c
View file

@ -249,6 +249,8 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,
const struct ipv6_pinfo *np = inet6_sk(sk); const struct ipv6_pinfo *np = inet6_sk(sk);
struct in6_addr *first_hop = &fl6->daddr; struct in6_addr *first_hop = &fl6->daddr;
struct dst_entry *dst = skb_dst(skb); struct dst_entry *dst = skb_dst(skb);
struct net_device *dev = dst->dev;
struct inet6_dev *idev = ip6_dst_idev(dst);
unsigned int head_room; unsigned int head_room;
struct ipv6hdr *hdr; struct ipv6hdr *hdr;
u8 proto = fl6->flowi6_proto; u8 proto = fl6->flowi6_proto;
@ -256,22 +258,16 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,
int hlimit = -1; int hlimit = -1;
u32 mtu; u32 mtu;
head_room = sizeof(struct ipv6hdr) + LL_RESERVED_SPACE(dst->dev); head_room = sizeof(struct ipv6hdr) + LL_RESERVED_SPACE(dev);
if (opt) if (opt)
head_room += opt->opt_nflen + opt->opt_flen; head_room += opt->opt_nflen + opt->opt_flen;
if (unlikely(skb_headroom(skb) < head_room)) { if (unlikely(head_room > skb_headroom(skb))) {
struct sk_buff *skb2 = skb_realloc_headroom(skb, head_room); skb = skb_expand_head(skb, head_room);
if (!skb2) { if (!skb) {
IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS);
IPSTATS_MIB_OUTDISCARDS);
kfree_skb(skb);
return -ENOBUFS; return -ENOBUFS;
} }
if (skb->sk)
skb_set_owner_w(skb2, skb->sk);
consume_skb(skb);
skb = skb2;
} }
if (opt) { if (opt) {
@ -313,8 +309,7 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,
mtu = dst_mtu(dst); mtu = dst_mtu(dst);
if ((skb->len <= mtu) || skb->ignore_df || skb_is_gso(skb)) { if ((skb->len <= mtu) || skb->ignore_df || skb_is_gso(skb)) {
IP6_UPD_PO_STATS(net, ip6_dst_idev(skb_dst(skb)), IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len);
IPSTATS_MIB_OUT, skb->len);
/* if egress device is enslaved to an L3 master device pass the /* if egress device is enslaved to an L3 master device pass the
* skb to its handler for processing * skb to its handler for processing
@ -327,17 +322,17 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,
* we promote our socket to non const * we promote our socket to non const
*/ */
return NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, return NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT,
net, (struct sock *)sk, skb, NULL, dst->dev, net, (struct sock *)sk, skb, NULL, dev,
dst_output); dst_output);
} }
skb->dev = dst->dev; skb->dev = dev;
/* ipv6_local_error() does not require socket lock, /* ipv6_local_error() does not require socket lock,
* we promote our socket to non const * we promote our socket to non const
*/ */
ipv6_local_error((struct sock *)sk, EMSGSIZE, fl6, mtu); ipv6_local_error((struct sock *)sk, EMSGSIZE, fl6, mtu);
IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_FRAGFAILS); IP6_INC_STATS(net, idev, IPSTATS_MIB_FRAGFAILS);
kfree_skb(skb); kfree_skb(skb);
return -EMSGSIZE; return -EMSGSIZE;
} }