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

_apply patch failure_

Submitter: Andrew Rybchenko <Andrew.Rybchenko@oktetlabs.ru>
Date: Thursday, October 21 2021 07:03:55 
Applied on: CommitID:3ac2dffae88e8eb5c374b1fdd40d605014526510
Apply patch set 102534 failed:

Checking patch doc/guides/rel_notes/release_21_11.rst...
error: while searching for:

  * Added port representors support on SN1000 SmartNICs
  * Added flow API transfer proxy support

* **Updated Marvell cnxk crypto PMD.**


error: patch failed: doc/guides/rel_notes/release_21_11.rst:158
Checking patch drivers/net/sfc/sfc_mae.h...
Hunk #1 succeeded at 117 (offset -10 lines).
error: while searching for:
	bool				use_credits;

	/* Information used by configuration routines */
	/** Counter service core ID */
	uint32_t			service_core_id;
	/** Counter service ID */
	uint32_t			service_id;
};

/**

error: patch failed: drivers/net/sfc/sfc_mae.h:143
Checking patch drivers/net/sfc/sfc_mae_counter.c...
Hunk #2 succeeded at 389 (offset -10 lines).
Hunk #3 succeeded at 414 (offset -10 lines).
Hunk #4 succeeded at 430 (offset -10 lines).
Hunk #5 succeeded at 442 (offset -10 lines).
Hunk #6 succeeded at 474 (offset -10 lines).
Hunk #7 succeeded at 533 (offset -10 lines).
Hunk #8 succeeded at 558 (offset -10 lines).
Hunk #9 succeeded at 809 (offset -10 lines).
Hunk #10 succeeded at 850 (offset -10 lines).
Applying patch doc/guides/rel_notes/release_21_11.rst with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/sfc/sfc_mae.h with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Applied patch drivers/net/sfc/sfc_mae_counter.c cleanly.
diff a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst	(rejected hunks)
@@ -158,6 +158,7 @@ New Features
 
   * Added port representors support on SN1000 SmartNICs
   * Added flow API transfer proxy support
+  * Added support for flow counters without service cores
 
 * **Updated Marvell cnxk crypto PMD.**
 
diff a/drivers/net/sfc/sfc_mae.h b/drivers/net/sfc/sfc_mae.h	(rejected hunks)
@@ -143,10 +150,21 @@ struct sfc_mae_counter_registry {
 	bool				use_credits;
 
 	/* Information used by configuration routines */
-	/** Counter service core ID */
-	uint32_t			service_core_id;
-	/** Counter service ID */
-	uint32_t			service_id;
+	enum sfc_mae_counter_polling_mode polling_mode;
+	union {
+		struct {
+			/** Counter service core ID */
+			uint32_t			core_id;
+			/** Counter service ID */
+			uint32_t			id;
+		} service;
+		struct {
+			/** Counter thread ID */
+			pthread_t			id;
+			/** The thread should keep running */
+			volatile bool			run;
+		} thread;
+	} polling;
 };
 
 /**

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

UNH-IOL DPDK Community Lab