|WARNING| pw128101 [PATCH] net/octeon_ep: rework transmit routine

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Vamsi Attunuru <vattunuru at marvell.com>
Date: Monday, June 05 2023 09:26:22 
Applied on: CommitID:abaa473297cf21cb81e5348185a7694ae2f221e7
Apply patch set 128101 failed:

Checking patch drivers/net/octeon_ep/otx_ep_common.h...
Hunk #1 succeeded at 30 (offset -7 lines).
Hunk #2 succeeded at 127 (offset -10 lines).
error: while searching for:
		     unsigned int socket_id);
int otx_ep_delete_oqs(struct otx_ep_device *otx_ep, uint32_t oq_no);

struct otx_ep_sg_entry {
	/** The first 64 bit gives the size of data in each dptr. */
	union {
		uint16_t size[4];
		uint64_t size64;
	} u;

	/** The 4 dptr pointers for this entry. */
	uint64_t ptr[4];
};

#define OTX_EP_SG_ENTRY_SIZE	(sizeof(struct otx_ep_sg_entry))

/** Structure of a node in list of gather components maintained by
 *  driver for each network device.
 */
struct otx_ep_gather {
	/** number of gather entries. */
	int num_sg;

	/** Gather component that can accommodate max sized fragment list
	 *  received from the IP layer.
	 */
	struct otx_ep_sg_entry *sg;
};

struct otx_ep_buf_free_info {
	struct rte_mbuf *mbuf;
	struct otx_ep_gather g;
};

#define OTX_EP_MAX_PKT_SZ 65498U
#define OTX_EP_MAX_MAC_ADDRS 1
#define OTX_EP_SG_ALIGN 8

error: patch failed: drivers/net/octeon_ep/otx_ep_common.h:516
Checking patch drivers/net/octeon_ep/otx_ep_rxtx.c...
Hunk #1 succeeded at 48 (offset -1 lines).
Hunk #2 succeeded at 56 (offset -1 lines).
error: while searching for:
{
	const struct otx_ep_config *conf;
	struct otx_ep_instr_queue *iq;
	uint32_t q_size;
	int ret;

	conf = otx_ep->conf;

error: patch failed: drivers/net/octeon_ep/otx_ep_rxtx.c:81
Hunk #4 succeeded at 125 (offset -3 lines).
Hunk #5 succeeded at 382 (offset -8 lines).
Hunk #6 succeeded at 402 (offset -8 lines).
Hunk #7 succeeded at 518 (offset -25 lines).
Hunk #8 succeeded at 594 (offset -25 lines).
Hunk #9 succeeded at 631 (offset -25 lines).
Hunk #10 succeeded at 651 (offset -25 lines).
Hunk #11 succeeded at 674 (offset -25 lines).
Hunk #12 succeeded at 710 (offset -25 lines).
Checking patch drivers/net/octeon_ep/otx_ep_rxtx.h...
Applying patch drivers/net/octeon_ep/otx_ep_common.h with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Applying patch drivers/net/octeon_ep/otx_ep_rxtx.c with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Hunk #8 applied cleanly.
Hunk #9 applied cleanly.
Hunk #10 applied cleanly.
Hunk #11 applied cleanly.
Hunk #12 applied cleanly.
Applied patch drivers/net/octeon_ep/otx_ep_rxtx.h cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/drivers/net/octeon_ep/otx_ep_common.h b/drivers/net/octeon_ep/otx_ep_common.h	(rejected hunks)
@@ -516,37 +549,6 @@ int otx_ep_setup_oqs(struct otx_ep_device *otx_ep, int oq_no, int num_descs,
 		     unsigned int socket_id);
 int otx_ep_delete_oqs(struct otx_ep_device *otx_ep, uint32_t oq_no);
 
-struct otx_ep_sg_entry {
-	/** The first 64 bit gives the size of data in each dptr. */
-	union {
-		uint16_t size[4];
-		uint64_t size64;
-	} u;
-
-	/** The 4 dptr pointers for this entry. */
-	uint64_t ptr[4];
-};
-
-#define OTX_EP_SG_ENTRY_SIZE	(sizeof(struct otx_ep_sg_entry))
-
-/** Structure of a node in list of gather components maintained by
- *  driver for each network device.
- */
-struct otx_ep_gather {
-	/** number of gather entries. */
-	int num_sg;
-
-	/** Gather component that can accommodate max sized fragment list
-	 *  received from the IP layer.
-	 */
-	struct otx_ep_sg_entry *sg;
-};
-
-struct otx_ep_buf_free_info {
-	struct rte_mbuf *mbuf;
-	struct otx_ep_gather g;
-};
-
 #define OTX_EP_MAX_PKT_SZ 65498U
 #define OTX_EP_MAX_MAC_ADDRS 1
 #define OTX_EP_SG_ALIGN 8
diff a/drivers/net/octeon_ep/otx_ep_rxtx.c b/drivers/net/octeon_ep/otx_ep_rxtx.c	(rejected hunks)
@@ -81,7 +87,8 @@ otx_ep_init_instr_queue(struct otx_ep_device *otx_ep, int iq_no, int num_descs,
 {
 	const struct otx_ep_config *conf;
 	struct otx_ep_instr_queue *iq;
-	uint32_t q_size;
+	struct otx_ep_sg_entry *sg;
+	uint32_t i, q_size;
 	int ret;
 
 	conf = otx_ep->conf;

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

UNH-IOL DPDK Community Lab