From: "Björn Töpel" <bjorn.topel@gmail.com>
To: ast@kernel.org, daniel@iogearbox.net, netdev@vger.kernel.org,
bpf@vger.kernel.org
Cc: "Björn Töpel" <bjorn.topel@intel.com>,
magnus.karlsson@intel.com, maciej.fijalkowski@intel.com,
kuba@kernel.org, jonathan.lemon@gmail.com, maximmi@nvidia.com,
davem@davemloft.net, hawk@kernel.org, john.fastabend@gmail.com,
ciara.loftus@intel.com, weqaar.a.janjua@intel.com
Subject: [PATCH bpf-next v2 3/8] xsk: fold xp_assign_dev and __xp_assign_dev
Date: Tue, 19 Jan 2021 16:50:08 +0100 [thread overview]
Message-ID: <20210119155013.154808-4-bjorn.topel@gmail.com> (raw)
In-Reply-To: <20210119155013.154808-1-bjorn.topel@gmail.com>
From: Björn Töpel <bjorn.topel@intel.com>
Fold xp_assign_dev and __xp_assign_dev. The former directly calls the
latter.
Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
---
net/xdp/xsk_buff_pool.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c
index 20598eea658c..8de01aaac4a0 100644
--- a/net/xdp/xsk_buff_pool.c
+++ b/net/xdp/xsk_buff_pool.c
@@ -119,8 +119,8 @@ static void xp_disable_drv_zc(struct xsk_buff_pool *pool)
}
}
-static int __xp_assign_dev(struct xsk_buff_pool *pool,
- struct net_device *netdev, u16 queue_id, u16 flags)
+int xp_assign_dev(struct xsk_buff_pool *pool,
+ struct net_device *netdev, u16 queue_id, u16 flags)
{
bool force_zc, force_copy;
struct netdev_bpf bpf;
@@ -191,12 +191,6 @@ static int __xp_assign_dev(struct xsk_buff_pool *pool,
return err;
}
-int xp_assign_dev(struct xsk_buff_pool *pool, struct net_device *dev,
- u16 queue_id, u16 flags)
-{
- return __xp_assign_dev(pool, dev, queue_id, flags);
-}
-
int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_umem *umem,
struct net_device *dev, u16 queue_id)
{
@@ -210,7 +204,7 @@ int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_umem *umem,
if (pool->uses_need_wakeup)
flags |= XDP_USE_NEED_WAKEUP;
- return __xp_assign_dev(pool, dev, queue_id, flags);
+ return xp_assign_dev(pool, dev, queue_id, flags);
}
void xp_clear_dev(struct xsk_buff_pool *pool)
--
2.27.0
next prev parent reply other threads:[~2021-01-19 18:29 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-19 15:50 [PATCH bpf-next v2 0/8] Introduce bpf_redirect_xsk() helper Björn Töpel
2021-01-19 15:50 ` [PATCH bpf-next v2 1/8] xdp: restructure redirect actions Björn Töpel
2021-01-20 12:44 ` Toke Høiland-Jørgensen
2021-01-20 13:40 ` Björn Töpel
2021-01-20 14:52 ` Toke Høiland-Jørgensen
2021-01-20 15:49 ` Björn Töpel
2021-01-20 16:30 ` Toke Høiland-Jørgensen
2021-01-20 17:26 ` Björn Töpel
2021-01-19 15:50 ` [PATCH bpf-next v2 2/8] xsk: remove explicit_free parameter from __xsk_rcv() Björn Töpel
2021-01-19 15:50 ` Björn Töpel [this message]
2021-01-19 15:50 ` [PATCH bpf-next v2 4/8] xsk: register XDP sockets at bind(), and add new AF_XDP BPF helper Björn Töpel
2021-01-20 8:25 ` kernel test robot
2021-01-20 8:25 ` kernel test robot
2021-01-20 8:41 ` Björn Töpel
2021-01-20 8:41 ` Björn Töpel
2021-01-20 8:50 ` kernel test robot
2021-01-20 8:50 ` kernel test robot
2021-01-20 12:50 ` Toke Høiland-Jørgensen
2021-01-20 13:25 ` Björn Töpel
2021-01-20 14:54 ` Toke Høiland-Jørgensen
2021-01-20 15:18 ` Björn Töpel
2021-01-20 17:29 ` Toke Høiland-Jørgensen
2021-01-20 18:22 ` Björn Töpel
2021-01-20 20:26 ` Toke Høiland-Jørgensen
2021-01-20 21:15 ` Alexei Starovoitov
2021-01-21 8:18 ` Björn Töpel
2021-01-19 15:50 ` [PATCH bpf-next v2 5/8] libbpf, xsk: select AF_XDP BPF program based on kernel version Björn Töpel
2021-01-20 12:52 ` Toke Høiland-Jørgensen
2021-01-20 13:25 ` Björn Töpel
2021-01-20 14:49 ` Björn Töpel
2021-01-20 15:11 ` Toke Høiland-Jørgensen
2021-01-20 15:27 ` Björn Töpel
2021-01-20 17:30 ` Toke Høiland-Jørgensen
2021-01-20 18:25 ` Alexei Starovoitov
2021-01-20 18:30 ` Björn Töpel
2021-01-20 14:56 ` Toke Høiland-Jørgensen
2021-01-19 15:50 ` [PATCH bpf-next v2 6/8] libbpf, xsk: select bpf_redirect_xsk(), if supported Björn Töpel
2021-01-19 15:50 ` [PATCH bpf-next v2 7/8] selftest/bpf: add XDP socket tests for bpf_redirect_{xsk, map}() Björn Töpel
2021-01-21 7:39 ` Andrii Nakryiko
2021-01-21 12:31 ` Björn Töpel
2021-01-19 15:50 ` [PATCH bpf-next v2 8/8] selftest/bpf: remove a lot of ifobject casting in xdpxceiver Björn Töpel
2021-01-20 13:15 ` [PATCH bpf-next v2 0/8] Introduce bpf_redirect_xsk() helper Maxim Mikityanskiy
2021-01-20 13:27 ` Björn Töpel
2021-01-20 15:57 ` Jesper Dangaard Brouer
2021-01-20 16:19 ` Maciej Fijalkowski
2021-01-21 17:01 ` Jesper Dangaard Brouer
2021-01-22 8:59 ` Magnus Karlsson
2021-01-22 9:45 ` Maciej Fijalkowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210119155013.154808-4-bjorn.topel@gmail.com \
--to=bjorn.topel@gmail.com \
--cc=ast@kernel.org \
--cc=bjorn.topel@intel.com \
--cc=bpf@vger.kernel.org \
--cc=ciara.loftus@intel.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=hawk@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=jonathan.lemon@gmail.com \
--cc=kuba@kernel.org \
--cc=maciej.fijalkowski@intel.com \
--cc=magnus.karlsson@intel.com \
--cc=maximmi@nvidia.com \
--cc=netdev@vger.kernel.org \
--cc=weqaar.a.janjua@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.