Add the following ethtool tx aggregation parameters: ETHTOOL_A_COALESCE_TX_AGGR_MAX_BYTES Maximum size in bytes of a tx aggregated block of frames. ETHTOOL_A_COALESCE_TX_AGGR_MAX_FRAMES Maximum number of frames that can be aggregated into a block. ETHTOOL_A_COALESCE_TX_AGGR_TIME_USECS Time in usecs after the first packet arrival in an aggregated block for the block to be sent.
Unified · Split
| @@ -1004,6 +1004,9 @@ Kernel response contents: · 1003 unmodified lines | ||
| 1004 | 1004 | ``ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL`` u32 rate sampling interval |
| 1005 | 1005 | ``ETHTOOL_A_COALESCE_USE_CQE_TX`` bool timer reset mode, Tx |
| 1006 | 1006 | ``ETHTOOL_A_COALESCE_USE_CQE_RX`` bool timer reset mode, Rx |
| 1007 | + ``ETHTOOL_A_COALESCE_TX_AGGR_MAX_BYTES`` u32 max aggr size, Tx | |
| 1008 | + ``ETHTOOL_A_COALESCE_TX_AGGR_MAX_FRAMES`` u32 max aggr packets, Tx | |
| 1009 | + ``ETHTOOL_A_COALESCE_TX_AGGR_TIME_USECS`` u32 time (us), aggr, Tx | |
| 1007 | 1010 | =========================================== ====== ======================= |
| 1008 | 1011 | |
| 1009 | 1012 | Attributes are only included in reply if their value is not zero or the |
| @@ -1022,6 +1025,17 @@ each packet event resets the timer. In this mode timer is used to force · 12 unmodified lines | ||
| 1022 | 1025 | the interrupt if queue goes idle, while busy queues depend on the packet |
| 1023 | 1026 | limit to trigger interrupts. |
| 1024 | 1027 | |
| 1028 | +Tx aggregation consists of copying frames into a contiguous buffer so that they | |
| 1029 | +can be submitted as a single IO operation. ``ETHTOOL_A_COALESCE_TX_AGGR_MAX_BYTES`` | |
| 1030 | +describes the maximum size in bytes for the submitted buffer. | |
| 1031 | +``ETHTOOL_A_COALESCE_TX_AGGR_MAX_FRAMES`` describes the maximum number of frames | |
| 1032 | +that can be aggregated into a single buffer. | |
| 1033 | +``ETHTOOL_A_COALESCE_TX_AGGR_TIME_USECS`` describes the amount of time in usecs, | |
| 1034 | +counted since the first packet arrival in an aggregated block, after which the | |
| 1035 | +block should be sent. | |
| 1036 | +This feature is mainly of interest for specific USB devices which does not cope | |
| 1037 | +well with frequent small-sized URBs transmissions. | |
| 1038 | + | |
| 1025 | 1039 | COALESCE_SET |
| 1026 | 1040 | ============ |
| 1027 | 1041 | |
| @@ -1055,6 +1069,9 @@ Request contents: · 27 unmodified lines | ||
| 1055 | 1069 | ``ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL`` u32 rate sampling interval |
| 1056 | 1070 | ``ETHTOOL_A_COALESCE_USE_CQE_TX`` bool timer reset mode, Tx |
| 1057 | 1071 | ``ETHTOOL_A_COALESCE_USE_CQE_RX`` bool timer reset mode, Rx |
| 1072 | + ``ETHTOOL_A_COALESCE_TX_AGGR_MAX_BYTES`` u32 max aggr size, Tx | |
| 1073 | + ``ETHTOOL_A_COALESCE_TX_AGGR_MAX_FRAMES`` u32 max aggr packets, Tx | |
| 1074 | + ``ETHTOOL_A_COALESCE_TX_AGGR_TIME_USECS`` u32 time (us), aggr, Tx | |
| 1058 | 1075 | =========================================== ====== ======================= |
| 1059 | 1076 | |
| 1060 | 1077 | Request is rejected if it attributes declared as unsupported by driver (i.e. |
| @@ -217,6 +217,9 @@ __ethtool_get_link_ksettings(struct net_device *dev, · 216 unmodified lines | ||
| 217 | 217 | struct kernel_ethtool_coalesce { |
| 218 | 218 | u8 use_cqe_mode_tx; |
| 219 | 219 | u8 use_cqe_mode_rx; |
| 220 | + u32 tx_aggr_max_bytes; | |
| 221 | + u32 tx_aggr_max_frames; | |
| 222 | + u32 tx_aggr_time_usecs; | |
| 220 | 223 | }; |
| 221 | 224 | |
| 222 | 225 | /** |
| @@ -260,7 +263,10 @@ bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32, · 37 unmodified lines | ||
| 260 | 263 | #define ETHTOOL_COALESCE_RATE_SAMPLE_INTERVAL BIT(21) |
| 261 | 264 | #define ETHTOOL_COALESCE_USE_CQE_RX BIT(22) |
| 262 | 265 | #define ETHTOOL_COALESCE_USE_CQE_TX BIT(23) |
| 263 | −#define ETHTOOL_COALESCE_ALL_PARAMS GENMASK(23, 0) | |
| 266 | +#define ETHTOOL_COALESCE_TX_AGGR_MAX_BYTES BIT(24) | |
| 267 | +#define ETHTOOL_COALESCE_TX_AGGR_MAX_FRAMES BIT(25) | |
| 268 | +#define ETHTOOL_COALESCE_TX_AGGR_TIME_USECS BIT(26) | |
| 269 | +#define ETHTOOL_COALESCE_ALL_PARAMS GENMASK(26, 0) | |
| 264 | 270 | |
| 265 | 271 | #define ETHTOOL_COALESCE_USECS \ |
| 266 | 272 | (ETHTOOL_COALESCE_RX_USECS | ETHTOOL_COALESCE_TX_USECS) |
| @@ -288,6 +294,10 @@ bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32, · 21 unmodified lines | ||
| 288 | 294 | ETHTOOL_COALESCE_RATE_SAMPLE_INTERVAL) |
| 289 | 295 | #define ETHTOOL_COALESCE_USE_CQE \ |
| 290 | 296 | (ETHTOOL_COALESCE_USE_CQE_RX | ETHTOOL_COALESCE_USE_CQE_TX) |
| 297 | +#define ETHTOOL_COALESCE_TX_AGGR \ | |
| 298 | + (ETHTOOL_COALESCE_TX_AGGR_MAX_BYTES | \ | |
| 299 | + ETHTOOL_COALESCE_TX_AGGR_MAX_FRAMES | \ | |
| 300 | + ETHTOOL_COALESCE_TX_AGGR_TIME_USECS) | |
| 291 | 301 | |
| 292 | 302 | #define ETHTOOL_STAT_NOT_SET (~0ULL) |
| 293 | 303 | |
| @@ -406,6 +406,9 @@ enum { · 405 unmodified lines | ||
| 406 | 406 | ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL, /* u32 */ |
| 407 | 407 | ETHTOOL_A_COALESCE_USE_CQE_MODE_TX, /* u8 */ |
| 408 | 408 | ETHTOOL_A_COALESCE_USE_CQE_MODE_RX, /* u8 */ |
| 409 | + ETHTOOL_A_COALESCE_TX_AGGR_MAX_BYTES, /* u32 */ | |
| 410 | + ETHTOOL_A_COALESCE_TX_AGGR_MAX_FRAMES, /* u32 */ | |
| 411 | + ETHTOOL_A_COALESCE_TX_AGGR_TIME_USECS, /* u32 */ | |
| 409 | 412 | |
| 410 | 413 | /* add new constants above here */ |
| 411 | 414 | __ETHTOOL_A_COALESCE_CNT, |
| @@ -105,7 +105,10 @@ static int coalesce_reply_size(const struct ethnl_req_info *req_base, · 104 unmodified lines | ||
| 105 | 105 | nla_total_size(sizeof(u32)) + /* _TX_MAX_FRAMES_HIGH */ |
| 106 | 106 | nla_total_size(sizeof(u32)) + /* _RATE_SAMPLE_INTERVAL */ |
| 107 | 107 | nla_total_size(sizeof(u8)) + /* _USE_CQE_MODE_TX */ |
| 108 | − nla_total_size(sizeof(u8)); /* _USE_CQE_MODE_RX */ | |
| 108 | + nla_total_size(sizeof(u8)) + /* _USE_CQE_MODE_RX */ | |
| 109 | + nla_total_size(sizeof(u32)) + /* _TX_AGGR_MAX_BYTES */ | |
| 110 | + nla_total_size(sizeof(u32)) + /* _TX_AGGR_MAX_FRAMES */ | |
| 111 | + nla_total_size(sizeof(u32)); /* _TX_AGGR_TIME_USECS */ | |
| 109 | 112 | } |
| 110 | 113 | |
| 111 | 114 | static bool coalesce_put_u32(struct sk_buff *skb, u16 attr_type, u32 val, |
| @@ -180,7 +183,13 @@ static int coalesce_fill_reply(struct sk_buff *skb, · 68 unmodified lines | ||
| 180 | 183 | coalesce_put_bool(skb, ETHTOOL_A_COALESCE_USE_CQE_MODE_TX, |
| 181 | 184 | kcoal->use_cqe_mode_tx, supported) || |
| 182 | 185 | coalesce_put_bool(skb, ETHTOOL_A_COALESCE_USE_CQE_MODE_RX, |
| 183 | − kcoal->use_cqe_mode_rx, supported)) | |
| 186 | + kcoal->use_cqe_mode_rx, supported) || | |
| 187 | + coalesce_put_u32(skb, ETHTOOL_A_COALESCE_TX_AGGR_MAX_BYTES, | |
| 188 | + kcoal->tx_aggr_max_bytes, supported) || | |
| 189 | + coalesce_put_u32(skb, ETHTOOL_A_COALESCE_TX_AGGR_MAX_FRAMES, | |
| 190 | + kcoal->tx_aggr_max_frames, supported) || | |
| 191 | + coalesce_put_u32(skb, ETHTOOL_A_COALESCE_TX_AGGR_TIME_USECS, | |
| 192 | + kcoal->tx_aggr_time_usecs, supported)) | |
| 184 | 193 | return -EMSGSIZE; |
| 185 | 194 | |
| 186 | 195 | return 0; |
| @@ -227,6 +236,9 @@ const struct nla_policy ethnl_coalesce_set_policy[] = { · 40 unmodified lines | ||
| 227 | 236 | [ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL] = { .type = NLA_U32 }, |
| 228 | 237 | [ETHTOOL_A_COALESCE_USE_CQE_MODE_TX] = NLA_POLICY_MAX(NLA_U8, 1), |
| 229 | 238 | [ETHTOOL_A_COALESCE_USE_CQE_MODE_RX] = NLA_POLICY_MAX(NLA_U8, 1), |
| 239 | + [ETHTOOL_A_COALESCE_TX_AGGR_MAX_BYTES] = { .type = NLA_U32 }, | |
| 240 | + [ETHTOOL_A_COALESCE_TX_AGGR_MAX_FRAMES] = { .type = NLA_U32 }, | |
| 241 | + [ETHTOOL_A_COALESCE_TX_AGGR_TIME_USECS] = { .type = NLA_U32 }, | |
| 230 | 242 | }; |
| 231 | 243 | |
| 232 | 244 | int ethnl_set_coalesce(struct sk_buff *skb, struct genl_info *info) |
| @@ -321,6 +333,12 @@ int ethnl_set_coalesce(struct sk_buff *skb, struct genl_info *info) · 88 unmodified lines | ||
| 321 | 333 | tb[ETHTOOL_A_COALESCE_USE_CQE_MODE_TX], &mod); |
| 322 | 334 | ethnl_update_u8(&kernel_coalesce.use_cqe_mode_rx, |
| 323 | 335 | tb[ETHTOOL_A_COALESCE_USE_CQE_MODE_RX], &mod); |
| 336 | + ethnl_update_u32(&kernel_coalesce.tx_aggr_max_bytes, | |
| 337 | + tb[ETHTOOL_A_COALESCE_TX_AGGR_MAX_BYTES], &mod); | |
| 338 | + ethnl_update_u32(&kernel_coalesce.tx_aggr_max_frames, | |
| 339 | + tb[ETHTOOL_A_COALESCE_TX_AGGR_MAX_FRAMES], &mod); | |
| 340 | + ethnl_update_u32(&kernel_coalesce.tx_aggr_time_usecs, | |
| 341 | + tb[ETHTOOL_A_COALESCE_TX_AGGR_TIME_USECS], &mod); | |
| 324 | 342 | ret = 0; |
| 325 | 343 | if (!mod) |
| 326 | 344 | goto out_ops; |