From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 649AB42A68 for ; Fri, 5 May 2023 05:17:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4970840ED7; Fri, 5 May 2023 05:17:13 +0200 (CEST) Received: from mail-pl1-f227.google.com (mail-pl1-f227.google.com [209.85.214.227]) by mails.dpdk.org (Postfix) with ESMTP id 8548840ED7 for ; Fri, 5 May 2023 05:17:11 +0200 (CEST) Received: by mail-pl1-f227.google.com with SMTP id d9443c01a7336-1aaec9ad820so11636395ad.0 for ; Thu, 04 May 2023 20:17:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1683256630; x=1685848630; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=KBRAkKdSrj4PAPl0xsTIc33iQPl3UJyGkR4CZMHtYpY=; b=WfF+osrgo/pPJ1e974L7OTJa31p8T6GE6Lmrq/zcSMjAsWdmNVwMAmpTryNoZ3LRkX cHeIjSNIlfTbzCp8T8skX51MNztsXxsg38FsDjIYOKLNIwmKPF3SkHw90fBjm3bjWAm7 Q6pMLFDEUVr8RyZoFUvWA466vla39zVLw/WIQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683256630; x=1685848630; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KBRAkKdSrj4PAPl0xsTIc33iQPl3UJyGkR4CZMHtYpY=; b=Ohu56bAXiHhafXZL7tekDXjJKYdsEjYCZXEMER3fe7Es99j7KZ72F1bRyQHTdI9zLQ NVvPdbH9nL39PVheg2FCMooSSKHfKvdshNtItH9o0NPS0vDdpmH6il47TAWyNaS/xHM2 FEGIyFHKVv3FKd4iat+ECohITfO5zmmyiS5eT+DWNM88d35gmlmH3YZDIZBW675iw8+P yiRBkJlGY6LdDEDXsOsSekWIYD//YhKgQb2j7sjEU7TuCceLU0A998KUMcjS9xeDhVph m9FuZ1FFpyqpbDpFZlTMFVbNQe6GQpXPVdWmcJ+v5xY4tvKjyQ45lGNtO+2SxJ13nEnu XPAg== X-Gm-Message-State: AC+VfDwfaGrThXSsjubCUD8LKETfOZquDbu4L+AQHbNgBoMLyONmpGIB MPdnHn6uXa/JXCQOGOpYP7Fp9RbzOsFfIJxOjyx+TT2xWpbKGXhv93M6Ig== X-Google-Smtp-Source: ACHHUZ5AyucC8TKtNsyD48PWPQhzLmmUCgZyxL6wZpKmguebB2Y0FaWlQ18BPDtGImZSbLHvbUYKPJPVLVJM X-Received: by 2002:a17:902:9008:b0:1a9:90bc:c3c5 with SMTP id a8-20020a170902900800b001a990bcc3c5mr5300674plp.62.1683256630444; Thu, 04 May 2023 20:17:10 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id d21-20020a170902aa9500b001a6a09c556fsm8527plr.66.2023.05.04.20.17.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 May 2023 20:17:10 -0700 (PDT) X-Relaying-Domain: iol.unh.edu Date: Thu, 04 May 2023 20:17:10 -0700 (PDT) Message-ID: <64547536.170a0220.8aa66.0bdfSMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.17.0.2] (unknown [172.18.0.34]) by postal.iol.unh.edu (Postfix) with ESMTP id A4D5D605246B; Thu, 4 May 2023 23:17:09 -0400 (EDT) Subject: |WARNING| pw126686-126695 [PATCH] [v3, 11/11] net/bnxt: set RSS config based on RSS mode From: dpdklab@iol.unh.edu To: test-report@dpdk.org Cc: dpdk-test-reports@iol.unh.edu Content-Type: text/plain X-BeenThere: test-report@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: automatic DPDK test reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: test-report-bounces@dpdk.org Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/126686 _apply patch failure_ Submitter: Ajit Khaparde Date: Thursday, May 04 2023 17:36:12 Applied on: CommitID:d03446724972d2a1bb645ce7f3e64f5ef0203d61 Apply patch set 126686-126695 failed: Checking patch doc/guides/nics/features/bnxt.ini... Checking patch drivers/net/bnxt/bnxt.h... Hunk #5 succeeded at 675 (offset -7 lines). Hunk #6 succeeded at 685 (offset -7 lines). error: while searching for: #define BNXT_FLAGS2_PTP_ALARM_SCHEDULED BIT(1) #define BNXT_P5_PTP_TIMESYNC_ENABLED(bp) \ ((bp)->flags2 & BNXT_FLAGS2_PTP_TIMESYNC_ENABLED) #define BNXT_FLAGS2_TESTPMD_EN BIT(3) #define BNXT_TESTPMD_EN(bp) \ ((bp)->flags2 & BNXT_FLAGS2_TESTPMD_EN) uint16_t chip_num; error: patch failed: drivers/net/bnxt/bnxt.h:697 Hunk #8 succeeded at 712 (offset -10 lines). Hunk #9 succeeded at 723 (offset -10 lines). Hunk #10 succeeded at 753 (offset -10 lines). Hunk #11 succeeded at 867 (offset -10 lines). Hunk #12 succeeded at 900 (offset -10 lines). Hunk #13 succeeded at 992 (offset -10 lines). error: while searching for: int bnxt_dev_start_op(struct rte_eth_dev *eth_dev); int bnxt_dev_stop_op(struct rte_eth_dev *eth_dev); void bnxt_handle_vf_cfg_change(void *arg); struct tf *bnxt_get_tfp_session(struct bnxt *bp, enum bnxt_session_type type); #endif error: patch failed: drivers/net/bnxt/bnxt.h:1053 Checking patch drivers/net/bnxt/bnxt_ethdev.c... Checking patch drivers/net/bnxt/bnxt_filter.h... Checking patch drivers/net/bnxt/bnxt_flow.c... Checking patch drivers/net/bnxt/bnxt_hwrm.c... Hunk #3 succeeded at 856 (offset -3 lines). Hunk #4 succeeded at 894 (offset -3 lines). Hunk #5 succeeded at 952 (offset -3 lines). Hunk #6 succeeded at 1103 (offset -3 lines). Hunk #7 succeeded at 1948 (offset -6 lines). Hunk #8 succeeded at 2065 (offset -6 lines). Hunk #9 succeeded at 2296 (offset -6 lines). Hunk #10 succeeded at 2320 (offset -6 lines). Hunk #11 succeeded at 2409 (offset -6 lines). Hunk #12 succeeded at 2983 (offset -6 lines). Hunk #13 succeeded at 4068 (offset -6 lines). Checking patch drivers/net/bnxt/bnxt_hwrm.h... Checking patch drivers/net/bnxt/bnxt_ring.c... Checking patch drivers/net/bnxt/bnxt_rxq.c... Checking patch drivers/net/bnxt/bnxt_rxr.c... Checking patch drivers/net/bnxt/bnxt_txq.c... Checking patch drivers/net/bnxt/bnxt_txr.c... Checking patch drivers/net/bnxt/bnxt_txr.h... Checking patch drivers/net/bnxt/bnxt_vnic.c... Checking patch drivers/net/bnxt/bnxt_vnic.h... Checking patch drivers/net/bnxt/meson.build... Checking patch drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c... Checking patch drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.h... Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp.c... Hunk #1 succeeded at 76 (offset -2 lines). Hunk #2 succeeded at 301 (offset -39 lines). Hunk #3 succeeded at 386 (offset -39 lines). Hunk #4 succeeded at 931 (offset -180 lines). error: while searching for: } bnxt_ulp_cntxt_num_shared_clients_set(bp->ulp_ctx, true); /* Open the ulp session. */ rc = ulp_ctx_session_open(bp, session); if (rc) error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.c:1055 error: while searching for: tfp->session = NULL; return rc; } bnxt_ulp_cntxt_tfp_set(bp->ulp_ctx, BNXT_ULP_SESSION_TYPE_DEFAULT, tfp); return rc; } error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.c:1181 Hunk #7 succeeded at 1308 (offset -207 lines). Hunk #8 succeeded at 1372 (offset -207 lines). Hunk #9 succeeded at 1467 (offset -207 lines). Hunk #10 succeeded at 1482 (offset -207 lines). Hunk #11 succeeded at 1600 (offset -207 lines). Hunk #12 succeeded at 1626 (offset -207 lines). Hunk #13 succeeded at 1637 (offset -207 lines). Hunk #14 succeeded at 1711 (offset -207 lines). Hunk #15 succeeded at 2127 (offset -225 lines). error: while searching for: return ulp->cfg_data->app_tun; } /* Function to convert ulp dev id to regular dev id. */ uint32_t bnxt_ulp_cntxt_convert_dev_id(uint32_t ulp_dev_id) error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.c:2306 error: while searching for: return type; } struct tf* bnxt_ulp_bp_tfp_get(struct bnxt *bp, enum bnxt_ulp_session_type type) { error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.c:2329 Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp.h... error: while searching for: struct tf* bnxt_ulp_bp_tfp_get(struct bnxt *bp, enum bnxt_ulp_session_type type); #endif /* _BNXT_ULP_H_ */ error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.h:386 Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c... Checking patch drivers/net/bnxt/tf_ulp/meson.build... Checking patch drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c... error: while searching for: ulp_fc_mgr_alarm_cb(void *arg) { int rc = 0; unsigned int j = 0; enum tf_dir i = 0; struct bnxt_ulp_context *ctxt; struct bnxt_ulp_fc_info *ulp_fc_info; struct bnxt_ulp_device_params *dparms; error: patch failed: drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c:438 error: while searching for: return; } tfp = bnxt_ulp_cntxt_tfp_get(ctxt, ulp_fc_info->sw_acc_tbl[i][j].session_type); if (!tfp) { BNXT_TF_DBG(ERR, "Failed to get the truflow pointer\n"); bnxt_ulp_cntxt_entry_release(); return; } /* * Take the fc_lock to ensure no flow is destroyed * during the bulk get error: patch failed: drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c:473 Hunk #3 succeeded at 654 (offset -5 lines). Checking patch drivers/net/bnxt/tf_ulp/ulp_gen_tbl.c... Checking patch drivers/net/bnxt/tf_ulp/ulp_gen_tbl.h... Checking patch drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c... Checking patch drivers/net/bnxt/tf_ulp/ulp_ha_mgr.h... Checking patch drivers/net/bnxt/tf_ulp/ulp_mapper.c... Hunk #1 succeeded at 146 (offset -3 lines). Hunk #2 succeeded at 206 (offset -6 lines). Hunk #3 succeeded at 436 (offset -6 lines). Hunk #4 succeeded at 529 (offset -6 lines). Hunk #5 succeeded at 581 (offset -6 lines). Hunk #6 succeeded at 698 (offset -6 lines). Hunk #7 succeeded at 876 (offset -12 lines). Hunk #8 succeeded at 972 (offset -12 lines). Hunk #9 succeeded at 1047 (offset -12 lines). Hunk #10 succeeded at 1087 (offset -12 lines). Hunk #11 succeeded at 1157 (offset -12 lines). Hunk #12 succeeded at 1305 (offset -12 lines). Hunk #13 succeeded at 1619 (offset -12 lines). Hunk #14 succeeded at 1939 (offset -12 lines). Hunk #15 succeeded at 2229 (offset -12 lines). Hunk #16 succeeded at 2607 (offset -12 lines). error: while searching for: if (shared) tfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx, tbl->session_type); rc = tf_set_tbl_entry(tfp, &sparms); if (rc) { BNXT_TF_DBG(ERR, error: patch failed: drivers/net/bnxt/tf_ulp/ulp_mapper.c:2651 Hunk #18 succeeded at 2720 (offset -13 lines). Hunk #19 succeeded at 2891 (offset -13 lines). Hunk #20 succeeded at 3000 (offset -13 lines). Hunk #21 succeeded at 3064 (offset -13 lines). Hunk #22 succeeded at 3080 (offset -13 lines). Hunk #23 succeeded at 3115 (offset -13 lines). error: while searching for: ulp_flow_db_shared_session_set(&fid_parms, tbl->session_type); rc = ulp_mapper_fdb_opc_process(parms, tbl, &fid_parms); if (rc) BNXT_TF_DBG(ERR, "Fail to add gen ent flowdb %d\n", rc); } return rc; } error: patch failed: drivers/net/bnxt/tf_ulp/ulp_mapper.c:3030 Hunk #25 succeeded at 3155 (offset -28 lines). Hunk #26 succeeded at 3165 (offset -28 lines). error: while searching for: return rc; } /* * Iterate over the shared resources assigned during tf_open_session and store * them in the global regfile with the shared flag. */ static int32_t ulp_mapper_app_glb_resource_info_init(struct bnxt_ulp_context *ulp_ctx, struct bnxt_ulp_mapper_data *mapper_data) { struct bnxt_ulp_glb_resource_info *glb_res; uint32_t num_glb_res_ids, idx, dev_id; uint8_t app_id; uint32_t rc = 0; glb_res = bnxt_ulp_app_glb_resource_info_list_get(&num_glb_res_ids); if (!glb_res || !num_glb_res_ids) { BNXT_TF_DBG(ERR, "Invalid Arguments\n"); return -EINVAL; } rc = bnxt_ulp_cntxt_dev_id_get(ulp_ctx, &dev_id); if (rc) { BNXT_TF_DBG(ERR, "Failed to get device_id for glb init (%d)\n", rc); return -EINVAL; } rc = bnxt_ulp_cntxt_app_id_get(ulp_ctx, &app_id); if (rc) { BNXT_TF_DBG(ERR, "Failed to get app_id for glb init (%d)\n", rc); return -EINVAL; } /* Iterate the global resources and process each one */ error: patch failed: drivers/net/bnxt/tf_ulp/ulp_mapper.c:3112 error: while searching for: rc = ulp_mapper_resource_ident_allocate(ulp_ctx, mapper_data, &glb_res[idx], false); break; case BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE: rc = ulp_mapper_resource_index_tbl_alloc(ulp_ctx, mapper_data, &glb_res[idx], false); break; default: BNXT_TF_DBG(ERR, "Global resource %x not supported\n", error: patch failed: drivers/net/bnxt/tf_ulp/ulp_mapper.c:3154 Hunk #29 succeeded at 4051 (offset -13 lines). Hunk #30 succeeded at 4112 (offset -13 lines). Hunk #31 succeeded at 4162 (offset -10 lines). Hunk #32 succeeded at 4385 (offset -10 lines). Checking patch drivers/net/bnxt/tf_ulp/ulp_mapper.h... Checking patch drivers/net/bnxt/tf_ulp/ulp_matcher.c... Checking patch drivers/net/bnxt/tf_ulp/ulp_port_db.c... Checking patch drivers/net/bnxt/tf_ulp/ulp_port_db.h... Hunk #1 succeeded at 326 (offset -2 lines). Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c... Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_parser.c... Hunk #2 succeeded at 195 (offset 4 lines). Hunk #3 succeeded at 232 (offset 4 lines). Hunk #4 succeeded at 257 (offset 4 lines). Hunk #5 succeeded at 330 (offset 4 lines). Hunk #6 succeeded at 452 (offset 4 lines). Hunk #7 succeeded at 583 (offset -1 lines). Hunk #8 succeeded at 598 (offset -1 lines). Hunk #9 succeeded at 608 (offset -1 lines). Hunk #10 succeeded at 658 (offset -1 lines). Hunk #11 succeeded at 705 (offset -1 lines). Hunk #12 succeeded at 727 (offset -1 lines). Hunk #13 succeeded at 881 (offset -1 lines). Hunk #14 succeeded at 920 (offset -1 lines). Hunk #15 succeeded at 949 (offset -1 lines). Hunk #16 succeeded at 978 (offset -1 lines). Hunk #17 succeeded at 986 (offset -1 lines). Hunk #18 succeeded at 1022 (offset -1 lines). Hunk #19 succeeded at 1066 (offset -1 lines). Hunk #20 succeeded at 1087 (offset -1 lines). Hunk #21 succeeded at 1114 (offset -1 lines). Hunk #22 succeeded at 1145 (offset -1 lines). Hunk #23 succeeded at 1161 (offset -1 lines). Hunk #24 succeeded at 1199 (offset -1 lines). Hunk #25 succeeded at 1336 (offset -1 lines). Hunk #26 succeeded at 1442 (offset -1 lines). Hunk #27 succeeded at 1461 (offset -1 lines). Hunk #28 succeeded at 1501 (offset -1 lines). Hunk #29 succeeded at 1705 (offset -1 lines). Hunk #30 succeeded at 1722 (offset -1 lines). Hunk #31 succeeded at 2361 (offset -1 lines). Hunk #32 succeeded at 2594 (offset -1 lines). Hunk #33 succeeded at 2671 (offset -1 lines). Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_parser.h... Applied patch doc/guides/nics/features/bnxt.ini cleanly. Applying patch drivers/net/bnxt/bnxt.h with 2 rejects... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Hunk #6 applied cleanly. Rejected hunk #7. Hunk #8 applied cleanly. Hunk #9 applied cleanly. Hunk #10 applied cleanly. Hunk #11 applied cleanly. Hunk #12 applied cleanly. Hunk #13 applied cleanly. Rejected hunk #14. Applied patch drivers/net/bnxt/bnxt_ethdev.c cleanly. Applied patch drivers/net/bnxt/bnxt_filter.h cleanly. Applied patch drivers/net/bnxt/bnxt_flow.c cleanly. Applied patch drivers/net/bnxt/bnxt_hwrm.c cleanly. Applied patch drivers/net/bnxt/bnxt_hwrm.h cleanly. Applied patch drivers/net/bnxt/bnxt_ring.c cleanly. Applied patch drivers/net/bnxt/bnxt_rxq.c cleanly. Applied patch drivers/net/bnxt/bnxt_rxr.c cleanly. Applied patch drivers/net/bnxt/bnxt_txq.c cleanly. Applied patch drivers/net/bnxt/bnxt_txr.c cleanly. Applied patch drivers/net/bnxt/bnxt_txr.h cleanly. Applied patch drivers/net/bnxt/bnxt_vnic.c cleanly. Applied patch drivers/net/bnxt/bnxt_vnic.h cleanly. Applied patch drivers/net/bnxt/meson.build cleanly. Applied patch drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c cleanly. Applied patch drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.h cleanly. Applying patch drivers/net/bnxt/tf_ulp/bnxt_ulp.c with 4 rejects... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Rejected hunk #5. Rejected hunk #6. Hunk #7 applied cleanly. Hunk #8 applied cleanly. Hunk #9 applied cleanly. Hunk #10 applied cleanly. Hunk #11 applied cleanly. Hunk #12 applied cleanly. Hunk #13 applied cleanly. Hunk #14 applied cleanly. Hunk #15 applied cleanly. Rejected hunk #16. Rejected hunk #17. Applying patch drivers/net/bnxt/tf_ulp/bnxt_ulp.h with 1 reject... Rejected hunk #1. Applied patch drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c cleanly. Applied patch drivers/net/bnxt/tf_ulp/meson.build cleanly. Applying patch drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c with 2 rejects... Rejected hunk #1. Rejected hunk #2. Hunk #3 applied cleanly. Applied patch drivers/net/bnxt/tf_ulp/ulp_gen_tbl.c cleanly. Applied patch drivers/net/bnxt/tf_ulp/ulp_gen_tbl.h cleanly. Applied patch drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c cleanly. Applied patch drivers/net/bnxt/tf_ulp/ulp_ha_mgr.h cleanly. Applying patch drivers/net/bnxt/tf_ulp/ulp_mapper.c with 4 rejects... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. 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. Hunk #13 applied cleanly. Hunk #14 applied cleanly. Hunk #15 applied cleanly. Hunk #16 applied cleanly. Rejected hunk #17. Hunk #18 applied cleanly. Hunk #19 applied cleanly. Hunk #20 applied cleanly. Hunk #21 applied cleanly. Hunk #22 applied cleanly. Hunk #23 applied cleanly. Rejected hunk #24. Hunk #25 applied cleanly. Hunk #26 applied cleanly. Rejected hunk #27. Rejected hunk #28. Hunk #29 applied cleanly. Hunk #30 applied cleanly. Hunk #31 applied cleanly. Hunk #32 applied cleanly. Applied patch drivers/net/bnxt/tf_ulp/ulp_mapper.h cleanly. Applied patch drivers/net/bnxt/tf_ulp/ulp_matcher.c cleanly. Applied patch drivers/net/bnxt/tf_ulp/ulp_port_db.c cleanly. Applied patch drivers/net/bnxt/tf_ulp/ulp_port_db.h cleanly. Applied patch drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c cleanly. Applied patch drivers/net/bnxt/tf_ulp/ulp_rte_parser.c cleanly. Applied patch drivers/net/bnxt/tf_ulp/ulp_rte_parser.h cleanly. hint: Use 'git am --show-current-patch' to see the failed patch diff a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h (rejected hunks) @@ -697,8 +700,8 @@ struct bnxt { #define BNXT_FLAGS2_PTP_ALARM_SCHEDULED BIT(1) #define BNXT_P5_PTP_TIMESYNC_ENABLED(bp) \ ((bp)->flags2 & BNXT_FLAGS2_PTP_TIMESYNC_ENABLED) -#define BNXT_FLAGS2_TESTPMD_EN BIT(3) -#define BNXT_TESTPMD_EN(bp) \ +#define BNXT_FLAGS2_TESTPMD_EN BIT(3) +#define BNXT_TESTPMD_EN(bp) \ ((bp)->flags2 & BNXT_FLAGS2_TESTPMD_EN) uint16_t chip_num; @@ -1053,5 +1065,6 @@ int bnxt_flow_ops_get_op(struct rte_eth_dev *dev, int bnxt_dev_start_op(struct rte_eth_dev *eth_dev); int bnxt_dev_stop_op(struct rte_eth_dev *eth_dev); void bnxt_handle_vf_cfg_change(void *arg); +struct bnxt_vnic_info *bnxt_get_default_vnic(struct bnxt *bp); struct tf *bnxt_get_tfp_session(struct bnxt *bp, enum bnxt_session_type type); #endif diff a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c (rejected hunks) @@ -1055,7 +1144,6 @@ ulp_ctx_init(struct bnxt *bp, } bnxt_ulp_cntxt_num_shared_clients_set(bp->ulp_ctx, true); - /* Open the ulp session. */ rc = ulp_ctx_session_open(bp, session); if (rc) @@ -1181,7 +1269,7 @@ ulp_ctx_attach(struct bnxt *bp, tfp->session = NULL; return rc; } - + tfp = bnxt_ulp_bp_tfp_get(bp, BNXT_ULP_SESSION_TYPE_DEFAULT); bnxt_ulp_cntxt_tfp_set(bp->ulp_ctx, BNXT_ULP_SESSION_TYPE_DEFAULT, tfp); return rc; } @@ -2306,6 +2496,13 @@ bnxt_ulp_cntxt_ptr2_app_tun_list_get(struct bnxt_ulp_context *ulp) return ulp->cfg_data->app_tun; } +/* Function to get the truflow app id. This defined in the build file */ +uint32_t +bnxt_ulp_default_app_id_get(void) +{ + return BNXT_TF_APP_ID; +} + /* Function to convert ulp dev id to regular dev id. */ uint32_t bnxt_ulp_cntxt_convert_dev_id(uint32_t ulp_dev_id) @@ -2329,6 +2526,53 @@ bnxt_ulp_cntxt_convert_dev_id(uint32_t ulp_dev_id) return type; } +/* This function sets the IF table index for the + * Application to poll to get the hot upgrade state and count details from + * the firmware. + */ +int32_t +bnxt_ulp_ha_reg_set(struct bnxt_ulp_context *ulp_ctx, + uint8_t state, uint8_t cnt) +{ + if (!ulp_ctx || !ulp_ctx->cfg_data) + return -EINVAL; + + if (ULP_MULTI_SHARED_IS_SUPPORTED(ulp_ctx)) { + ulp_ctx->cfg_data->hu_reg_state = state; + ulp_ctx->cfg_data->hu_reg_cnt = cnt; + } else { + ulp_ctx->cfg_data->hu_reg_state = ULP_HA_IF_TBL_IDX; + ulp_ctx->cfg_data->hu_reg_cnt = ULP_HA_CLIENT_CNT_IF_TBL_IDX; + } + return 0; +} + +/* This function gets the IF table index for the + * application to poll to get the application hot upgrade state from + * the firmware. + */ +uint32_t +bnxt_ulp_ha_reg_state_get(struct bnxt_ulp_context *ulp_ctx) +{ + if (!ulp_ctx || !ulp_ctx->cfg_data) + return 0; + + return (uint32_t)ulp_ctx->cfg_data->hu_reg_state; +} + +/* This function gets the IF table index for the + * Application to poll to get the application count from + * the firmware. + */ +uint32_t +bnxt_ulp_ha_reg_cnt_get(struct bnxt_ulp_context *ulp_ctx) +{ + if (!ulp_ctx || !ulp_ctx->cfg_data) + return 0; + + return (uint32_t)ulp_ctx->cfg_data->hu_reg_cnt; +} + struct tf* bnxt_ulp_bp_tfp_get(struct bnxt *bp, enum bnxt_ulp_session_type type) { diff a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h (rejected hunks) @@ -386,4 +386,5 @@ bnxt_ulp_ha_reg_cnt_get(struct bnxt_ulp_context *ulp_ctx); struct tf* bnxt_ulp_bp_tfp_get(struct bnxt *bp, enum bnxt_ulp_session_type type); + #endif /* _BNXT_ULP_H_ */ diff a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c (rejected hunks) @@ -438,8 +438,8 @@ void ulp_fc_mgr_alarm_cb(void *arg) { int rc = 0; - unsigned int j = 0; - enum tf_dir i = 0; + unsigned int j; + enum tf_dir i; struct bnxt_ulp_context *ctxt; struct bnxt_ulp_fc_info *ulp_fc_info; struct bnxt_ulp_device_params *dparms; @@ -473,14 +473,6 @@ ulp_fc_mgr_alarm_cb(void *arg) return; } - tfp = bnxt_ulp_cntxt_tfp_get(ctxt, - ulp_fc_info->sw_acc_tbl[i][j].session_type); - if (!tfp) { - BNXT_TF_DBG(ERR, "Failed to get the truflow pointer\n"); - bnxt_ulp_cntxt_entry_release(); - return; - } - /* * Take the fc_lock to ensure no flow is destroyed * during the bulk get diff a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c (rejected hunks) @@ -2651,7 +2724,6 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms, if (shared) tfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx, tbl->session_type); - rc = tf_set_tbl_entry(tfp, &sparms); if (rc) { BNXT_TF_DBG(ERR, @@ -3030,9 +3157,24 @@ ulp_mapper_gen_tbl_process(struct bnxt_ulp_mapper_parms *parms, ulp_flow_db_shared_session_set(&fid_parms, tbl->session_type); rc = ulp_mapper_fdb_opc_process(parms, tbl, &fid_parms); - if (rc) + if (rc) { BNXT_TF_DBG(ERR, "Fail to add gen ent flowdb %d\n", rc); + return rc; + } + + /* Reset the in-flight RID when generic table is written and the + * rid has been pushed into a handle (rid or fid). Once it has + * been written, we have persistent accounting of the resources. + */ + if (tbl->tbl_opcode == BNXT_ULP_GENERIC_TBL_OPC_WRITE && + (tbl->fdb_opcode == BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE || + tbl->fdb_opcode == BNXT_ULP_FDB_OPC_PUSH_FID)) + parms->rid = 0; + + rc = ulp_mapper_gen_tbl_ref_cnt_process(parms, tbl, + &gen_tbl_ent); } + return rc; } @@ -3112,36 +3453,33 @@ ulp_mapper_glb_resource_info_init(struct bnxt_ulp_context *ulp_ctx, return rc; } -/* - * Iterate over the shared resources assigned during tf_open_session and store - * them in the global regfile with the shared flag. - */ static int32_t ulp_mapper_app_glb_resource_info_init(struct bnxt_ulp_context *ulp_ctx, - struct bnxt_ulp_mapper_data *mapper_data) + struct bnxt_ulp_mapper_data *mapper_data) { struct bnxt_ulp_glb_resource_info *glb_res; uint32_t num_glb_res_ids, idx, dev_id; uint8_t app_id; - uint32_t rc = 0; + int32_t rc = 0; glb_res = bnxt_ulp_app_glb_resource_info_list_get(&num_glb_res_ids); if (!glb_res || !num_glb_res_ids) { BNXT_TF_DBG(ERR, "Invalid Arguments\n"); return -EINVAL; } + rc = bnxt_ulp_cntxt_dev_id_get(ulp_ctx, &dev_id); if (rc) { - BNXT_TF_DBG(ERR, "Failed to get device_id for glb init (%d)\n", + BNXT_TF_DBG(ERR, "Failed to get device id for glb init (%d)\n", rc); - return -EINVAL; + return rc; } rc = bnxt_ulp_cntxt_app_id_get(ulp_ctx, &app_id); if (rc) { - BNXT_TF_DBG(ERR, "Failed to get app_id for glb init (%d)\n", + BNXT_TF_DBG(ERR, "Failed to get app id for glb init (%d)\n", rc); - return -EINVAL; + return rc; } /* Iterate the global resources and process each one */ @@ -3154,13 +3492,13 @@ ulp_mapper_app_glb_resource_info_init(struct bnxt_ulp_context *ulp_ctx, rc = ulp_mapper_resource_ident_allocate(ulp_ctx, mapper_data, &glb_res[idx], - false); + true); break; case BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE: rc = ulp_mapper_resource_index_tbl_alloc(ulp_ctx, mapper_data, &glb_res[idx], - false); + true); break; default: BNXT_TF_DBG(ERR, "Global resource %x not supported\n", Checking patch doc/guides/nics/features/bnxt.ini... error: doc/guides/nics/features/bnxt.ini: does not match index Checking patch drivers/net/bnxt/bnxt.h... error: drivers/net/bnxt/bnxt.h: does not match index Checking patch drivers/net/bnxt/bnxt_ethdev.c... error: drivers/net/bnxt/bnxt_ethdev.c: does not match index Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp.c... error: drivers/net/bnxt/tf_ulp/bnxt_ulp.c: does not match index Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp.h... error: while searching for: unsigned int bnxt_ulp_vxlan_ip_port_get(struct bnxt_ulp_context *ulp_ctx); uint32_t bnxt_ulp_cntxt_convert_dev_id(uint32_t ulp_dev_id); error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.h:371 Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp_meter.c... Checking patch drivers/net/bnxt/tf_ulp/meson.build... error: drivers/net/bnxt/tf_ulp/meson.build: does not match index Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c... error: drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c: does not match index Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_parser.c... error: drivers/net/bnxt/tf_ulp/ulp_rte_parser.c: does not match index Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_parser.h... error: drivers/net/bnxt/tf_ulp/ulp_rte_parser.h: does not match index Applying patch drivers/net/bnxt/tf_ulp/bnxt_ulp.h with 1 reject... Rejected hunk #1. Applied patch drivers/net/bnxt/tf_ulp/bnxt_ulp_meter.c cleanly. hint: Use 'git am --show-current-patch' to see the failed patch diff a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h (rejected hunks) @@ -371,6 +371,9 @@ bnxt_ulp_vxlan_ip_port_set(struct bnxt_ulp_context *ulp_ctx, unsigned int bnxt_ulp_vxlan_ip_port_get(struct bnxt_ulp_context *ulp_ctx); +int32_t +bnxt_flow_meter_init(struct bnxt *bp); + uint32_t bnxt_ulp_cntxt_convert_dev_id(uint32_t ulp_dev_id); Checking patch drivers/net/bnxt/bnxt.h... error: drivers/net/bnxt/bnxt.h: does not match index Checking patch drivers/net/bnxt/bnxt_ethdev.c... error: drivers/net/bnxt/bnxt_ethdev.c: does not match index Checking patch drivers/net/bnxt/bnxt_hwrm.c... error: drivers/net/bnxt/bnxt_hwrm.c: does not match index Checking patch drivers/net/bnxt/bnxt_ring.c... error: drivers/net/bnxt/bnxt_ring.c: does not match index Checking patch drivers/net/bnxt/bnxt_rxr.c... error: drivers/net/bnxt/bnxt_rxr.c: does not match index Checking patch drivers/net/bnxt/bnxt_txq.c... error: drivers/net/bnxt/bnxt_txq.c: does not match index Checking patch drivers/net/bnxt/bnxt_txr.c... error: drivers/net/bnxt/bnxt_txr.c: does not match index Checking patch drivers/net/bnxt/bnxt_txr.h... error: drivers/net/bnxt/bnxt_txr.h: does not match index hint: Use 'git am --show-current-patch' to see the failed patch Checking patch drivers/net/bnxt/bnxt.h... error: drivers/net/bnxt/bnxt.h: does not match index Checking patch drivers/net/bnxt/bnxt_hwrm.c... error: drivers/net/bnxt/bnxt_hwrm.c: does not match index Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp.c... error: drivers/net/bnxt/tf_ulp/bnxt_ulp.c: does not match index Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp.h... error: while searching for: uint8_t bus; }; struct bnxt_ulp_session_state { STAILQ_ENTRY(bnxt_ulp_session_state) next; bool bnxt_ulp_init; pthread_mutex_t bnxt_ulp_mutex; struct bnxt_ulp_pci_info pci_info; struct bnxt_ulp_data *cfg_data; struct tf *g_tfp[BNXT_ULP_SESSION_MAX]; uint32_t session_opened[BNXT_ULP_SESSION_MAX]; error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.h:131 Applying patch drivers/net/bnxt/tf_ulp/bnxt_ulp.h with 1 reject... Rejected hunk #1. hint: Use 'git am --show-current-patch' to see the failed patch diff a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h (rejected hunks) @@ -131,11 +131,13 @@ struct bnxt_ulp_pci_info { uint8_t bus; }; +#define BNXT_ULP_DEVICE_SERIAL_NUM_SIZE 8 struct bnxt_ulp_session_state { STAILQ_ENTRY(bnxt_ulp_session_state) next; bool bnxt_ulp_init; pthread_mutex_t bnxt_ulp_mutex; struct bnxt_ulp_pci_info pci_info; + uint8_t dsn[BNXT_ULP_DEVICE_SERIAL_NUM_SIZE]; struct bnxt_ulp_data *cfg_data; struct tf *g_tfp[BNXT_ULP_SESSION_MAX]; uint32_t session_opened[BNXT_ULP_SESSION_MAX]; Checking patch .mailmap... Hunk #1 succeeded at 812 (offset -1 lines). Checking patch doc/guides/nics/features/bnxt.ini... error: doc/guides/nics/features/bnxt.ini: does not match index Checking patch drivers/net/bnxt/bnxt.h... error: drivers/net/bnxt/bnxt.h: does not match index Checking patch drivers/net/bnxt/bnxt_ethdev.c... error: drivers/net/bnxt/bnxt_ethdev.c: does not match index Checking patch drivers/net/bnxt/bnxt_hwrm.c... error: drivers/net/bnxt/bnxt_hwrm.c: does not match index Checking patch drivers/net/bnxt/bnxt_txr.c... error: drivers/net/bnxt/bnxt_txr.c: does not match index Checking patch drivers/net/bnxt/bnxt_vnic.c... error: drivers/net/bnxt/bnxt_vnic.c: does not match index Checking patch drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c... error: drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c: does not match index Checking patch drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.h... error: drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.h: does not match index Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp.c... error: drivers/net/bnxt/tf_ulp/bnxt_ulp.c: does not match index Checking patch drivers/net/bnxt/tf_ulp/bnxt_ulp.h... error: while searching for: struct bnxt_flow_app_tun_ent app_tun[BNXT_ULP_MAX_TUN_CACHE_ENTRIES]; uint32_t vxlan_port; uint32_t vxlan_ip_port; uint8_t hu_reg_state; uint8_t hu_reg_cnt; uint32_t hu_session_type; error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.h:113 error: while searching for: uint32_t vxlan_port); unsigned int bnxt_ulp_vxlan_port_get(struct bnxt_ulp_context *ulp_ctx); int bnxt_ulp_vxlan_ip_port_set(struct bnxt_ulp_context *ulp_ctx, uint32_t vxlan_ip_port); unsigned int bnxt_ulp_vxlan_ip_port_get(struct bnxt_ulp_context *ulp_ctx); int32_t bnxt_flow_meter_init(struct bnxt *bp); error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.h:367 error: while searching for: struct tf* bnxt_ulp_bp_tfp_get(struct bnxt *bp, enum bnxt_ulp_session_type type); #endif /* _BNXT_ULP_H_ */ error: patch failed: drivers/net/bnxt/tf_ulp/bnxt_ulp.h:391 Checking patch drivers/net/bnxt/tf_ulp/ulp_mapper.c... error: drivers/net/bnxt/tf_ulp/ulp_mapper.c: does not match index Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c... error: drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c: does not match index Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_parser.c... error: drivers/net/bnxt/tf_ulp/ulp_rte_parser.c: does not match index Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_parser.h... error: drivers/net/bnxt/tf_ulp/ulp_rte_parser.h: does not match index Checking patch drivers/net/bnxt/tf_ulp/ulp_template_struct.h... error: while searching for: uint8_t app_id; uint32_t vxlan_port; uint32_t vxlan_ip_port; enum bnxt_ulp_device_id device_id; uint32_t upgrade_fw_update; uint8_t ha_pool_id; error: patch failed: drivers/net/bnxt/tf_ulp/ulp_template_struct.h:364 Applied patch .mailmap cleanly. Applying patch drivers/net/bnxt/tf_ulp/bnxt_ulp.h with 3 rejects... Rejected hunk #1. Rejected hunk #2. Rejected hunk #3. Applying patch drivers/net/bnxt/tf_ulp/ulp_template_struct.h with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. hint: Use 'git am --show-current-patch' to see the failed patch diff a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h (rejected hunks) @@ -113,6 +113,7 @@ struct bnxt_ulp_data { struct bnxt_flow_app_tun_ent app_tun[BNXT_ULP_MAX_TUN_CACHE_ENTRIES]; uint32_t vxlan_port; uint32_t vxlan_ip_port; + uint32_t ecpri_udp_port; uint8_t hu_reg_state; uint8_t hu_reg_cnt; uint32_t hu_session_type; @@ -367,12 +368,19 @@ bnxt_ulp_vxlan_port_set(struct bnxt_ulp_context *ulp_ctx, uint32_t vxlan_port); unsigned int bnxt_ulp_vxlan_port_get(struct bnxt_ulp_context *ulp_ctx); + int bnxt_ulp_vxlan_ip_port_set(struct bnxt_ulp_context *ulp_ctx, uint32_t vxlan_ip_port); unsigned int bnxt_ulp_vxlan_ip_port_get(struct bnxt_ulp_context *ulp_ctx); +int +bnxt_ulp_ecpri_udp_port_set(struct bnxt_ulp_context *ulp_ctx, + uint32_t ecpri_udp_port); +unsigned int +bnxt_ulp_ecpri_udp_port_get(struct bnxt_ulp_context *ulp_ctx); + int32_t bnxt_flow_meter_init(struct bnxt *bp); @@ -391,5 +399,4 @@ bnxt_ulp_ha_reg_cnt_get(struct bnxt_ulp_context *ulp_ctx); struct tf* bnxt_ulp_bp_tfp_get(struct bnxt *bp, enum bnxt_ulp_session_type type); - #endif /* _BNXT_ULP_H_ */ diff a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h (rejected hunks) @@ -364,6 +365,7 @@ struct bnxt_ulp_app_capabilities_info { uint8_t app_id; uint32_t vxlan_port; uint32_t vxlan_ip_port; + uint32_t ecpri_udp_port; enum bnxt_ulp_device_id device_id; uint32_t upgrade_fw_update; uint8_t ha_pool_id; Checking patch drivers/net/bnxt/bnxt_hwrm.c... error: drivers/net/bnxt/bnxt_hwrm.c: does not match index hint: Use 'git am --show-current-patch' to see the failed patch https://lab.dpdk.org/results/dashboard/patchsets/26165/ UNH-IOL DPDK Community Lab