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 BB1A9A0032 for ; Fri, 18 Feb 2022 13:41:33 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B624B40141; Fri, 18 Feb 2022 13:41:33 +0100 (CET) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mails.dpdk.org (Postfix) with ESMTP id 660B140E2D for ; Fri, 18 Feb 2022 13:41:32 +0100 (CET) Received: by mail-wr1-f52.google.com with SMTP id h6so14350422wrb.9 for ; Fri, 18 Feb 2022 04:41:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FcMRUU2wYlUaB0yW8agm8HHCSa4cHJM70Vv+v766NFQ=; b=XygFW+ddx5jlwUQAP2yd7BVlkBmj83FXmXFtapcjoDMnvTNvbuTiRUCde59fids3u5 Jh4zGteNf3quEoCr26Q2Lxy4fVQSswnQzyb02uKejtGPzukwqLX1eA065kY818tvGh2Q 29wyJ+zVOD8eMnT0m1xlxLmuZYjciy1fn/Xd80OSQx597SxxgbL/ZpIqEmMdLZONxjux nmVBjHmSlz8gq24qLbF6YxPWCBIdwxyIdnPnf81/kN4UcDvlgO/4thgDisBTrMVFJ6cg NE1Zz4PHV3w4ruz+isxAo4Hxf0GD8EfDAKSpb23i2xNByg8VFoB5ukGKtm+jN8SBQiU3 IqEw== 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=FcMRUU2wYlUaB0yW8agm8HHCSa4cHJM70Vv+v766NFQ=; b=zqBHwJpp6UxEN5+8xS+WJ3ZCJA27ulsDbndULnhBN6BzbMj2uybQaEt7YzlB+xYg/k VAmqf8jwFPhpzOI2uH5YV88N3BHQvotXTQB6XvtC3uXX+fV4ZY/ivKKFDt21Fgu8mllJ 76Rhzbd3QmcFqlJMvzMkVDDM5GRFVhgxZBzQ3mRoOinpETPSlZtj8nWC0HZHAup/xmiK SDAvXjRQ8x1H757Ryp8Gm4tspxbG88JwPLg5v2fMoy+3BfmpFET3TUyXADrbjl+/eZY1 r3+xsvhRW1UrrZEjUp15yJ90hdLTYNZGUynb6m0U9nX47C5FKucQEvvc4nsgAcZXGP8f OEHQ== X-Gm-Message-State: AOAM531wIujnCAGRwlLVzQrp4n+6+GIsVmWhvx7nDFRts4xpj4J5PNeG J4qUYAKrq1I/Jm1+gO+FPgE= X-Google-Smtp-Source: ABdhPJz/eo8PWrurV/yYxEsTlYcI6MtabDWZrSo0QowZt3oVTjdidtDxZ5hIMS8ey2UOQFb/r6/c+g== X-Received: by 2002:a05:6000:1181:b0:1e5:a6af:7b8a with SMTP id g1-20020a056000118100b001e5a6af7b8amr5902290wrx.416.1645188092109; Fri, 18 Feb 2022 04:41:32 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id a1sm42918763wrf.42.2022.02.18.04.41.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:41:31 -0800 (PST) From: luca.boccassi@gmail.com To: Ciara Loftus Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/af_xdp: fix build with -Wunused-function' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:38:07 +0000 Message-Id: <20220218123931.1749595-38-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.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 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/22. 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/8b6401daed4fb3a55af88ee0d9969cb4fe2ac64c Thanks. Luca Boccassi --- >From 8b6401daed4fb3a55af88ee0d9969cb4fe2ac64c Mon Sep 17 00:00:00 2001 From: Ciara Loftus Date: Thu, 9 Dec 2021 17:19:47 +0000 Subject: [PATCH] net/af_xdp: fix build with -Wunused-function [ upstream commit af8d89a0c6d5cfd4d77ec1ec224e5a72996026df ] The get_shared_umem function is only called when the kernel flag XDP_UMEM_UNALIGNED_CHUNK_FLAG is defined. Move the function implementation and associated helper so that it only gets compiled when that flag is set. Fixes: 74b46340e2d4 ("net/af_xdp: support shared UMEM") Signed-off-by: Ciara Loftus Acked-by: Ferruh Yigit --- drivers/net/af_xdp/rte_eth_af_xdp.c | 121 ++++++++++++++-------------- 1 file changed, 60 insertions(+), 61 deletions(-) diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c index 3e2e621993..a8f50b14e3 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -633,67 +633,6 @@ find_internal_resource(struct pmd_internals *port_int) return list; } -/* Check if the netdev,qid context already exists */ -static inline bool -ctx_exists(struct pkt_rx_queue *rxq, const char *ifname, - struct pkt_rx_queue *list_rxq, const char *list_ifname) -{ - bool exists = false; - - if (rxq->xsk_queue_idx == list_rxq->xsk_queue_idx && - !strncmp(ifname, list_ifname, IFNAMSIZ)) { - AF_XDP_LOG(ERR, "ctx %s,%i already exists, cannot share umem\n", - ifname, rxq->xsk_queue_idx); - exists = true; - } - - return exists; -} - -/* Get a pointer to an existing UMEM which overlays the rxq's mb_pool */ -static inline int -get_shared_umem(struct pkt_rx_queue *rxq, const char *ifname, - struct xsk_umem_info **umem) -{ - struct internal_list *list; - struct pmd_internals *internals; - int i = 0, ret = 0; - struct rte_mempool *mb_pool = rxq->mb_pool; - - if (mb_pool == NULL) - return ret; - - pthread_mutex_lock(&internal_list_lock); - - TAILQ_FOREACH(list, &internal_list, next) { - internals = list->eth_dev->data->dev_private; - for (i = 0; i < internals->queue_cnt; i++) { - struct pkt_rx_queue *list_rxq = - &internals->rx_queues[i]; - if (rxq == list_rxq) - continue; - if (mb_pool == internals->rx_queues[i].mb_pool) { - if (ctx_exists(rxq, ifname, list_rxq, - internals->if_name)) { - ret = -1; - goto out; - } - if (__atomic_load_n( - &internals->rx_queues[i].umem->refcnt, - __ATOMIC_ACQUIRE)) { - *umem = internals->rx_queues[i].umem; - goto out; - } - } - } - } - -out: - pthread_mutex_unlock(&internal_list_lock); - - return ret; -} - static int eth_dev_configure(struct rte_eth_dev *dev) { @@ -920,6 +859,66 @@ static inline uintptr_t get_base_addr(struct rte_mempool *mp, uint64_t *align) return aligned_addr; } +/* Check if the netdev,qid context already exists */ +static inline bool +ctx_exists(struct pkt_rx_queue *rxq, const char *ifname, + struct pkt_rx_queue *list_rxq, const char *list_ifname) +{ + bool exists = false; + + if (rxq->xsk_queue_idx == list_rxq->xsk_queue_idx && + !strncmp(ifname, list_ifname, IFNAMSIZ)) { + AF_XDP_LOG(ERR, "ctx %s,%i already exists, cannot share umem\n", + ifname, rxq->xsk_queue_idx); + exists = true; + } + + return exists; +} + +/* Get a pointer to an existing UMEM which overlays the rxq's mb_pool */ +static inline int +get_shared_umem(struct pkt_rx_queue *rxq, const char *ifname, + struct xsk_umem_info **umem) +{ + struct internal_list *list; + struct pmd_internals *internals; + int i = 0, ret = 0; + struct rte_mempool *mb_pool = rxq->mb_pool; + + if (mb_pool == NULL) + return ret; + + pthread_mutex_lock(&internal_list_lock); + + TAILQ_FOREACH(list, &internal_list, next) { + internals = list->eth_dev->data->dev_private; + for (i = 0; i < internals->queue_cnt; i++) { + struct pkt_rx_queue *list_rxq = + &internals->rx_queues[i]; + if (rxq == list_rxq) + continue; + if (mb_pool == internals->rx_queues[i].mb_pool) { + if (ctx_exists(rxq, ifname, list_rxq, + internals->if_name)) { + ret = -1; + goto out; + } + if (__atomic_load_n(&internals->rx_queues[i].umem->refcnt, + __ATOMIC_ACQUIRE)) { + *umem = internals->rx_queues[i].umem; + goto out; + } + } + } + } + +out: + pthread_mutex_unlock(&internal_list_lock); + + return ret; +} + static struct xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals, struct pkt_rx_queue *rxq) -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:39.567588174 +0000 +++ 0038-net-af_xdp-fix-build-with-Wunused-function.patch 2022-02-18 12:37:37.630790580 +0000 @@ -1 +1 @@ -From af8d89a0c6d5cfd4d77ec1ec224e5a72996026df Mon Sep 17 00:00:00 2001 +From 8b6401daed4fb3a55af88ee0d9969cb4fe2ac64c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit af8d89a0c6d5cfd4d77ec1ec224e5a72996026df ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 96c2c9d939..b3ed704b36 100644 +index 3e2e621993..a8f50b14e3 100644 @@ -24 +25 @@ -@@ -697,67 +697,6 @@ find_internal_resource(struct pmd_internals *port_int) +@@ -633,67 +633,6 @@ find_internal_resource(struct pmd_internals *port_int) @@ -92 +93 @@ -@@ -1013,6 +952,66 @@ static inline uintptr_t get_base_addr(struct rte_mempool *mp, uint64_t *align) +@@ -920,6 +859,66 @@ static inline uintptr_t get_base_addr(struct rte_mempool *mp, uint64_t *align)