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,
andrii@kernel.org
Subject: [PATCH bpf-next 2/3] xsk: fold xp_assign_dev and __xp_assign_dev
Date: Fri, 22 Jan 2021 11:53:50 +0100 [thread overview]
Message-ID: <20210122105351.11751-3-bjorn.topel@gmail.com> (raw)
In-Reply-To: <20210122105351.11751-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-22 12:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-22 10:53 [PATCH bpf-next 0/3] AF_XDP clean up/perf improvements Björn Töpel
2021-01-22 10:53 ` [PATCH bpf-next 1/3] xsk: remove explicit_free parameter from __xsk_rcv() Björn Töpel
2021-01-22 10:53 ` Björn Töpel [this message]
2021-01-22 10:53 ` [PATCH bpf-next 3/3] libbpf, xsk: select AF_XDP BPF program based on kernel version Björn Töpel
2021-01-25 23:12 ` Daniel Borkmann
2021-01-26 8:38 ` Jesper Dangaard Brouer
2021-01-22 13:19 ` [PATCH bpf-next 0/3] AF_XDP clean up/perf improvements Toke Høiland-Jørgensen
2021-01-22 13:37 ` Björn Töpel
2021-01-22 13:40 ` Toke Høiland-Jørgensen
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=20210122105351.11751-3-bjorn.topel@gmail.com \
--to=bjorn.topel@gmail.com \
--cc=andrii@kernel.org \
--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 \
--subject='Re: [PATCH bpf-next 2/3] xsk: fold xp_assign_dev and __xp_assign_dev' \
/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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).