From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7C76FA0093 for ; Tue, 19 May 2020 14:59:33 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7574A1C1E4; Tue, 19 May 2020 14:59:33 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id C9DBE1D61A for ; Tue, 19 May 2020 14:59:31 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id k13so13717570wrx.3 for ; Tue, 19 May 2020 05:59:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QBJjYSGj4vMOZ8lrSOWEHs2QRucdsN00e2LS3S/lBgs=; b=b0TmkY4JtJKTAyS6Hk6SewTAOotoDFKUde8thF362GvCmnSIBRGm/57Izmm5a+ZLFQ K4qfUWQcOnmKsP0LFAuNM8fpFLQcbGlwQcJw4MKduxtljEbpA+8MmtVPupbc7JkCQ1KS b3tMaIhPAUTLNAGlmeQ1O7/vEHmAtNBBru6Bg1Y05c9hzcT8PBh/xXUFYIh5dZ7vwl9e tJqEyml/sqxdC9Qjx1JuYN/aPPDg1SPvje9rJ5SUWhvRWh2TiWRdvqp4SeWrkgMjymmN 8kEgA+akjcSOkyHSC5Czx7Tv0wFqAOFkKMUdOvyOgqfwSoxWfD4apEBzuhVTnzb/fq9g ZJiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QBJjYSGj4vMOZ8lrSOWEHs2QRucdsN00e2LS3S/lBgs=; b=qVwg85DlrCg7qm0QDdTiz1DsHNHMaj9x8tIU5g9pEFiw8xFRIAEqmkoEZEnEMUDnMe D9kvS0KNWyXPsSOSFe8o+3VDz9yi57twf6IY0yJEaA7tjT72nxMapTkA3qYkA+E1rXgI 5HIGt4MwLdB7CiTAQq7YMRA6kmelN0a7rvgUpRwWmm4ZH/aa1uySXQ75mIc8Yny9ScM/ xtGWAonFp8CGBnSvW0+UO2dKfsTcPb5TiKww70VPzTo/oWAH27xFa0qElal29YqkdkWM m41mFpUBRQo2LUTflo3fnEyB/YFfPn3+mMxreubTFOOgO+XpGoZPX3GV5jeBgalp4nMv g+xw== X-Gm-Message-State: AOAM530i6stZ6jZAEESTrs2WVKGmuxwuF3+4XL70loZ12Qw16aFjtHhA 3Dz+L1wIDo9DM6cAjylNHDM= X-Google-Smtp-Source: ABdhPJxrfaXZuHs+VA+Hr4gKxNkN3DdJT9zS12KGji+p9M210JVoSJ6vA/OcoThHf7S207z3MxwPCQ== X-Received: by 2002:adf:ea90:: with SMTP id s16mr25775818wrm.19.1589893171566; Tue, 19 May 2020 05:59:31 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id v11sm20916763wrv.53.2020.05.19.05.59.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:59:31 -0700 (PDT) From: luca.boccassi@gmail.com To: Igor Romanov Cc: Andrew Rybchenko , dpdk stable Date: Tue, 19 May 2020 13:53:48 +0100 Message-Id: <20200519125804.104349-38-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/sfc: fix promiscuous and allmulticast toggles errors' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. 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. Thanks. Luca Boccassi --- >From 8771074d951a6030d11633b963da6adec9ddcef9 Mon Sep 17 00:00:00 2001 From: Igor Romanov Date: Tue, 10 Mar 2020 09:42:09 +0000 Subject: [PATCH] net/sfc: fix promiscuous and allmulticast toggles errors [ upstream commit 7329b56f116881e745bd792f435bb4467d1d0abe ] Returned errors of ethdev callbacks are negative. Internal sfc functions return positive errors, so convert them to negative value. Fixes: 9039c8125730 ("ethdev: change promiscuous callbacks to return status") Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc_ethdev.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c index 098038fbc0..f8867b0ec0 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -405,25 +405,37 @@ sfc_dev_filter_set(struct rte_eth_dev *dev, enum sfc_dev_filter_mode mode, static int sfc_dev_promisc_enable(struct rte_eth_dev *dev) { - return sfc_dev_filter_set(dev, SFC_DEV_FILTER_MODE_PROMISC, B_TRUE); + int rc = sfc_dev_filter_set(dev, SFC_DEV_FILTER_MODE_PROMISC, B_TRUE); + + SFC_ASSERT(rc >= 0); + return -rc; } static int sfc_dev_promisc_disable(struct rte_eth_dev *dev) { - return sfc_dev_filter_set(dev, SFC_DEV_FILTER_MODE_PROMISC, B_FALSE); + int rc = sfc_dev_filter_set(dev, SFC_DEV_FILTER_MODE_PROMISC, B_FALSE); + + SFC_ASSERT(rc >= 0); + return -rc; } static int sfc_dev_allmulti_enable(struct rte_eth_dev *dev) { - return sfc_dev_filter_set(dev, SFC_DEV_FILTER_MODE_ALLMULTI, B_TRUE); + int rc = sfc_dev_filter_set(dev, SFC_DEV_FILTER_MODE_ALLMULTI, B_TRUE); + + SFC_ASSERT(rc >= 0); + return -rc; } static int sfc_dev_allmulti_disable(struct rte_eth_dev *dev) { - return sfc_dev_filter_set(dev, SFC_DEV_FILTER_MODE_ALLMULTI, B_FALSE); + int rc = sfc_dev_filter_set(dev, SFC_DEV_FILTER_MODE_ALLMULTI, B_FALSE); + + SFC_ASSERT(rc >= 0); + return -rc; } static int -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:20.389939262 +0100 +++ 0038-net-sfc-fix-promiscuous-and-allmulticast-toggles-err.patch 2020-05-19 13:56:18.239502179 +0100 @@ -1,14 +1,15 @@ -From 7329b56f116881e745bd792f435bb4467d1d0abe Mon Sep 17 00:00:00 2001 +From 8771074d951a6030d11633b963da6adec9ddcef9 Mon Sep 17 00:00:00 2001 From: Igor Romanov Date: Tue, 10 Mar 2020 09:42:09 +0000 Subject: [PATCH] net/sfc: fix promiscuous and allmulticast toggles errors +[ upstream commit 7329b56f116881e745bd792f435bb4467d1d0abe ] + Returned errors of ethdev callbacks are negative. Internal sfc functions return positive errors, so convert them to negative value. Fixes: 9039c8125730 ("ethdev: change promiscuous callbacks to return status") -Cc: stable@dpdk.org Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko