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 0CEEAA04DB for ; Tue, 17 Nov 2020 12:15:38 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 02C905913; Tue, 17 Nov 2020 12:15:37 +0100 (CET) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id CBD7CC8B2 for ; Tue, 17 Nov 2020 12:15:35 +0100 (CET) Received: by mail-wm1-f66.google.com with SMTP id 1so1353084wme.3 for ; Tue, 17 Nov 2020 03:15:35 -0800 (PST) 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=rdocXj2AfW8JwegZjtKKSS/Ih+0zXM/8EaYPXAfFCnM=; b=bO1NNIqFz3wVor0ISKNUj29qx3aeovlrqjORNf0fAHr2G/DA7frM/dXu6YgftMZ4Pm 3O5OvuRCytRIvZrMB7A0TWzdWsKBykamrf3gG7uz5gZGulVCiOQYz6d7E5vIsqDrVCRK CnP/NALELUnUbUMXdkt2jo4/3RMr1ddoWA/YPuVw011JwCsoO+P5AzTWtLOAG9u0GP1/ EHZzRcKpgIXvExrRcbQd1B+xaFDu9bLqfZVA0+XEuHv59yTA+DOtMAKN7Z/7FjbJ2c6r /YoUwPaQnYYYbCiGDNXHUmlRZuZW1MfBRplOuD3QXB+SbP2SSYJqmwWZXg7M4AL8M0wr w9MA== 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=rdocXj2AfW8JwegZjtKKSS/Ih+0zXM/8EaYPXAfFCnM=; b=huI0G4D2P3n4W9nS0Cjc1pwLBUPWz7fPLzv/C+0BKNZMQ+1XegYmu8e+j+GsmPuCXd eKWlkMNW0AKIztM21LPqc/pZxu/3A7xWmuFqTrks9oMWoquyfL6e5k1xwEBXbvVUCVYQ z5ammvUSbuI6v9vQ5z6Vptx7gP7yvvTVmMYRKW1mqm9gW28t1gN3ca6/cRSlFAjgAXir Qvl8VieTz7EPd+cGlzcGC54g6HDaJ+LlxbBWSyHc8pkGiCtNu7hDWVpeKbx9kb5YbKGW e51rR4KHHtSKnEZwOt1e4BC4+H9ZkkY0wIytDJqG5sRDjuT8671ofbWZjuNOeKDKQNIn 0KOQ== X-Gm-Message-State: AOAM533GgOTUtvgHcW4OG65MMkAg02uA0crDv8VNJLwE3GvNyc9ya7RE W4qMvTV6DhM2o5HHRtDvZ+2DEdD06U3rEOMg X-Google-Smtp-Source: ABdhPJwQkzYUht2K2MGJA6QvbGZUhp5ZL249m1RNZ9N6u+36OTwBrY/WrgPJ9EwJ0kFuAN0YVlD+xQ== X-Received: by 2002:a1c:5946:: with SMTP id n67mr3719069wmb.162.1605611734626; Tue, 17 Nov 2020 03:15:34 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id j71sm3284206wmj.10.2020.11.17.03.15.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 03:15:33 -0800 (PST) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: Ciara Loftus , dpdk stable Date: Tue, 17 Nov 2020 11:13:58 +0000 Message-Id: <20201117111416.1961049-24-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201117111416.1961049-1-luca.boccassi@gmail.com> References: <20201109185030.3478760-2-luca.boccassi@gmail.com> <20201117111416.1961049-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/af_xdp: fix pointer storage size' 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 11/19/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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/4fe71cc7c8eefecced26044eacc335519cb252de Thanks. Luca Boccassi --- >From 4fe71cc7c8eefecced26044eacc335519cb252de Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Mon, 9 Nov 2020 13:30:05 +0000 Subject: [PATCH] net/af_xdp: fix pointer storage size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 470b5c23adf2f4ec5aaece93c711048d84cd3eab ] 'uint64_t' is used to hold the pointer, for 32-bits build this assumption is wrong and giving following build error: rte_eth_af_xdp.c: In function ‘xdp_umem_configure’: rte_eth_af_xdp.c:970:15: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] 970 | base_addr = (void *)get_base_addr(mb_pool, &align); | ^ Replacing the 'uint64_t' return type of the 'get_base_addr()' to the 'uintptr_t'. Although not sure if the overall logic supports the 32-bits, using 'uintptr_t' should be safe both for 64/32 bits. Fixes: d8a210774e1d ("net/af_xdp: support unaligned umem chunks") Signed-off-by: Ferruh Yigit Tested-by: Ciara Loftus --- drivers/net/af_xdp/rte_eth_af_xdp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c index 6fab9aab78..e0089212bd 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -744,13 +744,13 @@ eth_link_update(struct rte_eth_dev *dev __rte_unused, } #if defined(XDP_UMEM_UNALIGNED_CHUNK_FLAG) -static inline uint64_t get_base_addr(struct rte_mempool *mp, uint64_t *align) +static inline uintptr_t get_base_addr(struct rte_mempool *mp, uint64_t *align) { struct rte_mempool_memhdr *memhdr; - uint64_t memhdr_addr, aligned_addr; + uintptr_t memhdr_addr, aligned_addr; memhdr = STAILQ_FIRST(&mp->mem_list); - memhdr_addr = (uint64_t)memhdr->addr; + memhdr_addr = (uintptr_t)memhdr->addr; aligned_addr = memhdr_addr & ~(getpagesize() - 1); *align = memhdr_addr - aligned_addr; -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-17 11:13:14.000012945 +0000 +++ 0024-net-af_xdp-fix-pointer-storage-size.patch 2020-11-17 11:13:12.921116609 +0000 @@ -1 +1 @@ -From 470b5c23adf2f4ec5aaece93c711048d84cd3eab Mon Sep 17 00:00:00 2001 +From 4fe71cc7c8eefecced26044eacc335519cb252de Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 470b5c23adf2f4ec5aaece93c711048d84cd3eab ] + @@ -25 +26,0 @@ -Cc: stable@dpdk.org @@ -34 +35 @@ -index 4076ff797c..2c7892bd7e 100644 +index 6fab9aab78..e0089212bd 100644 @@ -37 +38 @@ -@@ -910,13 +910,13 @@ eth_link_update(struct rte_eth_dev *dev __rte_unused, +@@ -744,13 +744,13 @@ eth_link_update(struct rte_eth_dev *dev __rte_unused,