bonding/xfrm: use real_dev instead of slave_dev
Subsystems (7)
PATCH 1/1 bonding/xfrm: use real_dev instead of slave_dev
Rather than requiring every hw crypto capable NIC driver to do a check for slave_dev being set, set real_dev in the xfrm layer and xso init time, and then override it in the bonding driver as needed. Then NIC drivers can always use real_dev, and at the same time, we eliminate the use of a variable name that probably shouldn't have been used in the first place, particularly given recent current events.
--- drivers/net/bonding/bond_main.c | 6 +-- .../net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 47 +++++-------------- .../mellanox/mlx5/core/en_accel/ipsec.c | 10 +--- include/net/xfrm.h | 2 +- net/xfrm/xfrm_device.c | 5 +- 5 files changed, 21 insertions(+), 49 deletions(-)
drivers/net/bonding/bond_main.c +3 -3
@@ -386,7 +386,7 @@ static int bond_ipsec_add_sa(struct xfrm_state *xs)struct bonding *bond =netdev_priv (bond_dev);struct slave *slave =rtnl_dereference (bond->curr_active_slave); - xs->xso.slave_dev = slave->dev; + xs->xso.real_dev = slave->dev; bond->xs = xs; if (!(slave->dev->xfrmdev_ops
@@ -411,7 +411,7 @@ static void bond_ipsec_del_sa(struct xfrm_state *xs)if (!slave)return ; - xs->xso.slave_dev = slave->dev; + xs->xso.real_dev = slave->dev;if (!(slave->dev->xfrmdev_ops && slave->dev->xfrmdev_ops->xdo_dev_state_delete)) {
@@ -440,7 +440,7 @@ static bool bond_ipsec_offload_ok(struct sk_buff *skb, struct xfrm_state *xs)return false; } - xs->xso.slave_dev = slave_dev; + xs->xso.real_dev = slave_dev;return slave_dev->xfrmdev_ops->xdo_dev_offload_ok (skb, xs); }
drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c +12 -35
89 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c +2 -8
@@ -207,12 +207,9 @@ mlx5e_ipsec_build_accel_xfrm_attrs(struct mlx5e_ipsec_sa_entry *sa_entry,static inline int mlx5e_xfrm_validate_state (struct xfrm_state *x) { -struct net_device *netdev = x->xso.dev; +struct net_device *netdev = x->xso.real_dev;struct mlx5e_priv *priv; -if (x->xso.slave_dev) - netdev = x->xso.slave_dev; - priv =netdev_priv (netdev);if (x->props.aalgo !=SADB_AALG_NONE ) {
@@ -288,15 +285,12 @@ static inline int mlx5e_xfrm_validate_state(struct xfrm_state *x)static int mlx5e_xfrm_add_state (struct xfrm_state *x) {struct mlx5e_ipsec_sa_entry *sa_entry =NULL ; -struct net_device *netdev = x->xso.dev; +struct net_device *netdev = x->xso.real_dev;struct mlx5_accel_esp_xfrm_attrs attrs;struct mlx5e_priv *priv;unsigned int sa_handle;int err; -if (x->xso.slave_dev) - netdev = x->xso.slave_dev; - priv =netdev_priv (netdev); err =mlx5e_xfrm_validate_state (x);
include/net/xfrm.h +1 -1
@@ -127,7 +127,7 @@ struct xfrm_state_walk {struct xfrm_state_offload {struct net_device *dev; -struct net_device *slave_dev; +struct net_device *real_dev;unsigned long offload_handle;unsigned int num_exthdrs;u8 flags;
net/xfrm/xfrm_device.c +3 -2
@@ -120,8 +120,8 @@ struct sk_buff *validate_xmit_xfrm(struct sk_buff *skb, netdev_features_t featurif (xo->flags &XFRM_GRO || x->xso.flags &XFRM_OFFLOAD_INBOUND )return skb; -/* This skb was already validated on the master dev */ -if ((x->xso.dev != dev) && (x->xso.slave_dev == dev)) +/* This skb was already validated on the upper/virtual dev */ +if ((x->xso.dev != dev) && (x->xso.real_dev == dev))return skb;local_irq_save (flags);
@@ -259,6 +259,7 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x, } xso->dev = dev; + xso->real_dev = dev; xso->num_exthdrs =1 ; xso->flags = xuo->flags;
Signature · 1 line
2.20.1
From: Jarod Wilson <[email protected]>
Date: Tue, 23 Jun 2020 16:40:01 -0400
Quoted 7 lines
Rather than requiring every hw crypto capable NIC driver to do a check for
slave_devbeing set, setreal_devin the xfrm layer and xso init time, and then override it in the bonding driver as needed. Then NIC drivers can always usereal_dev, and at the same time, we eliminate the use of a variable name that probably shouldn't have been used in the first place, particularly given recent current events.
Quoted 14 lines
CC Boris Pismenny <[email protected]>CC Saeed Mahameed <[email protected]>CC Leon Romanovsky <[email protected]>CC Jay Vosburgh <[email protected]>CC Veaceslav Falico <[email protected]>CC Andy Gospodarek <[email protected]>CC "David S. Miller" <[email protected]>CC Jeff Kirsher <[email protected]>CC Jakub Kicinski <[email protected]>CC Steffen Klassert <[email protected]>CC Herbert Xu <[email protected]>Suggested-by Saeed Mahameed <[email protected]>Signed-off-by Jarod Wilson <[email protected]>
Yes this is much nicer.
Applied, thank you.