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 9D67FA0C41 for ; Tue, 30 Nov 2021 17:42:30 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8FA7E41186; Tue, 30 Nov 2021 17:42:30 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id C976141170 for ; Tue, 30 Nov 2021 17:42:29 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id A8C473F1B1 for ; Tue, 30 Nov 2021 16:42:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290549; bh=r9VAGJX/KRAmfKwPsn3bnxuIyCFyRJPBytkCMzYZBYE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TK+aWbTIqa6wE4h/YAM53TOEyI+gX8/hFpBrpsosJzFeua4CX4UbuGPMOMvzo1W/r rTsyfrKTNhx7hLDHXTV/GY51SjCPe72ZlgQpw3FjbOa7YX/H4sSy/J3oPwYCPv9AZ3 63TFkUpJqgerb1yo21Nx2SUx29nqkb+eGNpIPJvojmK9nkUyX23zkX2F9y8vSKQDT3 TATQNgGDhC5gC+lQqeLJPeKdBAL5vlPwBnNzK+OKqUjjuKsOi3QN5h38bt7ncNmC27 gwOL6zj9TbPI7FX+5neIpWqP5oPCFgYKJsqPkSUpppdkoX8BdHX4gfIbwgBYhLQ4UB 89pn2oohZSkjw== Received: by mail-ed1-f72.google.com with SMTP id eg20-20020a056402289400b003eb56fcf6easo17390483edb.20 for ; Tue, 30 Nov 2021 08:42:29 -0800 (PST) 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=r9VAGJX/KRAmfKwPsn3bnxuIyCFyRJPBytkCMzYZBYE=; b=VQ0wja20nhIGyvPGy+6sy5lbu4oejuI8qmHNlMzzcxbc62bj9ydwUmbZe+gDRf3rlq uwbGRjeKHkDYPSame9g7kQIqVryZimu1x/4JaKRrcbFMesf/WGsWas/LD6BDX54Madu5 rXOp/+H6qio/QubOz4rRM/zwzIOJGMXCdvlnTCoBDBcvpWJBY4FPH+6aO0teu1RZJcML FEQ8xYtS4vSXxFXmHu9zmGH2u6/45kO+zjiB4MxmpVP8Ns5Ch4FchrO7XtOFcfhQvLap rIU+HsdG7tjuDpFNKGOLA7F2JlJU31E1KaniMuF2viLdwM9NZHjUNQXTHvTu8nRZ1VSI hSkw== X-Gm-Message-State: AOAM5315qAlNjRah3yXHRmf7dca1pQusqM9vaXuBMyVXUTDmraRt+zkB ZicC1/1vIGOpYZTxv1JvsWs/Gz1uH/QjPngCD3lN51otSijPuL4TeXU502TfPee4LSwTb8RQX5C XMaUJ3RH7LuRT/YXk9JVStYHi X-Received: by 2002:a05:6402:354c:: with SMTP id f12mr124898edd.256.1638290548937; Tue, 30 Nov 2021 08:42:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJznt3xUGqOb+3x6uEOm0nR50Yc9BqwukNky48WS7dYmRnj9hOXaA5Ovq7ScLQpDQkeJN9zRfQ== X-Received: by 2002:a05:6402:354c:: with SMTP id f12mr124867edd.256.1638290548728; Tue, 30 Nov 2021 08:42:28 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id r25sm11515299edt.21.2021.11.30.08.42.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:42:28 -0800 (PST) From: christian.ehrhardt@canonical.com To: Chengwen Feng Cc: Min Hu , Ferruh Yigit , dpdk stable Subject: patch 'kni: check error code of allmulticast mode switch' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:35:27 +0100 Message-Id: <20211130163605.2460997-123-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.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 Hi, FYI, your patch has been queued to stable release 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/ed7ba187204a84afa475da658ab0573b28fbc3d2 Thanks. Christian Ehrhardt --- >From ed7ba187204a84afa475da658ab0573b28fbc3d2 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 23 Apr 2021 16:12:42 +0800 Subject: [PATCH] kni: check error code of allmulticast mode switch [ upstream commit b1f4933ef320cfc9096101499b711d0dd65f2e51 ] Some drivers may return errcode when switch allmulticast mode, so it's necessary to check the return code. Fixes: b34801d1aa2e ("kni: support allmulticast mode set") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) Acked-by: Ferruh Yigit --- lib/librte_kni/rte_kni.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c index e96adc14b5..691bdd276b 100644 --- a/lib/librte_kni/rte_kni.c +++ b/lib/librte_kni/rte_kni.c @@ -514,6 +514,8 @@ kni_config_promiscusity(uint16_t port_id, uint8_t to_on) static int kni_config_allmulticast(uint16_t port_id, uint8_t to_on) { + int ret; + if (!rte_eth_dev_is_valid_port(port_id)) { RTE_LOG(ERR, KNI, "Invalid port id %d\n", port_id); return -EINVAL; @@ -523,11 +525,16 @@ kni_config_allmulticast(uint16_t port_id, uint8_t to_on) port_id, to_on); if (to_on) - rte_eth_allmulticast_enable(port_id); + ret = rte_eth_allmulticast_enable(port_id); else - rte_eth_allmulticast_disable(port_id); + ret = rte_eth_allmulticast_disable(port_id); + if (ret != 0) + RTE_LOG(ERR, KNI, + "Failed to %s allmulticast mode for port %u: %s\n", + to_on ? "enable" : "disable", port_id, + rte_strerror(-ret)); - return 0; + return ret; } int -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:13.138149194 +0100 +++ 0123-kni-check-error-code-of-allmulticast-mode-switch.patch 2021-11-30 16:50:05.954874733 +0100 @@ -1 +1 @@ -From b1f4933ef320cfc9096101499b711d0dd65f2e51 Mon Sep 17 00:00:00 2001 +From ed7ba187204a84afa475da658ab0573b28fbc3d2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b1f4933ef320cfc9096101499b711d0dd65f2e51 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - lib/kni/rte_kni.c | 13 ++++++++++--- + lib/librte_kni/rte_kni.c | 13 ++++++++++--- @@ -19,4 +20,4 @@ -diff --git a/lib/kni/rte_kni.c b/lib/kni/rte_kni.c -index d3e236005e..fc8f0e7b5a 100644 ---- a/lib/kni/rte_kni.c -+++ b/lib/kni/rte_kni.c +diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c +index e96adc14b5..691bdd276b 100644 +--- a/lib/librte_kni/rte_kni.c ++++ b/lib/librte_kni/rte_kni.c