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 A0F21A04DD for ; Wed, 28 Oct 2020 11:46:41 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 17C1BCA1C; Wed, 28 Oct 2020 11:46:35 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id EF4CFCA10 for ; Wed, 28 Oct 2020 11:46:33 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id n18so5148837wrs.5 for ; Wed, 28 Oct 2020 03:46:33 -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=C9tauQbOhEpKWRBbxmiM1RcGPSpQKhKLpHGvdnYK8YA=; b=VMenxm+1pQ7gLFPmV90toAF7flyqw0eEEXyjWYCM6ICRZTFTN2DHNBqat34iRYEq2Y I8sQxz1z4WSqPj31oYrDmD/7UzLxZ2tTIf6pLPgje5F2HtK2MdLCG/Z0O02Ppqtv0Q8p a8CGLsGdCxtsCMVhlxbK66TDeYe8RdRSUnwNqYOfKll3o06UPddwWdERosY2VdDLO8Yx VLorsr24aEmee3zCWG26WNXdMFd9GYCIkIBNrxaUEmLZq4qmaCkByojakSDtv+wWzir6 3XCM3PsT9xnymXlu0vmYB/YJBFMotrDXj36y2e6/4zTRBTNn9K4Hmq5mrpTSen5yr17A TGKg== 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=C9tauQbOhEpKWRBbxmiM1RcGPSpQKhKLpHGvdnYK8YA=; b=APMLoSZk+QkqXVKmZQ9A7l04Oc+vkUPP0BuyXXXCZstmqz6j0W5lOIRNQwM4zbk9Um Idv54yscdmTQaAUKVO3mfw54Cu1hQHL2VeKA6OcU/iP20o/gmRjq0ZzLw0Qra7nH7S2h xasxkuIXK8hOHAh0TnQmAcM+40kyfek/jNNsP/77XpYAzCRfylv7erDFPc6xhkHs9jp6 vMTXVUddf4gtE2ylyWVIXZUYGzw4pC9Dyijrdvfo5Dq3BePcDdYFG90BELWv+Ztu3aE7 cJApUFrljCq7sF6JIgxAAfsCpiYT3xI7Y1vNiKkmv15wVrVGHS4q5wZSVwohPnRUjuxK iEXQ== X-Gm-Message-State: AOAM533KpQeaJO/UIWn5lRmKXXOKZXRcy7MMitR15VH+5tcK4QMw8s/Y K10izSWySUq+7FYiziOWlnS0oPLtXs6bXQ== X-Google-Smtp-Source: ABdhPJyXMBqMGZ2l0QJ9zJG1EXeglI6G14GJNF2seP/TODhf+p2lfM1J285WCmvxjbmUGwhnNre+lg== X-Received: by 2002:adf:f78d:: with SMTP id q13mr8028411wrp.258.1603881992687; Wed, 28 Oct 2020 03:46:32 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l8sm6481383wrn.28.2020.10.28.03.46.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:46:31 -0700 (PDT) From: luca.boccassi@gmail.com To: Ciara Loftus Cc: Ferruh Yigit , dpdk stable Date: Wed, 28 Oct 2020 10:42:48 +0000 Message-Id: <20201028104606.3504127-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/af_xdp: change return value from Rx to unsigned' has been queued to stable release 19.11.6 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.6 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/30/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 1175785316109d499d62868f470a3e119335c09d Mon Sep 17 00:00:00 2001 From: Ciara Loftus Date: Fri, 7 Aug 2020 09:32:48 +0000 Subject: [PATCH] net/af_xdp: change return value from Rx to unsigned [ upstream commit 818129790fc45bc2082d0702918c2230725db2e5 ] The af_xdp rx function was returning a negative value on error, when an unsigned value is expected. Fix this. Fixes: d8a210774e1d ("net/af_xdp: support unaligned umem chunks") Signed-off-by: Ciara Loftus Acked-by: Ferruh Yigit --- drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c index f5fca63eb5..844cd9986c 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -237,7 +237,7 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) if (rte_pktmbuf_alloc_bulk(umem->mb_pool, fq_bufs, nb_pkts)) { AF_XDP_LOG(DEBUG, "Failed to get enough buffers for fq.\n"); - return -1; + return 0; } rcvd = xsk_ring_cons__peek(rx, nb_pkts, &idx_rx); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:12.069618727 +0000 +++ 0009-net-af_xdp-change-return-value-from-Rx-to-unsigned.patch 2020-10-28 10:35:11.400828492 +0000 @@ -1,13 +1,14 @@ -From 818129790fc45bc2082d0702918c2230725db2e5 Mon Sep 17 00:00:00 2001 +From 1175785316109d499d62868f470a3e119335c09d Mon Sep 17 00:00:00 2001 From: Ciara Loftus Date: Fri, 7 Aug 2020 09:32:48 +0000 Subject: [PATCH] net/af_xdp: change return value from Rx to unsigned +[ upstream commit 818129790fc45bc2082d0702918c2230725db2e5 ] + The af_xdp rx function was returning a negative value on error, when an unsigned value is expected. Fix this. Fixes: d8a210774e1d ("net/af_xdp: support unaligned umem chunks") -Cc: stable@dpdk.org Signed-off-by: Ciara Loftus Acked-by: Ferruh Yigit @@ -16,10 +17,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c -index 936d4a7d5f..7ce4ad04af 100644 +index f5fca63eb5..844cd9986c 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c -@@ -236,7 +236,7 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -237,7 +237,7 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) if (rte_pktmbuf_alloc_bulk(umem->mb_pool, fq_bufs, nb_pkts)) { AF_XDP_LOG(DEBUG, "Failed to get enough buffers for fq.\n");