Message ID | 20241105192721.584822-1-tariqt@nvidia.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 4861333b42178fa3d8fd1bb4e2cfb2fedc968dba |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next,V2] bonding: add ESP offload features when slaves support | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Tue, 5 Nov 2024 21:27:21 +0200 you wrote: > From: Jianbo Liu <jianbol@nvidia.com> > > Add NETIF_F_GSO_ESP bit to bond's gso_partial_features if all slaves > support it, such that ESP segmentation is handled by hardware if possible. > > Signed-off-by: Jianbo Liu <jianbol@nvidia.com> > Reviewed-by: Boris Pismenny <borisp@nvidia.com> > Signed-off-by: Tariq Toukan <tariqt@nvidia.com> > > [...] Here is the summary with links: - [net-next,V2] bonding: add ESP offload features when slaves support https://git.kernel.org/netdev/net-next/c/4861333b4217 You are awesome, thank you!
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 5812e8eaccf1..9e8bdd0d0922 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1545,6 +1545,7 @@ static void bond_compute_features(struct bonding *bond) { unsigned int dst_release_flag = IFF_XMIT_DST_RELEASE | IFF_XMIT_DST_RELEASE_PERM; + netdev_features_t gso_partial_features = NETIF_F_GSO_ESP; netdev_features_t vlan_features = BOND_VLAN_FEATURES; netdev_features_t enc_features = BOND_ENC_FEATURES; #ifdef CONFIG_XFRM_OFFLOAD @@ -1577,6 +1578,9 @@ static void bond_compute_features(struct bonding *bond) BOND_XFRM_FEATURES); #endif /* CONFIG_XFRM_OFFLOAD */ + if (slave->dev->hw_enc_features & NETIF_F_GSO_PARTIAL) + gso_partial_features &= slave->dev->gso_partial_features; + mpls_features = netdev_increment_features(mpls_features, slave->dev->mpls_features, BOND_MPLS_FEATURES); @@ -1590,6 +1594,11 @@ static void bond_compute_features(struct bonding *bond) } bond_dev->hard_header_len = max_hard_header_len; + if (gso_partial_features & NETIF_F_GSO_ESP) + bond_dev->gso_partial_features |= NETIF_F_GSO_ESP; + else + bond_dev->gso_partial_features &= ~NETIF_F_GSO_ESP; + done: bond_dev->vlan_features = vlan_features; bond_dev->hw_enc_features = enc_features | NETIF_F_GSO_ENCAP_ALL |