Skip to content

Commit 41e880e

Browse files
pkitszelanguy11
pkitszel
authored and
anguy11
committed
ice: Extend PTYPE bitmap coverage for GTP encapsulated flows
Consolidate updates to the Protocol Type (PTYPE) bitmap definitions across multiple flow types in the Intel ICE driver to support GTP (GPRS Tunneling Protocol) encapsulated traffic. Enable improved Receive Side Scaling (RSS) configuration for both user and control plane GTP flows. Cover a wide range of protocol and encapsulation scenarios, including: - MAC OFOS and IL - IPv4 and IPv6 (OFOS, IL, ALL, no-L4) - TCP, SCTP, ICMP - GRE OF - GTPC (control plane) Expand the PTYPE bitmap entries to improve classification and distribution of GTP traffic across multiple queues, enhancing performance and scalability in mobile network environments. Co-developed-by: Dan Nowlin <[email protected]> Signed-off-by: Dan Nowlin <[email protected]> Co-developed-by: Qi Zhang <[email protected]> Signed-off-by: Qi Zhang <[email protected]> Co-developed-by: Jie Wang <[email protected]> Signed-off-by: Jie Wang <[email protected]> Co-developed-by: Junfeng Guo <[email protected]> Signed-off-by: Junfeng Guo <[email protected]> Signed-off-by: Przemek Kitszel <[email protected]> Reviewed-by: Jedrzej Jagielski <[email protected]> Reviewed-by: Simon Horman <[email protected]> Signed-off-by: Aleksandr Loktionov <[email protected]> Signed-off-by: Tony Nguyen <[email protected]>
1 parent f89e4e1 commit 41e880e

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

‎drivers/net/ethernet/intel/ice/ice_flow.c‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,9 @@ struct ice_flow_field_info ice_flds_info[ICE_FLOW_FIELD_IDX_MAX] = {
220220
*/
221221
static const u32 ice_ptypes_mac_ofos[] = {
222222
0xFDC00846, 0xBFBF7F7E, 0xF70001DF, 0xFEFDFDFB,
223-
0x0000077E, 0x00000000, 0x00000000, 0x00000000,
224-
0x00400000, 0x03FFF000, 0x7FFFFFE0, 0x00000000,
225-
0x00000000, 0x00000000, 0x00000000, 0x00000000,
223+
0x0000077E, 0x000003FF, 0x00000000, 0x00000000,
224+
0x00400000, 0x03FFF000, 0xFFFFFFE0, 0x00000707,
225+
0xFFFFF000, 0x000003FF, 0x00000000, 0x00000000,
226226
0x00000000, 0x00000000, 0x00000000, 0x00000000,
227227
0x00000000, 0x00000000, 0x00000000, 0x00000000,
228228
0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -245,10 +245,10 @@ static const u32 ice_ptypes_macvlan_il[] = {
245245
* include IPv4 other PTYPEs
246246
*/
247247
static const u32 ice_ptypes_ipv4_ofos[] = {
248-
0x1DC00000, 0x04000800, 0x00000000, 0x00000000,
248+
0x1D800000, 0xBFBF7800, 0x000001DF, 0x00000000,
249249
0x00000000, 0x00000155, 0x00000000, 0x00000000,
250-
0x00000000, 0x000FC000, 0x00000000, 0x00000000,
251-
0x00000000, 0x00000000, 0x00000000, 0x00000000,
250+
0x00000000, 0x000FC000, 0x000002A0, 0x00000000,
251+
0x00015000, 0x00000000, 0x00000000, 0x00000000,
252252
0x00000000, 0x00000000, 0x00000000, 0x00000000,
253253
0x00000000, 0x00000000, 0x00000000, 0x00000000,
254254
0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -259,10 +259,10 @@ static const u32 ice_ptypes_ipv4_ofos[] = {
259259
* IPv4 other PTYPEs
260260
*/
261261
static const u32 ice_ptypes_ipv4_ofos_all[] = {
262-
0x1DC00000, 0x04000800, 0x00000000, 0x00000000,
262+
0x1D800000, 0x27BF7800, 0x00000000, 0x00000000,
263263
0x00000000, 0x00000155, 0x00000000, 0x00000000,
264-
0x00000000, 0x000FC000, 0x83E0F800, 0x00000101,
265-
0x00000000, 0x00000000, 0x00000000, 0x00000000,
264+
0x00000000, 0x000FC000, 0x83E0FAA0, 0x00000101,
265+
0x3FFD5000, 0x00000000, 0x02FBEFBC, 0x00000000,
266266
0x00000000, 0x00000000, 0x00000000, 0x00000000,
267267
0x00000000, 0x00000000, 0x00000000, 0x00000000,
268268
0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -274,7 +274,7 @@ static const u32 ice_ptypes_ipv4_il[] = {
274274
0xE0000000, 0xB807700E, 0x80000003, 0xE01DC03B,
275275
0x0000000E, 0x00000000, 0x00000000, 0x00000000,
276276
0x00000000, 0x00000000, 0x001FF800, 0x00000000,
277-
0x00000000, 0x00000000, 0x00000000, 0x00000000,
277+
0xC0FC0000, 0x0000000F, 0xBC0BC0BC, 0x00000BC0,
278278
0x00000000, 0x00000000, 0x00000000, 0x00000000,
279279
0x00000000, 0x00000000, 0x00000000, 0x00000000,
280280
0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -285,10 +285,10 @@ static const u32 ice_ptypes_ipv4_il[] = {
285285
* include IPv6 other PTYPEs
286286
*/
287287
static const u32 ice_ptypes_ipv6_ofos[] = {
288-
0x00000000, 0x00000000, 0x77000000, 0x10002000,
288+
0x00000000, 0x00000000, 0x76000000, 0x10002000,
289289
0x00000000, 0x000002AA, 0x00000000, 0x00000000,
290-
0x00000000, 0x03F00000, 0x00000000, 0x00000000,
291-
0x00000000, 0x00000000, 0x00000000, 0x00000000,
290+
0x00000000, 0x03F00000, 0x00000540, 0x00000000,
291+
0x0002A000, 0x00000000, 0x00000000, 0x00000000,
292292
0x00000000, 0x00000000, 0x00000000, 0x00000000,
293293
0x00000000, 0x00000000, 0x00000000, 0x00000000,
294294
0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -299,10 +299,10 @@ static const u32 ice_ptypes_ipv6_ofos[] = {
299299
* IPv6 other PTYPEs
300300
*/
301301
static const u32 ice_ptypes_ipv6_ofos_all[] = {
302-
0x00000000, 0x00000000, 0x77000000, 0x10002000,
303-
0x00000000, 0x000002AA, 0x00000000, 0x00000000,
304-
0x00080F00, 0x03F00000, 0x7C1F0000, 0x00000206,
305-
0x00000000, 0x00000000, 0x00000000, 0x00000000,
302+
0x00000000, 0x00000000, 0x76000000, 0xFEFDE000,
303+
0x0000077E, 0x000002AA, 0x00000000, 0x00000000,
304+
0x00000000, 0x03F00000, 0x7C1F0540, 0x00000206,
305+
0xC002A000, 0x000003FF, 0xBC000000, 0x0002FBEF,
306306
0x00000000, 0x00000000, 0x00000000, 0x00000000,
307307
0x00000000, 0x00000000, 0x00000000, 0x00000000,
308308
0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -314,7 +314,7 @@ static const u32 ice_ptypes_ipv6_il[] = {
314314
0x00000000, 0x03B80770, 0x000001DC, 0x0EE00000,
315315
0x00000770, 0x00000000, 0x00000000, 0x00000000,
316316
0x00000000, 0x00000000, 0x7FE00000, 0x00000000,
317-
0x00000000, 0x00000000, 0x00000000, 0x00000000,
317+
0x3F000000, 0x000003F0, 0x02F02F00, 0x0002F02F,
318318
0x00000000, 0x00000000, 0x00000000, 0x00000000,
319319
0x00000000, 0x00000000, 0x00000000, 0x00000000,
320320
0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -387,8 +387,8 @@ static const u32 ice_ptypes_ipv6_il_no_l4[] = {
387387
static const u32 ice_ptypes_udp_il[] = {
388388
0x81000000, 0x20204040, 0x04000010, 0x80810102,
389389
0x00000040, 0x00000000, 0x00000000, 0x00000000,
390-
0x00000000, 0x00410000, 0x90842000, 0x00000007,
391-
0x00000000, 0x00000000, 0x00000000, 0x00000000,
390+
0x00000000, 0x00410000, 0x908427E0, 0x00000007,
391+
0x0413F000, 0x00000041, 0x10410410, 0x00004104,
392392
0x00000000, 0x00000000, 0x00000000, 0x00000000,
393393
0x00000000, 0x00000000, 0x00000000, 0x00000000,
394394
0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -400,7 +400,7 @@ static const u32 ice_ptypes_tcp_il[] = {
400400
0x04000000, 0x80810102, 0x10000040, 0x02040408,
401401
0x00000102, 0x00000000, 0x00000000, 0x00000000,
402402
0x00000000, 0x00820000, 0x21084000, 0x00000000,
403-
0x00000000, 0x00000000, 0x00000000, 0x00000000,
403+
0x08200000, 0x00000082, 0x20820820, 0x00008208,
404404
0x00000000, 0x00000000, 0x00000000, 0x00000000,
405405
0x00000000, 0x00000000, 0x00000000, 0x00000000,
406406
0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -412,7 +412,7 @@ static const u32 ice_ptypes_sctp_il[] = {
412412
0x08000000, 0x01020204, 0x20000081, 0x04080810,
413413
0x00000204, 0x00000000, 0x00000000, 0x00000000,
414414
0x00000000, 0x01040000, 0x00000000, 0x00000000,
415-
0x00000000, 0x00000000, 0x00000000, 0x00000000,
415+
0x10400000, 0x00000104, 0x00000000, 0x00000000,
416416
0x00000000, 0x00000000, 0x00000000, 0x00000000,
417417
0x00000000, 0x00000000, 0x00000000, 0x00000000,
418418
0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -436,7 +436,7 @@ static const u32 ice_ptypes_icmp_il[] = {
436436
0x00000000, 0x02040408, 0x40000102, 0x08101020,
437437
0x00000408, 0x00000000, 0x00000000, 0x00000000,
438438
0x00000000, 0x00000000, 0x42108000, 0x00000000,
439-
0x00000000, 0x00000000, 0x00000000, 0x00000000,
439+
0x20800000, 0x00000208, 0x00000000, 0x00000000,
440440
0x00000000, 0x00000000, 0x00000000, 0x00000000,
441441
0x00000000, 0x00000000, 0x00000000, 0x00000000,
442442
0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -448,7 +448,7 @@ static const u32 ice_ptypes_gre_of[] = {
448448
0x00000000, 0xBFBF7800, 0x000001DF, 0xFEFDE000,
449449
0x0000017E, 0x00000000, 0x00000000, 0x00000000,
450450
0x00000000, 0x00000000, 0x00000000, 0x00000000,
451-
0x00000000, 0x00000000, 0x00000000, 0x00000000,
451+
0x00000000, 0x00000000, 0xBEFBEFBC, 0x0002FBEF,
452452
0x00000000, 0x00000000, 0x00000000, 0x00000000,
453453
0x00000000, 0x00000000, 0x00000000, 0x00000000,
454454
0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -457,7 +457,7 @@ static const u32 ice_ptypes_gre_of[] = {
457457

458458
/* Packet types for packets with an Innermost/Last MAC header */
459459
static const u32 ice_ptypes_mac_il[] = {
460-
0x00000000, 0x00000000, 0x00000000, 0x00000000,
460+
0x00000000, 0x20000000, 0x00000000, 0x00000000,
461461
0x00000000, 0x00000000, 0x00000000, 0x00000000,
462462
0x00000000, 0x00000000, 0x00000000, 0x00000000,
463463
0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -471,7 +471,7 @@ static const u32 ice_ptypes_mac_il[] = {
471471
static const u32 ice_ptypes_gtpc[] = {
472472
0x00000000, 0x00000000, 0x00000000, 0x00000000,
473473
0x00000000, 0x00000000, 0x00000000, 0x00000000,
474-
0x00000000, 0x00000000, 0x00000180, 0x00000000,
474+
0x00000000, 0x00000000, 0x000001E0, 0x00000000,
475475
0x00000000, 0x00000000, 0x00000000, 0x00000000,
476476
0x00000000, 0x00000000, 0x00000000, 0x00000000,
477477
0x00000000, 0x00000000, 0x00000000, 0x00000000,

0 commit comments

Comments
 (0)