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 7992AA0C45 for ; Fri, 3 Dec 2021 16:09:24 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7344E4067B; Fri, 3 Dec 2021 16:09:24 +0100 (CET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id 9A5EA4067B for ; Fri, 3 Dec 2021 16:09:23 +0100 (CET) Received: by mail-wm1-f49.google.com with SMTP id i8-20020a7bc948000000b0030db7b70b6bso5119381wml.1 for ; Fri, 03 Dec 2021 07:09:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DwiYzh/SeqZS8kKDdMOcuCjzMOX8jQVVx7LY24YvGYM=; b=LbehavLi5XUaabD4TUzg7ubJCKXskQx+rEYIv6E6V2kjYuo/Do31A+55A5+ePjvrxV FNNwnoLw7QErzUMrJGCuOm1+Shbc9zhAg5eC0y3MUQAHerg6yv9WWdxFK5p0EWQUE+nh 1TlU855PzQp+YU0oeuSDageRhqYdJdFBR+vfUujJj49fucJJFNcybkNmAoSWUEpXLzqD FHKuNhAhfEfmoJ2hZm1yEzfCUojs4t1UvmRJDHJrtKolcn+kANi3JVeIlHhmi22z72L+ TyBzYioziWs7IRUnAkmRnUWdsRbEPlv9uaZXsR8DIk0FcQ6PCDirIxH+RlrviMCaWui3 DUPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DwiYzh/SeqZS8kKDdMOcuCjzMOX8jQVVx7LY24YvGYM=; b=8JE+kgfOuhRhsm8wMVPRXK+eenO1w6PamHGyc1htyms290pFjDsZZImv6jbfytZ8hZ +khRHjoULwr8Pi/e1SU5ZRxkyX1dNTtf/xQn1kaF/CybloGUVHI/W/r+6cZeoRxDqg68 Mah+t8SIwsaKk0b8vzAqYAsOBsrO0pcrIss+pAlR3CxmIZ1mLRcmBkx5eW5ngcRty/Pq ATZ7AIFj9Ozv5Clhi956gXYM+7HWhgBacyX02k+tilGYIYL1C9TOjlwqm4+hRXE4MQHL 6Zunhp+5gWOgKZXDaq7BJ7vmggS5mZthtnD7ygpjFqZrK2qFF1DSZDF/T4UX0Abicq2C Bkcg== X-Gm-Message-State: AOAM531fGJD7CCzZOMBRXb7Y0zvBOG2+CXv2AM1k1E/6k7w+Qvv0lhV9 5nfdJe8tFscpn2GPcPsKvaDz5O/xLrzG9w== X-Google-Smtp-Source: ABdhPJzqMHU1JEU4xhI4xSWnPJsEchbeSwTvro6BP/3fXARcZt8hn0dp1Gd7vljDXvjTC12nl1telw== X-Received: by 2002:a05:600c:1e8d:: with SMTP id be13mr15573657wmb.79.1638544162990; Fri, 03 Dec 2021 07:09:22 -0800 (PST) Received: from DESKTOP-U5LNN3J.localdomain (89-79-181-52.dynamic.chello.pl. [89.79.181.52]) by smtp.gmail.com with ESMTPSA id h2sm2777232wrz.23.2021.12.03.07.09.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Dec 2021 07:09:22 -0800 (PST) From: Michal Krawczyk To: stable@dpdk.org Cc: christian.ehrhardt@canonical.com, Michal Krawczyk Subject: [PATCH 19.11 4/4] Revert "net/ena: trigger reset on Tx prepare failure" Date: Fri, 3 Dec 2021 16:08:59 +0100 Message-Id: <20211203150859.3933-4-mk@semihalf.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211203150859.3933-1-mk@semihalf.com> References: <20211203150859.3933-1-mk@semihalf.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org This reverts commit 91867d8536914374062693fd5fddc08ae267a41f. ENA Tx logic in the DPDK v19.11 is a bit different than the one from which the original commit was backported (DPDK v21.08). As calculations of the available ring size is not very precise, ena_com_prepare_tx() function can fail because the ring is full - it's not a fault in the current logic, so it shouldn't print error logs nor trigger the device reset. Signed-off-by: Michal Krawczyk --- drivers/net/ena/ena_ethdev.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 62c15f3c9..8f02ecde1 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -2533,12 +2533,7 @@ static uint16_t eth_ena_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, rc = ena_com_prepare_tx(tx_ring->ena_com_io_sq, &ena_tx_ctx, &nb_hw_desc); if (unlikely(rc)) { - PMD_DRV_LOG(ERR, - "Failed to prepare Tx buffers, rc: %d\n", rc); ++tx_ring->tx_stats.prepare_ctx_err; - tx_ring->adapter->reset_reason = - ENA_REGS_RESET_DRIVER_INVALID_STATE; - tx_ring->adapter->trigger_reset = true; break; } tx_info->tx_descs = nb_hw_desc; -- 2.25.1