mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
dee4e7b40c
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.132
Removed upstreamed:
bcm53xx/patches-5.15/037-v6.6-0006-ARM-dts-BCM53573-Add-cells-sizes-to-PCIe-node.patch[1]
bcm53xx/patches-5.15/037-v6.6-0007-ARM-dts-BCM53573-Use-updated-spi-gpio-binding-proper.patch[2]
bcm53xx/patches-5.15/037-v6.6-0008-ARM-dts-BCM5301X-Extend-RAM-to-full-256MB-for-Linksy.patch[3]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.132&id=b35f3ca1877e024887df205ede952863d65dad36
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.132&id=2840d9b9c8750be270fb1153ccd5b983cbb5d592
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.132&id=f086e859ddc252c32f0438edff241859c0f022ce
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit ac422c9788)
[Refresh on top of OpenWrt 23.05]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
66 lines
2.3 KiB
Diff
66 lines
2.3 KiB
Diff
From 5142239a22219921a7863cf00c9ab853c00689d8 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 11 Mar 2022 10:14:18 +0100
|
|
Subject: [PATCH] net: veth: Account total xdp_frame len running ndo_xdp_xmit
|
|
|
|
Even if this is a theoretical issue since it is not possible to perform
|
|
XDP_REDIRECT on a non-linear xdp_frame, veth driver does not account
|
|
paged area in ndo_xdp_xmit function pointer.
|
|
Introduce xdp_get_frame_len utility routine to get the xdp_frame full
|
|
length and account total frame size running XDP_REDIRECT of a
|
|
non-linear xdp frame into a veth device.
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
|
|
Acked-by: Toke Hoiland-Jorgensen <toke@redhat.com>
|
|
Acked-by: John Fastabend <john.fastabend@gmail.com>
|
|
Link: https://lore.kernel.org/bpf/54f9fd3bb65d190daf2c0bbae2f852ff16cfbaa0.1646989407.git.lorenzo@kernel.org
|
|
---
|
|
drivers/net/veth.c | 4 ++--
|
|
include/net/xdp.h | 14 ++++++++++++++
|
|
2 files changed, 16 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/veth.c
|
|
+++ b/drivers/net/veth.c
|
|
@@ -503,7 +503,7 @@ static int veth_xdp_xmit(struct net_devi
|
|
struct xdp_frame *frame = frames[i];
|
|
void *ptr = veth_xdp_to_ptr(frame);
|
|
|
|
- if (unlikely(frame->len > max_len ||
|
|
+ if (unlikely(xdp_get_frame_len(frame) > max_len ||
|
|
__ptr_ring_produce(&rq->xdp_ring, ptr)))
|
|
break;
|
|
nxmit++;
|
|
@@ -864,7 +864,7 @@ static int veth_xdp_rcv(struct veth_rq *
|
|
/* ndo_xdp_xmit */
|
|
struct xdp_frame *frame = veth_ptr_to_xdp(ptr);
|
|
|
|
- stats->xdp_bytes += frame->len;
|
|
+ stats->xdp_bytes += xdp_get_frame_len(frame);
|
|
frame = veth_xdp_rcv_one(rq, frame, bq, stats);
|
|
if (frame) {
|
|
/* XDP_PASS */
|
|
--- a/include/net/xdp.h
|
|
+++ b/include/net/xdp.h
|
|
@@ -295,6 +295,20 @@ out:
|
|
__xdp_release_frame(xdpf->data, mem);
|
|
}
|
|
|
|
+static __always_inline unsigned int xdp_get_frame_len(struct xdp_frame *xdpf)
|
|
+{
|
|
+ struct skb_shared_info *sinfo;
|
|
+ unsigned int len = xdpf->len;
|
|
+
|
|
+ if (likely(!xdp_frame_has_frags(xdpf)))
|
|
+ goto out;
|
|
+
|
|
+ sinfo = xdp_get_shared_info_from_frame(xdpf);
|
|
+ len += sinfo->xdp_frags_size;
|
|
+out:
|
|
+ return len;
|
|
+}
|
|
+
|
|
int xdp_rxq_info_reg(struct xdp_rxq_info *xdp_rxq,
|
|
struct net_device *dev, u32 queue_index, unsigned int napi_id);
|
|
void xdp_rxq_info_unreg(struct xdp_rxq_info *xdp_rxq);
|