From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 59F391E2F for ; Mon, 29 Oct 2018 13:53:45 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id g9-v6so8567659wrq.4 for ; Mon, 29 Oct 2018 05:53:45 -0700 (PDT) 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=MXazGCleNjWND+UFVlcUWGDCnv1XDHaUuPbqHnvCs2Y=; b=Q8Xn2NJLZmz6gMYAKTdX9T2DH2yS0wUHt/NJtw+MDe57r5MV2vg4jbyXzLiL9409Wo 7X3vODryghFFIaAOpHRzHpdpJhtFdzmtjY7rXZNBZbwLr/UlAnbKp7QLZwfvUwMQMexO AGXPyrgbW71+Wtoq1RlpZQyeHtkSiY038BnrFZ8O9Aydqrht27RKQi7wojQFgedBkTZJ GfJlOVu7Uc2MIUCcr52T5m2bi+BAQkpTqDzFCLDtqAlWeKKtWRPZJqDsA6VM0g0v63Le C3Y2iVsz8ThVLE1CYFspuAsx0+0W7sZXiwucnj2CCli6nwb7BkNgY3HJC0dmPkgdSBm9 /fWQ== X-Gm-Message-State: AGRZ1gI/duYmlyuknkJYzktfHA84Ii/U12pgYV1CwZYghdGy21mpuBum 31ydE9RkmDDF3UDnvayveUc= X-Google-Smtp-Source: AJdET5dNyknoDJNHtYo+mkvl0fJxIwL1F5aPtyiZcBsAiNL//E5OU6mDM5apaHEWagltLjKk8s2lrA== X-Received: by 2002:adf:91a6:: with SMTP id 35-v6mr14542256wri.37.1540817624799; Mon, 29 Oct 2018 05:53:44 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id t14-v6sm11391524wra.63.2018.10.29.05.53.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Oct 2018 05:53:43 -0700 (PDT) From: Luca Boccassi To: Luca Boccassi Cc: Wei Zhao , dpdk stable Date: Mon, 29 Oct 2018 12:53:10 +0000 Message-Id: <20181029125329.17729-1-bluca@debian.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181015115144.27626-1-bluca@debian.org> References: <20181015115144.27626-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/e1000: do not error out if Rx drop enable is set' has been queued to LTS release 16.11.9 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: , X-List-Received-Date: Mon, 29 Oct 2018 12:53:45 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/31/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Luca Boccassi --- >>From f1335e795d69004b68910181960daa71bed77d82 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 27 Jul 2018 18:26:07 +0100 Subject: [PATCH] net/e1000: do not error out if Rx drop enable is set [ upstream commit d7812ffd83588c724d2f291f2030c9994f9d1113 ] rx_drop_en is an optimization that does nothing on single-queue devices like e1000. Do not force applications that do not care to select per-devices optimizations flags by returning an error, just log it and carry on. Fixes: 805803445a02 ("e1000: support EM devices (also known as e1000/e1000e)") Signed-off-by: Luca Boccassi Acked-by: Wei Zhao --- drivers/net/e1000/em_rxtx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c index 41f51c0f7..371bb6202 100644 --- a/drivers/net/e1000/em_rxtx.c +++ b/drivers/net/e1000/em_rxtx.c @@ -1323,12 +1323,13 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev, } /* - * EM devices don't support drop_en functionality + * EM devices don't support drop_en functionality. + * It's an optimization that does nothing on single-queue devices, + * so just log the issue and carry on. */ if (rx_conf->rx_drop_en) { - PMD_INIT_LOG(ERR, "drop_en functionality not supported by " + PMD_INIT_LOG(NOTICE, "drop_en functionality not supported by " "device"); - return -EINVAL; } /* Free memory prior to re-allocation if needed. */ -- 2.19.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-10-29 12:48:14.494019792 +0000 +++ 0001-net-e1000-do-not-error-out-if-Rx-drop-enable-is-set.patch 2018-10-29 12:48:14.426417982 +0000 @@ -1,15 +1,16 @@ -From d7812ffd83588c724d2f291f2030c9994f9d1113 Mon Sep 17 00:00:00 2001 +From f1335e795d69004b68910181960daa71bed77d82 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 27 Jul 2018 18:26:07 +0100 Subject: [PATCH] net/e1000: do not error out if Rx drop enable is set +[ upstream commit d7812ffd83588c724d2f291f2030c9994f9d1113 ] + rx_drop_en is an optimization that does nothing on single-queue devices like e1000. Do not force applications that do not care to select per-devices optimizations flags by returning an error, just log it and carry on. Fixes: 805803445a02 ("e1000: support EM devices (also known as e1000/e1000e)") -Cc: stable@dpdk.org Signed-off-by: Luca Boccassi Acked-by: Wei Zhao @@ -18,10 +19,10 @@ 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c -index 087e68304..a9cd76518 100644 +index 41f51c0f7..371bb6202 100644 --- a/drivers/net/e1000/em_rxtx.c +++ b/drivers/net/e1000/em_rxtx.c -@@ -1417,12 +1417,13 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev, +@@ -1323,12 +1323,13 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev, } /*