Skip to content

5.12 hnat #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
d3adme4t merged 4 commits into from
Apr 4, 2021
Merged

5.12 hnat #14

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81d098c
Revert "again changes"
frank-w Mar 27, 2021
fa51d19
Revert "some fixes in layout"
frank-w Mar 27, 2021
d60ed77
fix crash and flowtable binding
frank-w Mar 28, 2021
3a5215c
net: nftables: fix hang in flowtable
ummakynes Mar 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 29 additions & 17 deletions drivers/net/ethernet/mediatek/mtk_ppe_offload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,18 +145,21 @@ static int
mtk_flow_mangle_ipv6(const struct flow_action_entry *act,
struct mtk_flow_data *data)
{
struct in6_addr *dest;

switch (act->mangle.offset) {
case offsetof(struct ipv6hdr, saddr):
dest = &data->v6.src_addr;
break;
case offsetof(struct ipv6hdr, daddr):
dest = &data->v6.dst_addr;
break;
}

memcpy(dest, &act->mangle.val, sizeof(struct in6_addr));
__be32 *dest = 0;
size_t offset_of_ip6_daddr = offsetof(struct ipv6hdr, daddr);
size_t offset_of_ip6_saddr = offsetof(struct ipv6hdr, saddr);
u32 idx;

if (act->mangle.offset >= offset_of_ip6_saddr && act->mangle.offset < offset_of_ip6_daddr) {
idx = (act->mangle.offset - offset_of_ip6_saddr) / 4;
dest = &data->v6.src_addr.s6_addr32[idx];
} else if (act->mangle.offset >= offset_of_ip6_daddr &&
act->mangle.offset < offset_of_ip6_daddr + 16) {
idx = (act->mangle.offset - offset_of_ip6_daddr) / 4;
dest = &data->v6.dst_addr.s6_addr32[idx];
}
if (dest)
memcpy(dest, &act->mangle.val, sizeof(u32));

return 0;
}
Expand Down Expand Up @@ -444,32 +447,41 @@ mtk_flow_offload_stats(struct mtk_eth *eth, struct flow_cls_offload *f)
return 0;
}

static DEFINE_MUTEX(mtk_flow_offload_mutex);

static int
mtk_eth_setup_tc_block_cb(enum tc_setup_type type, void *type_data, void *cb_priv)
{
struct flow_cls_offload *cls = type_data;
struct net_device *dev = cb_priv;
struct mtk_mac *mac = netdev_priv(dev);
struct mtk_eth *eth = mac->hw;
int err;

if (!tc_can_offload(dev))
return -EOPNOTSUPP;

if (type != TC_SETUP_CLSFLOWER)
return -EOPNOTSUPP;

mutex_down(&mtk_flow_offload_mutex);
switch (cls->command) {
case FLOW_CLS_REPLACE:
return mtk_flow_offload_replace(eth, cls);
err = mtk_flow_offload_replace(eth, cls);
break;
case FLOW_CLS_DESTROY:
return mtk_flow_offload_destroy(eth, cls);
err = mtk_flow_offload_destroy(eth, cls);
break;
case FLOW_CLS_STATS:
return mtk_flow_offload_stats(eth, cls);
err = mtk_flow_offload_stats(eth, cls);
break;
default:
return -EOPNOTSUPP;
err = -EOPNOTSUPP;
break;
}
mutex_up(&mtk_flow_offload_mutex);

return 0;
return err;
}

static int
Expand Down