Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/117858 _apply patch failure_ Submitter: Andrew Boyer Date: Tuesday, October 11 2022 00:50:27 Applied on: CommitID:f13604fad12a81383da7b04821a4befb3d01e2ed Apply patch set 117858 failed: Checking patch drivers/net/ionic/ionic_ethdev.c... error: while searching for: /* Allocate memory for storing MAC addresses */ eth_dev->data->mac_addrs = rte_calloc("ionic", adapter->max_mac_addrs, RTE_ETHER_ADDR_LEN, 0); if (eth_dev->data->mac_addrs == NULL) { IONIC_PRINT(ERR, "Failed to allocate %u bytes needed to " "store MAC addresses", error: patch failed: drivers/net/ionic/ionic_ethdev.c:1005 error: while searching for: goto err; } adapter = rte_zmalloc("ionic", sizeof(*adapter), 0); if (!adapter) { IONIC_PRINT(ERR, "OOM"); err = -ENOMEM; error: patch failed: drivers/net/ionic/ionic_ethdev.c:1083 Checking patch drivers/net/ionic/ionic_lif.c... Hunk #1 succeeded at 626 (offset 28 lines). error: while searching for: return -ENOMEM; } lif->txqcqs = rte_calloc("ionic", adapter->max_ntxqs_per_lif, sizeof(*lif->txqcqs), 0); if (!lif->txqcqs) { IONIC_PRINT(ERR, "Cannot allocate tx queues array"); return -ENOMEM; } lif->rxqcqs = rte_calloc("ionic", adapter->max_nrxqs_per_lif, sizeof(*lif->rxqcqs), 0); if (!lif->rxqcqs) { IONIC_PRINT(ERR, "Cannot allocate rx queues array"); return -ENOMEM; error: patch failed: drivers/net/ionic/ionic_lif.c:1037 Checking patch drivers/net/ionic/ionic_rx_filter.c... Applying patch drivers/net/ionic/ionic_ethdev.c with 2 rejects... Rejected hunk #1. Rejected hunk #2. Applying patch drivers/net/ionic/ionic_lif.c with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Applied patch drivers/net/ionic/ionic_rx_filter.c cleanly. diff a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c (rejected hunks) @@ -1005,7 +1005,8 @@ eth_ionic_dev_init(struct rte_eth_dev *eth_dev, void *init_params) /* Allocate memory for storing MAC addresses */ eth_dev->data->mac_addrs = rte_calloc("ionic", adapter->max_mac_addrs, - RTE_ETHER_ADDR_LEN, 0); + RTE_ETHER_ADDR_LEN, + RTE_CACHE_LINE_SIZE); if (eth_dev->data->mac_addrs == NULL) { IONIC_PRINT(ERR, "Failed to allocate %u bytes needed to " "store MAC addresses", @@ -1083,7 +1084,7 @@ eth_ionic_dev_probe(void *bus_dev, struct rte_device *rte_dev, goto err; } - adapter = rte_zmalloc("ionic", sizeof(*adapter), 0); + adapter = rte_zmalloc("ionic", sizeof(*adapter), RTE_CACHE_LINE_SIZE); if (!adapter) { IONIC_PRINT(ERR, "OOM"); err = -ENOMEM; diff a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c (rejected hunks) @@ -1037,17 +1038,19 @@ ionic_lif_alloc(struct ionic_lif *lif) return -ENOMEM; } - lif->txqcqs = rte_calloc("ionic", + lif->txqcqs = rte_calloc_socket("ionic", adapter->max_ntxqs_per_lif, - sizeof(*lif->txqcqs), 0); + sizeof(*lif->txqcqs), + RTE_CACHE_LINE_SIZE, socket_id); if (!lif->txqcqs) { IONIC_PRINT(ERR, "Cannot allocate tx queues array"); return -ENOMEM; } - lif->rxqcqs = rte_calloc("ionic", + lif->rxqcqs = rte_calloc_socket("ionic", adapter->max_nrxqs_per_lif, - sizeof(*lif->rxqcqs), 0); + sizeof(*lif->rxqcqs), + RTE_CACHE_LINE_SIZE, socket_id); if (!lif->rxqcqs) { IONIC_PRINT(ERR, "Cannot allocate rx queues array"); return -ENOMEM; https://lab.dpdk.org/results/dashboard/patchsets/23899/ UNH-IOL DPDK Community Lab