| 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: Fri, 6 May 2022 08:30:43 -0700
From: Eric Dumazet <eric.dumazet@...il.com>
To: "David S . Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>
Cc: netdev <netdev@...r.kernel.org>, Coco Li <lixiaoyan@...gle.com>,
Eric Dumazet <edumazet@...gle.com>,
Eric Dumazet <eric.dumazet@...il.com>
Subject: [PATCH v4 net-next 07/12] ipv6: add IFLA_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 | 3 +++
include/uapi/linux/if_link.h | 1 +
net/core/dev.c | 1 +
net/core/gro.c | 20 ++++++++++++++++++--
net/core/rtnetlink.c | 22 ++++++++++++++++++++++
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 47f413dac12e901700045f4b73d47ecdca0f4f3c..df12c9843d94cb847e0ce5ba1b3b36bde7d476ed 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1962,6 +1962,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.
@@ -2154,6 +2156,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;
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index aa05fc9cc23f4ccf92f4cbba57f43472749cd42a..9ece3a391105c171057cc491c1458ee8a45e07e0 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -371,6 +371,7 @@ enum {
IFLA_TSO_MAX_SIZE,
IFLA_TSO_MAX_SEGS,
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 aa8757215b2a9f14683f95086732668eb99a875b..582b7fe052a6fb06437f95bd6a451b79e188cc57 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -10608,6 +10608,7 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
dev->tso_max_size = TSO_LEGACY_MAX_SIZE;
dev->tso_max_segs = TSO_MAX_SEGS;
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 78110edf5d4b36d2fa6f8a2676096efe0112aa0e..8b35403dd7e909a8d7df591d952a4600c13f360b 100644
--- a/net/core/gro.c
+++ b/net/core/gro.c
@@ -161,11 +161,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 847cf80f81754451e5f220f846db734a7625695b..5fa3ff835aaf6601c31458ec88e88837d353eabd 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1067,6 +1067,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev,
+ nla_total_size(4) /* IFLA_TSO_MAX_SIZE */
+ nla_total_size(4) /* IFLA_TSO_MAX_SEGS */
+ 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 */
@@ -1775,6 +1776,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb,
nla_put_u32(skb, IFLA_TSO_MAX_SIZE, dev->tso_max_size) ||
nla_put_u32(skb, IFLA_TSO_MAX_SEGS, dev->tso_max_segs) ||
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
@@ -1931,6 +1933,7 @@ static const struct nla_policy ifla_policy[IFLA_MAX+1] = {
[IFLA_TSO_MAX_SIZE] = { .type = NLA_REJECT },
[IFLA_TSO_MAX_SEGS] = { .type = NLA_REJECT },
[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] = {
@@ -2655,6 +2658,13 @@ static void netif_set_gso_ipv6_max_size(struct net_device *dev,
WRITE_ONCE(dev->gso_ipv6_max_size, size);
}
+static 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);
+}
+
#define DO_SETLINK_MODIFIED 0x01
/* notify flag means notify + modified. */
#define DO_SETLINK_NOTIFY 0x03
@@ -2840,6 +2850,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]);
@@ -3306,6 +3325,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 443eddd285f37198566fa1357f0d394ec5270ab9..5aead1be6b99623fb6ffd31cfcfd44976eb8794f 100644
--- a/tools/include/uapi/linux/if_link.h
+++ b/tools/include/uapi/linux/if_link.h
@@ -351,6 +351,7 @@ enum {
IFLA_TSO_MAX_SIZE,
IFLA_TSO_MAX_SEGS,
IFLA_GSO_IPV6_MAX_SIZE,
+ IFLA_GRO_IPV6_MAX_SIZE,
__IFLA_MAX
};
--
2.36.0.512.ge40c2bad7a-goog
Powered by blists - more mailing lists