|WARNING| pw137647 [PATCH v2] net/cnxk: performance improvement for SW mbuf free

|WARNING| pw137647 [PATCH v2] net/cnxk: performance improvement for SW mbuf free

[qemudev]

Test-Label: loongarch-compilation
Test-Status: WARNING
http://dpdk.org/patch/137647

_apply patch failure_

Submitter: Rahul Bhansali <rbhansali@marvell.com>
Date: Fri, 1 Mar 2024 08:46:45 +0530
DPDK git baseline: Repo:dpdk
  Branch: main
  CommitID: 92c0ad70caf3ed6f4b93de6ddaf7bc369737c049

Apply patch set 137647 failed:

Checking patch doc/guides/rel_notes/release_24_03.rst...
error: while searching for:
  * Added support for ``RTE_FLOW_ITEM_TYPE_PPPOES`` flow item.
  * Added support for ``RTE_FLOW_ACTION_TYPE_SAMPLE`` flow item.
  * Added support for Rx inject.

* **Updated Marvell OCTEON EP driver.**


error: patch failed: doc/guides/rel_notes/release_24_03.rst:111
error: doc/guides/rel_notes/release_24_03.rst: patch does not apply
Checking patch drivers/event/cnxk/cn10k_tx_worker.h...
Checking patch drivers/event/cnxk/cn9k_worker.h...
Checking patch drivers/net/cnxk/cn10k_tx.h...
error: while searching for:
}
#endif

static __rte_always_inline uint64_t
cn10k_nix_prefree_seg(struct rte_mbuf *m, struct cn10k_eth_txq *txq,
		      struct nix_send_hdr_s *send_hdr, uint64_t *aura)
{
	struct rte_mbuf *prev = NULL;

error: patch failed: drivers/net/cnxk/cn10k_tx.h:733
error: drivers/net/cnxk/cn10k_tx.h: patch does not apply
Checking patch drivers/net/cnxk/cn9k_tx.h...
error: while searching for:
	}
}

static __rte_always_inline uint64_t
cn9k_nix_prefree_seg(struct rte_mbuf *m, struct cn9k_eth_txq *txq, struct nix_send_hdr_s *send_hdr,
		     uint64_t *aura)
{
	struct rte_mbuf *prev;
	uint32_t sqe_id;

	if (RTE_MBUF_HAS_EXTBUF(m)) {
		if (unlikely(txq->tx_compl.ena == 0)) {
			rte_pktmbuf_free_seg(m);
			return 1;
		}
		if (send_hdr->w0.pnc) {

error: patch failed: drivers/net/cnxk/cn9k_tx.h:82
error: drivers/net/cnxk/cn9k_tx.h: patch does not apply

|SUCCESS| pw137647 [PATCH v2] net/cnxk: performance improvement for SW mbuf free

[checkpatch]

Test-Label: checkpatch
Test-Status: SUCCESS
http://dpdk.org/patch/137647

_coding style OK_

|WARNING| pw137647 [PATCH] [v2] net/cnxk: performance improvement for SW mbuf free

[dpdklab]

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

_apply patch failure_

Submitter: Rahul Bhansali <rbhansali@marvell.com>
Date: Friday, March 01 2024 03:16:45 
Applied on: CommitID:5df34de5808a7b826b8bc035d6ee3161a12be364
Apply patch set 137647 failed:

Cloning the DPDK mirror at: https://github.com/DPDK/dpdk.git (Attempt 1 of 3)
Trying to checkout branch: main
Checked out to main (5df34de5808a7b826b8bc035d6ee3161a12be364)
Done: main commit 5df34de5808a7b826b8bc035d6ee3161a12be364
Trying to checkout branch: main
Checked out to main (5df34de5808a7b826b8bc035d6ee3161a12be364)
Applying patch...

Failed to apply patch:
Applying: net/cnxk: performance improvement for SW mbuf free
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_24_03.rst
M	drivers/net/cnxk/cn10k_tx.h
M	drivers/net/cnxk/cn9k_tx.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/cnxk/cn9k_tx.h
CONFLICT (content): Merge conflict in drivers/net/cnxk/cn9k_tx.h
Auto-merging drivers/net/cnxk/cn10k_tx.h
CONFLICT (content): Merge conflict in drivers/net/cnxk/cn10k_tx.h
Auto-merging doc/guides/rel_notes/release_24_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 net/cnxk: performance improvement for SW mbuf free
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


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

UNH-IOL DPDK Community Lab