packages/dpdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/af_xdp: fix getsockopt ENOTSOCK error

Browse Source 
(cherry picked from commit 25582a62ddb8ce9dc560b07614da81fe45ad172f)
This commit is contained in:
yangchen 2024-11-01 09:13:20 +08:00 committed by openeuler-sync-bot
parent d785f482df
commit 56e67cddc1
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0485-net-af_xdp-fix-getsockopt-ENOTSOCK-error.patch Normal file
View File

@ -0,0 +1,30 @@
From d1e498f1832a09b220831d87d345fe943189cbe7 Mon Sep 17 00:00:00 2001
From: yangchen <yangchen145@huawei.com>
Date: Wed, 30 Oct 2024 04:20:55 +0800
Subject: [PATCH] net/af_xdp: fix getsockopt ENOTSOCK error
---
drivers/net/af_xdp/rte_eth_af_xdp.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c
index 6314338..4254a5c 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -1914,12 +1914,11 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,
ret = -rte_errno;
goto err;
}
- rxq->fds[0].fd = 0;
} else {
- rxq->fds[0].fd = xsk_socket__fd(rxq->xsk);
rxq->fds[0].events = POLLIN;
}
+ rxq->fds[0].fd = xsk_socket__fd(rxq->xsk);
process_private->rxq_xsk_fds[rx_queue_id] = rxq->fds[0].fd;
rxq->port = dev->data->port_id;
--
2.33.0

8
dpdk.spec
View File

@ -1,6 +1,6 @@
Name: dpdk Name: dpdk
Version: 21.11 Version: 21.11
Release: 78 Release: 79
Packager: packaging@6wind.com Packager: packaging@6wind.com
URL: http://dpdk.org URL: http://dpdk.org
%global source_version 21.11 %global source_version 21.11
@ -516,10 +516,9 @@ patch9479: 0479-config-arm-adapt-RTE_MAX_LCORE-to-640.patch
patch9480: 0480-af_xdp-support-recv-multi-buffer.patch patch9480: 0480-af_xdp-support-recv-multi-buffer.patch
Patch9481: 0481-net-af_xdp-add-interrupt-support.patch Patch9481: 0481-net-af_xdp-add-interrupt-support.patch
Patch9482: 0482-af_xdp-del-XDP_USE_SG-and-XDP_PKT_CONTD-definition.patch Patch9482: 0482-af_xdp-del-XDP_USE_SG-and-XDP_PKT_CONTD-definition.patch
Patch9483: 0483-af_xdp-fix-mbuf-ol_flags-not-init.patch Patch9483: 0483-af_xdp-fix-mbuf-ol_flags-not-init.patch
Patch9484: 0484-bus-pci-fix-UIO-resource-mapping-in-secondary-proces.patch Patch9484: 0484-bus-pci-fix-UIO-resource-mapping-in-secondary-proces.patch
Patch9485: 0485-net-af_xdp-fix-getsockopt-ENOTSOCK-error.patch
Summary: Data Plane Development Kit core Summary: Data Plane Development Kit core
Group: System Environment/Libraries Group: System Environment/Libraries
@ -687,6 +686,9 @@ fi
/usr/sbin/depmod /usr/sbin/depmod
%changelog %changelog
* Thu Oct 31 2024 yangchen <yangchen145@huawei.com> - 21.11-79
net/af_xdp: fix getsockopt ENOTSOCK error
* Wed Oct 23 2024 chenyi <chenyi211@huawei.com> - 21.11-78 * Wed Oct 23 2024 chenyi <chenyi211@huawei.com> - 21.11-78
Sync some patches from upstream about bugfix, modifies are as follow: Sync some patches from upstream about bugfix, modifies are as follow:
- bus/pci: fix UIO resource mapping in secondary process - bus/pci: fix UIO resource mapping in secondary process