Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/93901 _apply patch failure_ Submitter: Andrew Rybchenko Date: Friday, June 04 2021 14:42:25 Applied on: CommitID:175af25734f295874e31b33ccd0879e69fd152a9 Apply patch set 93901-93911 failed: Checking patch drivers/net/sfc/meson.build... Hunk #1 succeeded at 46 (offset -10 lines). Checking patch drivers/net/sfc/sfc.c... Hunk #1 succeeded at 23 (offset -1 lines). Hunk #2 succeeded at 593 (offset -44 lines). Hunk #3 succeeded at 630 (offset -44 lines). Hunk #4 succeeded at 852 (offset -48 lines). Hunk #5 succeeded at 871 (offset -48 lines). Checking patch drivers/net/sfc/sfc.h... error: while searching for: struct rte_mempool *mp; }; /* Adapter private data */ struct sfc_adapter { /* error: patch failed: drivers/net/sfc/sfc.h:217 Hunk #2 succeeded at 235 (offset -22 lines). Checking patch drivers/net/sfc/sfc_dp.h... Checking patch drivers/net/sfc/sfc_ef10.h... Checking patch drivers/net/sfc/sfc_ef100_rx.c... Checking patch drivers/net/sfc/sfc_ef100_tx.c... Checking patch drivers/net/sfc/sfc_ef10_essb_rx.c... Checking patch drivers/net/sfc/sfc_ef10_rx.c... Checking patch drivers/net/sfc/sfc_ef10_tx.c... Checking patch drivers/net/sfc/sfc_ethdev.c... Hunk #2 succeeded at 709 (offset -9 lines). Hunk #3 succeeded at 763 (offset -9 lines). Hunk #4 succeeded at 796 (offset -9 lines). Hunk #5 succeeded at 836 (offset -9 lines). Hunk #6 succeeded at 863 (offset -9 lines). Checking patch drivers/net/sfc/sfc_port.c... Checking patch drivers/net/sfc/sfc_rx.c... Hunk #1 succeeded at 128 (offset -10 lines). Checking patch drivers/net/sfc/sfc_sw_stats.c... Checking patch drivers/net/sfc/sfc_sw_stats.h... Checking patch drivers/net/sfc/sfc_tx.c... Hunk #1 succeeded at 914 (offset -66 lines). Applied patch drivers/net/sfc/meson.build cleanly. Applied patch drivers/net/sfc/sfc.c cleanly. Applying patch drivers/net/sfc/sfc.h with 1 reject... Rejected hunk #1. Hunk #2 applied cleanly. Applied patch drivers/net/sfc/sfc_dp.h cleanly. Applied patch drivers/net/sfc/sfc_ef10.h cleanly. Applied patch drivers/net/sfc/sfc_ef100_rx.c cleanly. Applied patch drivers/net/sfc/sfc_ef100_tx.c cleanly. Applied patch drivers/net/sfc/sfc_ef10_essb_rx.c cleanly. Applied patch drivers/net/sfc/sfc_ef10_rx.c cleanly. Applied patch drivers/net/sfc/sfc_ef10_tx.c cleanly. Applied patch drivers/net/sfc/sfc_ethdev.c cleanly. Applied patch drivers/net/sfc/sfc_port.c cleanly. Applied patch drivers/net/sfc/sfc_rx.c cleanly. Applied patch drivers/net/sfc/sfc_sw_stats.c cleanly. Applied patch drivers/net/sfc/sfc_sw_stats.h cleanly. Applied patch drivers/net/sfc/sfc_tx.c cleanly. diff a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h (rejected hunks) @@ -217,6 +217,14 @@ struct sfc_counter_rxq { struct rte_mempool *mp; }; +struct sfc_sw_xstats { + uint64_t *reset_vals; + + rte_spinlock_t queues_bitmap_lock; + void *queues_bitmap_mem; + struct rte_bitmap *queues_bitmap; +}; + /* Adapter private data */ struct sfc_adapter { /* https://lab.dpdk.org/results/dashboard/patchsets/17317/ UNH-IOL DPDK Community Lab