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 541814369C for ; Thu, 7 Dec 2023 15:21:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 291F842ECC; Thu, 7 Dec 2023 15:21:24 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id B074742E2D for ; Thu, 7 Dec 2023 15:21:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701958882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=GzjnqDnWcl2vjSn/GP728tWu+xpSyvhxAc7E8I4Akuo=; b=IRKPM5ihSVu14GYPRMstSWrjx1OIqvirxKwagVBIfM+iIwrmq3l8LEo1JvGEIFBmzOvG8V QjkGaplBeYaWMHZRnxNa7+sEubBu6THtwGvseWWBlOIJ2HVrO9g5pxf+rwHtwcnoIRvzOu Kk2Ov5kCjrYb0SKyLnvNmkzhRKiZcnc= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-367-PNS8GNxjPvy4vkQESb9xkw-1; Thu, 07 Dec 2023 09:21:20 -0500 X-MC-Unique: PNS8GNxjPvy4vkQESb9xkw-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3334b1055fbso790267f8f.2 for ; Thu, 07 Dec 2023 06:21:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701958577; x=1702563377; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=GzjnqDnWcl2vjSn/GP728tWu+xpSyvhxAc7E8I4Akuo=; b=bOW/AWu0padQ07Ir/VprnYp6Cv8BZrC6Of5Qn1DUbiOyM35+XSDPkAodG3becc/ocO drPNkXsGNn46uCP9wy8GEg+QMYe+54cJk/qMItqxbO9GxYa1lpnDDHgQuzlGtDxW8BBD XCr0egjmfST509j8x129X7AlG6zoHqrhp5Jf2M01PAGphVC5L8LG8pOCS1/rjC6MAyhO R/Us7BtbPIkUaVBnAFWD0J7CVbzvxduuKkO7ehica7tRjwnlviRvbtgWf3pSpQDnrGCR 0Enhk+Kr7w9Xu8yeLO+9iTNsyxkH4lSavaHMawe99GrZ2W81ZeTlhoG1xBBVx9VkaHMx sjKQ== X-Gm-Message-State: AOJu0YwJ6ykb2sUpF/35YaJUTnvEIFzAaEGifFIJDofhRJcy1F/plJAB EB5znAeiqW5yfxlrrv577MFmrMhMTF5IGVOMSxeML9/j3wFfcLPhJ72EwIwmnx4KII2VZZGZvGx h7TxMp07mnC2mgcc= X-Received: by 2002:a5d:61c7:0:b0:333:9103:63d2 with SMTP id q7-20020a5d61c7000000b00333910363d2mr1076946wrv.106.1701958577098; Thu, 07 Dec 2023 06:16:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IHfvpcBDDB3qih+AcPMjbbSWR3+FWKlTS08VpC+1YLMRkfuklHCReYQhxrjpgO6Pt5XyAJrQA== X-Received: by 2002:a5d:61c7:0:b0:333:9103:63d2 with SMTP id q7-20020a5d61c7000000b00333910363d2mr1076938wrv.106.1701958576810; Thu, 07 Dec 2023 06:16:16 -0800 (PST) Received: from [192.168.0.36] ([78.16.130.39]) by smtp.gmail.com with ESMTPSA id s13-20020adfdb0d000000b0033339027c89sm1559911wri.108.2023.12.07.06.16.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 07 Dec 2023 06:16:16 -0800 (PST) Message-ID: <968caeb4-3420-4f47-9b9f-42e4c828d01a@redhat.com> Date: Thu, 7 Dec 2023 14:16:15 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: patch 'net/af_xdp: make compatible with libbpf 0.8.0' has been queued to stable release 21.11.6 From: Kevin Traynor To: Ciara Loftus Cc: Andrew Rybchenko , Ferruh Yigit , dpdk stable References: <20231207112116.769502-1-ktraynor@redhat.com> <20231207112116.769502-22-ktraynor@redhat.com> Autocrypt: addr=ktraynor@redhat.com; keydata= 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 In-Reply-To: <20231207112116.769502-22-ktraynor@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed 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 Ciara, On 07/12/2023 11:21, Kevin Traynor wrote: > Hi, > > FYI, your patch has been queued to stable release 21.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 12/12/23. 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/kevintraynor/dpdk-stable > > This queued commit can be viewed at: > https://github.com/kevintraynor/dpdk-stable/commit/770e7c27240d09571a62627c3bc90b8e6e9f6024 > > Thanks. > > Kevin > > --- > From 770e7c27240d09571a62627c3bc90b8e6e9f6024 Mon Sep 17 00:00:00 2001 > From: Ciara Loftus > Date: Thu, 6 Oct 2022 09:26:54 +0300 > Subject: [PATCH] net/af_xdp: make compatible with libbpf 0.8.0 > > [ upstream commit 1eb1846b1a2caaf77d0697747d3ecd1272ce0bfc ] > > libbpf v0.8.0 deprecates the bpf_get_link_xdp_id() and > bpf_set_link_xdp_fd() functions. Use meson to detect if > bpf_xdp_attach() is available and if so, use the recommended > replacement functions bpf_xdp_query_id(), bpf_xdp_attach() > and bpf_xdp_detach(). > > Signed-off-by: Ciara Loftus > Signed-off-by: Andrew Rybchenko > Reviewed-by: Ferruh Yigit > --- > drivers/net/af_xdp/meson.build | 8 ++++++ > drivers/net/af_xdp/rte_eth_af_xdp.c | 38 ++++++++++++++++++++++++++++- > 2 files changed, 45 insertions(+), 1 deletion(-) > I saw that af_xdp driver was not building [0] on F38 with the libbpf and libxdp packages [1]. Previously I had squashed the deprecation warnings but now with newer package versions it seems that is not enough. The meson.build file has changed a bit from 21.11 to DPDK main, so I tried to take the correct part from the above commit and it builds for F38 now. I'm not sure if I missed some case, or there's some other commits that I should backport. Can you have a look and if it's not right, send a patch or tell me which patches should be backported ? (you can see the diff and full file on the github link above). thanks, Kevin. [0] [1126/3148] Compiling C object drivers/libtmp_rte_net_af_xdp.a.p/net_af_xdp_rte_eth_af_xdp.c.o ../drivers/net/af_xdp/rte_eth_af_xdp.c: In function ‘remove_xdp_program’: ../drivers/net/af_xdp/rte_eth_af_xdp.c:869:13: warning: implicit declaration of function ‘bpf_get_link_xdp_id’ [-Wimplicit-function-declaration] 869 | if (bpf_get_link_xdp_id(internals->if_index, &curr_prog_id, | ^~~~~~~~~~~~~~~~~~~ ../drivers/net/af_xdp/rte_eth_af_xdp.c:869:13: warning: nested extern declaration of ‘bpf_get_link_xdp_id’ [-Wnested-externs] ../drivers/net/af_xdp/rte_eth_af_xdp.c:874:9: warning: implicit declaration of function ‘bpf_set_link_xdp_fd’; did you mean ‘bpf_link__fd’? [-Wimplicit-function-declaration] 874 | bpf_set_link_xdp_fd(internals->if_index, -1, | ^~~~~~~~~~~~~~~~~~~ | bpf_link__fd ../drivers/net/af_xdp/rte_eth_af_xdp.c:874:9: warning: nested extern declaration of ‘bpf_set_link_xdp_fd’ [-Wnested-externs] [1] $ rpm -qa | grep -e libbpf -e libxdp libbpf-1.1.0-2.fc38.x86_64 libbpf-devel-1.1.0-2.fc38.x86_64 libxdp-1.4.1-1.fc38.x86_64 libxdp-devel-1.4.1-1.fc38.x86_64 > diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.build > index 1e0de23705..2605086d0c 100644 > --- a/drivers/net/af_xdp/meson.build > +++ b/drivers/net/af_xdp/meson.build > @@ -56,2 +56,10 @@ else > reason = 'missing header, "linux/if_xdp.h"' > endif > + > +if build > + if cc.has_function('bpf_xdp_attach', > + prefix : '#include ', > + dependencies : bpf_dep) > + cflags += ['-DRTE_NET_AF_XDP_LIBBPF_XDP_ATTACH'] > + endif > +endif > diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c > index 9918d3c5fd..6bc7178fc5 100644 > --- a/drivers/net/af_xdp/rte_eth_af_xdp.c > +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c > @@ -859,7 +859,41 @@ eth_stats_reset(struct rte_eth_dev *dev) > } > > +#ifdef RTE_NET_AF_XDP_LIBBPF_XDP_ATTACH > + > +static int link_xdp_prog_with_dev(int ifindex, int fd, __u32 flags) > +{ > + return bpf_xdp_attach(ifindex, fd, flags, NULL); > +} > + > +static int > +remove_xdp_program(struct pmd_internals *internals) > +{ > + uint32_t curr_prog_id = 0; > + int ret; > + > + ret = bpf_xdp_query_id(internals->if_index, XDP_FLAGS_UPDATE_IF_NOEXIST, > + &curr_prog_id); > + if (ret != 0) { > + AF_XDP_LOG(ERR, "bpf_xdp_query_id failed\n"); > + return ret; > + } > + > + ret = bpf_xdp_detach(internals->if_index, XDP_FLAGS_UPDATE_IF_NOEXIST, > + NULL); > + if (ret != 0) > + AF_XDP_LOG(ERR, "bpf_xdp_detach failed\n"); > + return ret; > +} > + > +#else > + > #pragma GCC diagnostic push > #pragma GCC diagnostic ignored "-Wdeprecated-declarations" > > +static int link_xdp_prog_with_dev(int ifindex, int fd, __u32 flags) > +{ > + return bpf_set_link_xdp_fd(ifindex, fd, flags); > +} > + > static void > remove_xdp_program(struct pmd_internals *internals) > @@ -878,4 +912,6 @@ remove_xdp_program(struct pmd_internals *internals) > #pragma GCC diagnostic pop > > +#endif > + > static void > xdp_umem_destroy(struct xsk_umem_info *umem) > @@ -1190,5 +1226,5 @@ load_custom_xdp_prog(const char *prog_path, int if_index, struct bpf_map **map) > > /* Link the program with the given network device */ > - ret = bpf_set_link_xdp_fd(if_index, prog_fd, > + ret = link_xdp_prog_with_dev(if_index, prog_fd, > XDP_FLAGS_UPDATE_IF_NOEXIST); > if (ret) {