|WARNING| pw126140 [PATCH] [GRO] check whether ip_id continuity needs to be checked when two TCP packets are merged.

[dpdklab at iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/126140

_apply patch failure_

Submitter: jiangheng (G) <jiangheng14 at huawei.com>
Date: Saturday, April 15 2023 14:45:39 
Applied on: CommitID:3b3fef9de22af80d173453ab65a80b01ce38cbfd
Apply patch set 126140 failed:

Checking patch lib/gro/gro_tcp4.h...
error: while searching for:
       /* check if the two packets are neighbors */
       len = pkt_orig->pkt_len - l2_offset - pkt_orig->l2_len -
               pkt_orig->l3_len - tcp_hl_orig;
       if ((sent_seq == item->sent_seq + len) && (is_atomic ||
                               (ip_id == item->ip_id + 1)))
               /* append the new packet */
               return 1;
       else if ((sent_seq + tcp_dl == item->sent_seq) && (is_atomic ||
                               (ip_id + item->nb_merged == item->ip_id)))
               /* pre-pend the new packet */
               return -1;


error: patch failed: lib/gro/gro_tcp4.h:291
Applying patch lib/gro/gro_tcp4.h with 1 reject...
Rejected hunk #1.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/lib/gro/gro_tcp4.h b/lib/gro/gro_tcp4.h	(rejected hunks)
@@ -291,12 +291,10 @@ check_seq_option(struct gro_tcp4_item *item,
        /* check if the two packets are neighbors */
        len = pkt_orig->pkt_len - l2_offset - pkt_orig->l2_len -
                pkt_orig->l3_len - tcp_hl_orig;
-       if ((sent_seq == item->sent_seq + len) && (is_atomic ||
-                               (ip_id == item->ip_id + 1)))
+       if (sent_seq == item->sent_seq + len)
                /* append the new packet */
                return 1;
-       else if ((sent_seq + tcp_dl == item->sent_seq) && (is_atomic ||
-                               (ip_id + item->nb_merged == item->ip_id)))
+       else if (sent_seq + tcp_dl == item->sent_seq)
                /* pre-pend the new packet */
                return -1;


https://lab.dpdk.org/results/dashboard/patchsets/26008/

UNH-IOL DPDK Community Lab