Skip to content

Commit

Permalink
nfp: flower: update nfp_tun_neigh structs
Browse files Browse the repository at this point in the history 
Prepare for more rework in following patches by updating
the existing nfp_neigh_structs. The update allows for
the same headers to be used for both old and new firmware,
with a slight length adjustment when sending the control message
to the firmware.

Signed-off-by: Louis Peens <louis.peens@corigine.com>
Signed-off-by: Yinjun Zhang <yinjun.zhang@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Louis Peens authored and David S. Miller committed May 6, 2022
1 parent 9d5447e commit 9ee7c42
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 33 deletions.
50 changes: 29 additions & 21 deletions drivers/net/ethernet/netronome/nfp/flower/main.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,47 +111,55 @@ struct nfp_fl_tunnel_offloads {
};

/**
* struct nfp_tun_neigh - neighbour/route entry on the NFP
* @dst_ipv4: Destination IPv4 address
* @src_ipv4: Source IPv4 address
* struct nfp_tun_neigh - basic neighbour data
* @dst_addr: Destination MAC address
* @src_addr: Source MAC address
* @port_id: NFP port to output packet on - associated with source IPv4
* @vlan_tpid: VLAN_TPID match field
* @vlan_tci: VLAN_TCI match field
* @host_ctx: Host context ID to be saved here
*/
struct nfp_tun_neigh {
__be32 dst_ipv4;
__be32 src_ipv4;
u8 dst_addr[ETH_ALEN];
u8 src_addr[ETH_ALEN];
__be32 port_id;
};

/**
* struct nfp_tun_neigh_ext - extended neighbour data
* @vlan_tpid: VLAN_TPID match field
* @vlan_tci: VLAN_TCI match field
* @host_ctx: Host context ID to be saved here
*/
struct nfp_tun_neigh_ext {
__be16 vlan_tpid;
__be16 vlan_tci;
__be32 host_ctx;
};

/**
* struct nfp_tun_neigh_v6 - neighbour/route entry on the NFP
* struct nfp_tun_neigh_v4 - neighbour/route entry on the NFP for IPv4
* @dst_ipv4: Destination IPv4 address
* @src_ipv4: Source IPv4 address
* @common: Neighbour/route common info
* @ext: Neighbour/route extended info
*/
struct nfp_tun_neigh_v4 {
__be32 dst_ipv4;
__be32 src_ipv4;
struct nfp_tun_neigh common;
struct nfp_tun_neigh_ext ext;
};

/**
* struct nfp_tun_neigh_v6 - neighbour/route entry on the NFP for IPv6
* @dst_ipv6: Destination IPv6 address
* @src_ipv6: Source IPv6 address
* @dst_addr: Destination MAC address
* @src_addr: Source MAC address
* @port_id: NFP port to output packet on - associated with source IPv6
* @vlan_tpid: VLAN_TPID match field
* @vlan_tci: VLAN_TCI match field
* @host_ctx: Host context ID to be saved here
* @common: Neighbour/route common info
* @ext: Neighbour/route extended info
*/
struct nfp_tun_neigh_v6 {
struct in6_addr dst_ipv6;
struct in6_addr src_ipv6;
u8 dst_addr[ETH_ALEN];
u8 src_addr[ETH_ALEN];
__be32 port_id;
__be16 vlan_tpid;
__be16 vlan_tci;
__be32 host_ctx;
struct nfp_tun_neigh common;
struct nfp_tun_neigh_ext ext;
};

/**
Expand Down
30 changes: 18 additions & 12 deletions drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,15 @@ static int
nfp_flower_xmit_tun_conf(struct nfp_app *app, u8 mtype, u16 plen, void *pdata,
gfp_t flag)
{
struct nfp_flower_priv *priv = app->priv;
struct sk_buff *skb;
unsigned char *msg;

if (!(priv->flower_ext_feats & NFP_FL_FEATS_DECAP_V2) &&
(mtype == NFP_FLOWER_CMSG_TYPE_TUN_NEIGH ||
mtype == NFP_FLOWER_CMSG_TYPE_TUN_NEIGH_V6))
plen -= sizeof(struct nfp_tun_neigh_ext);

skb = nfp_flower_cmsg_alloc(app, plen, mtype, flag);
if (!skb)
return -ENOMEM;
Expand Down Expand Up @@ -416,14 +422,14 @@ static void
nfp_tun_write_neigh_v4(struct net_device *netdev, struct nfp_app *app,
struct flowi4 *flow, struct neighbour *neigh, gfp_t flag)
{
struct nfp_tun_neigh payload;
struct nfp_tun_neigh_v4 payload;
u32 port_id;

port_id = nfp_flower_get_port_id_from_netdev(app, netdev);
if (!port_id)
return;

memset(&payload, 0, sizeof(struct nfp_tun_neigh));
memset(&payload, 0, sizeof(struct nfp_tun_neigh_v4));
payload.dst_ipv4 = flow->daddr;

/* If entry has expired send dst IP with all other fields 0. */
Expand All @@ -436,15 +442,15 @@ nfp_tun_write_neigh_v4(struct net_device *netdev, struct nfp_app *app,

/* Have a valid neighbour so populate rest of entry. */
payload.src_ipv4 = flow->saddr;
ether_addr_copy(payload.src_addr, netdev->dev_addr);
neigh_ha_snapshot(payload.dst_addr, neigh, netdev);
payload.port_id = cpu_to_be32(port_id);
ether_addr_copy(payload.common.src_addr, netdev->dev_addr);
neigh_ha_snapshot(payload.common.dst_addr, neigh, netdev);
payload.common.port_id = cpu_to_be32(port_id);
/* Add destination of new route to NFP cache. */
nfp_tun_add_route_to_cache_v4(app, &payload.dst_ipv4);

send_msg:
nfp_flower_xmit_tun_conf(app, NFP_FLOWER_CMSG_TYPE_TUN_NEIGH,
sizeof(struct nfp_tun_neigh),
sizeof(struct nfp_tun_neigh_v4),
(unsigned char *)&payload, flag);
}

Expand Down Expand Up @@ -472,9 +478,9 @@ nfp_tun_write_neigh_v6(struct net_device *netdev, struct nfp_app *app,

/* Have a valid neighbour so populate rest of entry. */
payload.src_ipv6 = flow->saddr;
ether_addr_copy(payload.src_addr, netdev->dev_addr);
neigh_ha_snapshot(payload.dst_addr, neigh, netdev);
payload.port_id = cpu_to_be32(port_id);
ether_addr_copy(payload.common.src_addr, netdev->dev_addr);
neigh_ha_snapshot(payload.common.dst_addr, neigh, netdev);
payload.common.port_id = cpu_to_be32(port_id);
/* Add destination of new route to NFP cache. */
nfp_tun_add_route_to_cache_v6(app, &payload.dst_ipv6);

Expand Down Expand Up @@ -1372,7 +1378,7 @@ void nfp_tunnel_config_stop(struct nfp_app *app)
struct nfp_flower_priv *priv = app->priv;
struct nfp_ipv4_addr_entry *ip_entry;
struct nfp_tun_neigh_v6 ipv6_route;
struct nfp_tun_neigh ipv4_route;
struct nfp_tun_neigh_v4 ipv4_route;
struct list_head *ptr, *storage;

unregister_netevent_notifier(&priv->tun.neigh_nb);
Expand All @@ -1398,7 +1404,7 @@ void nfp_tunnel_config_stop(struct nfp_app *app)
kfree(route_entry);

nfp_flower_xmit_tun_conf(app, NFP_FLOWER_CMSG_TYPE_TUN_NEIGH,
sizeof(struct nfp_tun_neigh),
sizeof(struct nfp_tun_neigh_v4),
(unsigned char *)&ipv4_route,
GFP_KERNEL);
}
Expand All @@ -1412,7 +1418,7 @@ void nfp_tunnel_config_stop(struct nfp_app *app)
kfree(route_entry);

nfp_flower_xmit_tun_conf(app, NFP_FLOWER_CMSG_TYPE_TUN_NEIGH_V6,
sizeof(struct nfp_tun_neigh),
sizeof(struct nfp_tun_neigh_v6),
(unsigned char *)&ipv6_route,
GFP_KERNEL);
}
Expand Down

0 comments on commit 9ee7c42

Please sign in to comment.