Skip to content

Commit c7ef8f0

Browse files
committed
net: Add ESP offload features
This patch adds netdev features to configure IPsec offloads. Signed-off-by: Steffen Klassert <[email protected]>
1 parent f221dcd commit c7ef8f0

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

include/linux/netdev_features.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ enum {
5454
*/
5555
NETIF_F_GSO_TUNNEL_REMCSUM_BIT, /* ... TUNNEL with TSO & REMCSUM */
5656
NETIF_F_GSO_SCTP_BIT, /* ... SCTP fragmentation */
57+
NETIF_F_GSO_ESP_BIT, /* ... ESP with TSO */
5758
/**/NETIF_F_GSO_LAST = /* last bit, see GSO_MASK */
58-
NETIF_F_GSO_SCTP_BIT,
59+
NETIF_F_GSO_ESP_BIT,
5960

6061
NETIF_F_FCOE_CRC_BIT, /* FCoE CRC32 */
6162
NETIF_F_SCTP_CRC_BIT, /* SCTP checksum offload */
@@ -73,6 +74,8 @@ enum {
7374
NETIF_F_HW_L2FW_DOFFLOAD_BIT, /* Allow L2 Forwarding in Hardware */
7475

7576
NETIF_F_HW_TC_BIT, /* Offload TC infrastructure */
77+
NETIF_F_HW_ESP_BIT, /* Hardware ESP transformation offload */
78+
NETIF_F_HW_ESP_TX_CSUM_BIT, /* ESP with TX checksum offload */
7679

7780
/*
7881
* Add your fresh new feature above and remember to update
@@ -129,11 +132,14 @@ enum {
129132
#define NETIF_F_GSO_PARTIAL __NETIF_F(GSO_PARTIAL)
130133
#define NETIF_F_GSO_TUNNEL_REMCSUM __NETIF_F(GSO_TUNNEL_REMCSUM)
131134
#define NETIF_F_GSO_SCTP __NETIF_F(GSO_SCTP)
135+
#define NETIF_F_GSO_ESP __NETIF_F(GSO_ESP)
132136
#define NETIF_F_HW_VLAN_STAG_FILTER __NETIF_F(HW_VLAN_STAG_FILTER)
133137
#define NETIF_F_HW_VLAN_STAG_RX __NETIF_F(HW_VLAN_STAG_RX)
134138
#define NETIF_F_HW_VLAN_STAG_TX __NETIF_F(HW_VLAN_STAG_TX)
135139
#define NETIF_F_HW_L2FW_DOFFLOAD __NETIF_F(HW_L2FW_DOFFLOAD)
136140
#define NETIF_F_HW_TC __NETIF_F(HW_TC)
141+
#define NETIF_F_HW_ESP __NETIF_F(HW_ESP)
142+
#define NETIF_F_HW_ESP_TX_CSUM __NETIF_F(HW_ESP_TX_CSUM)
137143

138144
#define for_each_netdev_feature(mask_addr, bit) \
139145
for_each_set_bit(bit, (unsigned long *)mask_addr, NETDEV_FEATURE_COUNT)

include/linux/netdevice.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4070,6 +4070,7 @@ static inline bool net_gso_ok(netdev_features_t features, int gso_type)
40704070
BUILD_BUG_ON(SKB_GSO_PARTIAL != (NETIF_F_GSO_PARTIAL >> NETIF_F_GSO_SHIFT));
40714071
BUILD_BUG_ON(SKB_GSO_TUNNEL_REMCSUM != (NETIF_F_GSO_TUNNEL_REMCSUM >> NETIF_F_GSO_SHIFT));
40724072
BUILD_BUG_ON(SKB_GSO_SCTP != (NETIF_F_GSO_SCTP >> NETIF_F_GSO_SHIFT));
4073+
BUILD_BUG_ON(SKB_GSO_ESP != (NETIF_F_GSO_ESP >> NETIF_F_GSO_SHIFT));
40734074

40744075
return (features & feature) == feature;
40754076
}

include/linux/skbuff.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,8 @@ enum {
492492
SKB_GSO_TUNNEL_REMCSUM = 1 << 14,
493493

494494
SKB_GSO_SCTP = 1 << 15,
495+
496+
SKB_GSO_ESP = 1 << 16,
495497
};
496498

497499
#if BITS_PER_LONG > 32

net/core/ethtool.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ static const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN]
9090
[NETIF_F_GSO_UDP_TUNNEL_CSUM_BIT] = "tx-udp_tnl-csum-segmentation",
9191
[NETIF_F_GSO_PARTIAL_BIT] = "tx-gso-partial",
9292
[NETIF_F_GSO_SCTP_BIT] = "tx-sctp-segmentation",
93+
[NETIF_F_GSO_ESP_BIT] = "tx-esp-segmentation",
9394

9495
[NETIF_F_FCOE_CRC_BIT] = "tx-checksum-fcoe-crc",
9596
[NETIF_F_SCTP_CRC_BIT] = "tx-checksum-sctp",
@@ -103,6 +104,8 @@ static const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN]
103104
[NETIF_F_RXALL_BIT] = "rx-all",
104105
[NETIF_F_HW_L2FW_DOFFLOAD_BIT] = "l2-fwd-offload",
105106
[NETIF_F_HW_TC_BIT] = "hw-tc-offload",
107+
[NETIF_F_HW_ESP_BIT] = "esp-hw-offload",
108+
[NETIF_F_HW_ESP_TX_CSUM_BIT] = "esp-tx-csum-hw-offload",
106109
};
107110

108111
static const char

0 commit comments

Comments
 (0)