| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 9 Mar 2022 16:28:39 -0800
From: Eric Dumazet <eric.dumazet@...il.com>
To: "David S . Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>
Cc: netdev <netdev@...r.kernel.org>,
Alexander Duyck <alexanderduyck@...com>,
Coco Li <lixiaoyan@...gle.com>,
Eric Dumazet <edumazet@...gle.com>,
Eric Dumazet <eric.dumazet@...il.com>
Subject: [PATCH v3 net-next 07/14] ipv6: add GRO_IPV6_MAX_SIZE
From: Coco Li <lixiaoyan@...gle.com>
Enable GRO to have IPv6 specific limit for max packet size.
This patch introduces new dev->gro_ipv6_max_size
that is modifiable through ip link.
ip link set dev eth0 gro_ipv6_max_size 185000
Note that this value is only considered if bigger than
gro_max_size, and for non encapsulated TCP/ipv6 packets.
Signed-off-by: Coco Li <lixiaoyan@...gle.com>
Signed-off-by: Eric Dumazet <edumazet@...gle.com>
---
include/linux/netdevice.h | 10 ++++++++++
include/uapi/linux/if_link.h | 1 +
net/core/dev.c | 1 +
net/core/gro.c | 20 ++++++++++++++++++--
net/core/rtnetlink.c | 15 +++++++++++++++
tools/include/uapi/linux/if_link.h | 1 +
6 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 9ed348d8b6f1195514c3b5f85fbe2c45b3fa997f..771440f6f8a8fa6cdadd398be8f2bacb4841138c 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1944,6 +1944,8 @@ enum netdev_ml_priv_type {
* keep a list of interfaces to be deleted.
* @gro_max_size: Maximum size of aggregated packet in generic
* receive offload (GRO)
+ * @gro_ipv6_max_size: Maximum size of aggregated packet in generic
+ * receive offload (GRO), for IPv6
*
* @dev_addr_shadow: Copy of @dev_addr to catch direct writes.
* @linkwatch_dev_tracker: refcount tracker used by linkwatch.
@@ -2140,6 +2142,7 @@ struct net_device {
int napi_defer_hard_irqs;
#define GRO_MAX_SIZE 65536
unsigned int gro_max_size;
+ unsigned int gro_ipv6_max_size;
rx_handler_func_t __rcu *rx_handler;
void __rcu *rx_handler_data;
@@ -4910,6 +4913,13 @@ static inline void netif_set_gso_ipv6_max_size(struct net_device *dev,
WRITE_ONCE(dev->gso_ipv6_max_size, size);
}
+static inline void netif_set_gro_ipv6_max_size(struct net_device *dev,
+ unsigned int size)
+{
+ /* This pairs with the READ_ONCE() in skb_gro_receive() */
+ WRITE_ONCE(dev->gro_ipv6_max_size, size);
+}
+
static inline void skb_gso_error_unwind(struct sk_buff *skb, __be16 protocol,
int pulled_hlen, u16 mac_offset,
int mac_len)
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 048a9c848a3a39596b6c3135553fdfb9a1fe37d2..9baa084fe2c6762b05029c4692cfd9c4646bb916 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -365,6 +365,7 @@ enum {
IFLA_GRO_MAX_SIZE,
IFLA_TSO_IPV6_MAX_SIZE,
IFLA_GSO_IPV6_MAX_SIZE,
+ IFLA_GRO_IPV6_MAX_SIZE,
__IFLA_MAX
};
diff --git a/net/core/dev.c b/net/core/dev.c
index 87f8b8cb39a61c8f5a444e3b341a97ba0a4c06d9..9921cee9c20d2bc396ef1f4d783ac01604b1e8be 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -10469,6 +10469,7 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
dev->gro_max_size = GRO_MAX_SIZE;
dev->tso_ipv6_max_size = GSO_MAX_SIZE;
dev->gso_ipv6_max_size = GSO_MAX_SIZE;
+ dev->gro_ipv6_max_size = GRO_MAX_SIZE;
dev->upper_level = 1;
dev->lower_level = 1;
diff --git a/net/core/gro.c b/net/core/gro.c
index ee5e7e889d8bdd8db18715afc7bb6c1c759c9c23..f795393a883b08d71bfcfbd2d897e1ddcddf6fce 100644
--- a/net/core/gro.c
+++ b/net/core/gro.c
@@ -136,11 +136,27 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb)
unsigned int new_truesize;
struct sk_buff *lp;
+ if (unlikely(NAPI_GRO_CB(skb)->flush))
+ return -E2BIG;
+
/* pairs with WRITE_ONCE() in netif_set_gro_max_size() */
gro_max_size = READ_ONCE(p->dev->gro_max_size);
- if (unlikely(p->len + len >= gro_max_size || NAPI_GRO_CB(skb)->flush))
- return -E2BIG;
+ if (unlikely(p->len + len >= gro_max_size)) {
+ /* pairs with WRITE_ONCE() in netif_set_gro_ipv6_max_size() */
+ unsigned int gro6_max_size = READ_ONCE(p->dev->gro_ipv6_max_size);
+
+ if (gro6_max_size > gro_max_size &&
+ p->protocol == htons(ETH_P_IPV6) &&
+ skb_headroom(p) >= sizeof(struct hop_jumbo_hdr) &&
+ ipv6_hdr(p)->nexthdr == IPPROTO_TCP &&
+ !p->encapsulation)
+ gro_max_size = gro6_max_size;
+
+ if (p->len + len >= gro_max_size)
+ return -E2BIG;
+ }
+
lp = NAPI_GRO_CB(p)->last;
pinfo = skb_shinfo(lp);
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 172de404c595c89e30651a091242a75be8f786b7..39c5a9fb792df3992b4e7177f4dfeba2553eaa08 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1029,6 +1029,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev,
+ nla_total_size(4) /* IFLA_GRO_MAX_SIZE */
+ nla_total_size(4) /* IFLA_TSO_IPV6_MAX_SIZE */
+ nla_total_size(4) /* IFLA_GSO_IPV6_MAX_SIZE */
+ + nla_total_size(4) /* IFLA_GRO_IPV6_MAX_SIZE */
+ nla_total_size(1) /* IFLA_OPERSTATE */
+ nla_total_size(1) /* IFLA_LINKMODE */
+ nla_total_size(4) /* IFLA_CARRIER_CHANGES */
@@ -1736,6 +1737,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb,
nla_put_u32(skb, IFLA_GRO_MAX_SIZE, dev->gro_max_size) ||
nla_put_u32(skb, IFLA_TSO_IPV6_MAX_SIZE, dev->tso_ipv6_max_size) ||
nla_put_u32(skb, IFLA_GSO_IPV6_MAX_SIZE, dev->gso_ipv6_max_size) ||
+ nla_put_u32(skb, IFLA_GRO_IPV6_MAX_SIZE, dev->gro_ipv6_max_size) ||
#ifdef CONFIG_RPS
nla_put_u32(skb, IFLA_NUM_RX_QUEUES, dev->num_rx_queues) ||
#endif
@@ -1891,6 +1893,7 @@ static const struct nla_policy ifla_policy[IFLA_MAX+1] = {
[IFLA_GRO_MAX_SIZE] = { .type = NLA_U32 },
[IFLA_TSO_IPV6_MAX_SIZE] = { .type = NLA_U32 },
[IFLA_GSO_IPV6_MAX_SIZE] = { .type = NLA_U32 },
+ [IFLA_GRO_IPV6_MAX_SIZE] = { .type = NLA_U32 },
};
static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {
@@ -2786,6 +2789,15 @@ static int do_setlink(const struct sk_buff *skb,
}
}
+ if (tb[IFLA_GRO_IPV6_MAX_SIZE]) {
+ u32 max_size = nla_get_u32(tb[IFLA_GRO_IPV6_MAX_SIZE]);
+
+ if (dev->gro_ipv6_max_size ^ max_size) {
+ netif_set_gro_ipv6_max_size(dev, max_size);
+ status |= DO_SETLINK_MODIFIED;
+ }
+ }
+
if (tb[IFLA_GSO_MAX_SEGS]) {
u32 max_segs = nla_get_u32(tb[IFLA_GSO_MAX_SEGS]);
@@ -3264,6 +3276,9 @@ struct net_device *rtnl_create_link(struct net *net, const char *ifname,
if (tb[IFLA_GSO_IPV6_MAX_SIZE])
netif_set_gso_ipv6_max_size(dev,
nla_get_u32(tb[IFLA_GSO_IPV6_MAX_SIZE]));
+ if (tb[IFLA_GRO_IPV6_MAX_SIZE])
+ netif_set_gro_ipv6_max_size(dev,
+ nla_get_u32(tb[IFLA_GRO_IPV6_MAX_SIZE]));
return dev;
}
diff --git a/tools/include/uapi/linux/if_link.h b/tools/include/uapi/linux/if_link.h
index e40cd575607872d3bff3bc1971df8c6426290562..567008925a8be6900aa048c7ebb12684b2eebb4b 100644
--- a/tools/include/uapi/linux/if_link.h
+++ b/tools/include/uapi/linux/if_link.h
@@ -350,6 +350,7 @@ enum {
IFLA_GRO_MAX_SIZE,
IFLA_TSO_IPV6_MAX_SIZE,
IFLA_GSO_IPV6_MAX_SIZE,
+ IFLA_GRO_IPV6_MAX_SIZE,
__IFLA_MAX
};
--
2.35.1.616.g0bdcbb4464-goog
Powered by blists - more mailing lists