net/mlx5e: Approximate IPsec per-SA payload data bytes count

ConnectX devices lack ability to count payload data byte size which is
needed for SA to return to libreswan for rekeying.

As a solution let's approximate that by decreasing headers size from
total size counted by flow steering. The calculation doesn't take into
account any other headers which can be in the packet (e.g. IP extensions).

Fixes: 5a6cddb89b51 ("net/mlx5e: Update IPsec per SA packets/bytes count")
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
index 2a10428d820aef8eea61a53a1857d7c41869a7e1..3d274599015be1eae6c43eee38e5bbb29fb50b88 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
@@ -994,6 +994,7 @@ static void mlx5e_xfrm_update_stats(struct xfrm_state *x)
        u64 auth_packets = 0, auth_bytes = 0;
        u64 success_packets, success_bytes;
        u64 packets, bytes, lastuse;
+       size_t headers;
 
        lockdep_assert(lockdep_is_held(&x->lock) ||
                       lockdep_is_held(&dev_net(x->xso.real_dev)->xfrm.xfrm_cfg_mutex) ||
@@ -1026,9 +1027,20 @@ static void mlx5e_xfrm_update_stats(struct xfrm_state *x)
        mlx5_fc_query_cached(ipsec_rule->fc, &bytes, &packets, &lastuse);
        success_packets = packets - auth_packets - trailer_packets - replay_packets;
        x->curlft.packets += success_packets;
+       /* NIC counts all bytes passed through flow steering and doesn't have
+        * an ability to count payload data size which is needed for SA.
+        *
+        * To overcome HW limitestion, let's approximate the payload size
+        * by removing always available headers.
+        */
+       headers = sizeof(struct ethhdr);
+       if (sa_entry->attrs.family == AF_INET)
+               headers += sizeof(struct iphdr);
+       else
+               headers += sizeof(struct ipv6hdr);
 
        success_bytes = bytes - auth_bytes - trailer_bytes - replay_bytes;
-       x->curlft.bytes += success_bytes;
+       x->curlft.bytes += success_bytes - headers * success_packets;
 }
 
 static int mlx5e_xfrm_validate_policy(struct mlx5_core_dev *mdev,