| Message ID | 7fa3ce7e77fb579515e0a7c5a7dee60fc5999e2b.1658168627.git.lorenzo@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [net-next] net: ethernet: mtk-ppe: fix traffic offload with bridged wlan | expand |
On Mon, 18 Jul 2022 20:36:39 +0200 Lorenzo Bianconi wrote: > A typical flow offload scenario for OpenWrt users is routed traffic > received by the wan interface that is redirected to a wlan device > belonging to the lan bridge. Current implementation fails to > fill wdma offload info in mtk_flow_get_wdma_info() since odev device is > the local bridge. Fix the issue running dev_fill_forward_path routine in > mtk_flow_get_wdma_info in order to identify the wlan device. AFAIU this will conflict with 53eb9b04560c ("net: ethernet: mtk_ppe: fix possible NULL pointer dereference in mtk_flow_get_wdma_info")? We merge net -> net-next every Thu, please wait for that to happen and then repost. Conflicting patches are extra work for Stephen and for me.
> On Mon, 18 Jul 2022 20:36:39 +0200 Lorenzo Bianconi wrote: > > A typical flow offload scenario for OpenWrt users is routed traffic > > received by the wan interface that is redirected to a wlan device > > belonging to the lan bridge. Current implementation fails to > > fill wdma offload info in mtk_flow_get_wdma_info() since odev device is > > the local bridge. Fix the issue running dev_fill_forward_path routine in > > mtk_flow_get_wdma_info in order to identify the wlan device. > > AFAIU this will conflict with 53eb9b04560c ("net: ethernet: mtk_ppe: > fix possible NULL pointer dereference in mtk_flow_get_wdma_info")? > We merge net -> net-next every Thu, please wait for that to happen > and then repost. Conflicting patches are extra work for Stephen and > for me. ack, right, sorry for that. I will repost after the merge. Regards, Lorenzo
diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c index 90e7dfd011c9..25dc3c3aa31d 100644 --- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c +++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c @@ -88,29 +88,28 @@ mtk_flow_offload_mangle_eth(const struct flow_action_entry *act, void *eth) static int mtk_flow_get_wdma_info(struct net_device *dev, const u8 *addr, struct mtk_wdma_info *info) { - struct net_device_path_ctx ctx = { - .dev = dev, - }; - struct net_device_path path = {}; + struct net_device_path_stack stack; + struct net_device_path *path; + int err; - memcpy(ctx.daddr, addr, sizeof(ctx.daddr)); + if (!dev) + return -ENODEV; if (!IS_ENABLED(CONFIG_NET_MEDIATEK_SOC_WED)) return -1; - if (!dev->netdev_ops->ndo_fill_forward_path) - return -1; - - if (dev->netdev_ops->ndo_fill_forward_path(&ctx, &path)) - return -1; + err = dev_fill_forward_path(dev, addr, &stack); + if (err) + return err; - if (path.type != DEV_PATH_MTK_WDMA) + path = &stack.path[stack.num_paths - 1]; + if (path->type != DEV_PATH_MTK_WDMA) return -1; - info->wdma_idx = path.mtk_wdma.wdma_idx; - info->queue = path.mtk_wdma.queue; - info->bss = path.mtk_wdma.bss; - info->wcid = path.mtk_wdma.wcid; + info->wdma_idx = path->mtk_wdma.wdma_idx; + info->queue = path->mtk_wdma.queue; + info->bss = path->mtk_wdma.bss; + info->wcid = path->mtk_wdma.wcid; return 0; }
A typical flow offload scenario for OpenWrt users is routed traffic received by the wan interface that is redirected to a wlan device belonging to the lan bridge. Current implementation fails to fill wdma offload info in mtk_flow_get_wdma_info() since odev device is the local bridge. Fix the issue running dev_fill_forward_path routine in mtk_flow_get_wdma_info in order to identify the wlan device. Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> --- .../net/ethernet/mediatek/mtk_ppe_offload.c | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-)