mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-29 17:22:07 +00:00
8d0c12a80c
This adds the napi busy polling support in io_uring.c. It adds a new
napi_list to the io_ring_ctx structure. This list contains the list of
napi_id's that are currently enabled for busy polling. The list is
synchronized by the new napi_lock spin lock. The current default napi
busy polling time is stored in napi_busy_poll_to. If napi busy polling
is not enabled, the value is 0.
In addition there is also a hash table. The hash table store the napi
id and the pointer to the above list nodes. The hash table is used to
speed up the lookup to the list elements. The hash table is synchronized
with rcu.
The NAPI_TIMEOUT is stored as a timeout to make sure that the time a
napi entry is stored in the napi list is limited.
The busy poll timeout is also stored as part of the io_wait_queue. This
is necessary as for sq polling the poll interval needs to be adjusted
and the napi callback allows only to pass in one value.
This has been tested with two simple programs from the liburing library
repository: the napi client and the napi server program. The client
sends a request, which has a timestamp in its payload and the server
replies with the same payload. The client calculates the roundtrip time
and stores it to calculate the results.
The client is running on host1 and the server is running on host 2 (in
the same rack). The measured times below are roundtrip times. They are
average times over 5 runs each. Each run measures 1 million roundtrips.
no rx coal rx coal: frames=88,usecs=33
Default 57us 56us
client_poll=100us 47us 46us
server_poll=100us 51us 46us
client_poll=100us+ 40us 40us
server_poll=100us
client_poll=100us+ 41us 39us
server_poll=100us+
prefer napi busy poll on client
client_poll=100us+ 41us 39us
server_poll=100us+
prefer napi busy poll on server
client_poll=100us+ 41us 39us
server_poll=100us+
prefer napi busy poll on client + server
Signed-off-by: Stefan Roesch <shr@devkernel.io>
Suggested-by: Olivier Langlois <olivier@trillion01.com>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Link: https://lore.kernel.org/r/20230608163839.2891748-5-shr@devkernel.io
Signed-off-by: Jens Axboe <axboe@kernel.dk>
90 lines
1.9 KiB
C
90 lines
1.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
|
|
#ifndef IOU_NAPI_H
|
|
#define IOU_NAPI_H
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/io_uring.h>
|
|
#include <net/busy_poll.h>
|
|
|
|
#ifdef CONFIG_NET_RX_BUSY_POLL
|
|
|
|
void io_napi_init(struct io_ring_ctx *ctx);
|
|
void io_napi_free(struct io_ring_ctx *ctx);
|
|
|
|
void __io_napi_add(struct io_ring_ctx *ctx, struct socket *sock);
|
|
|
|
void __io_napi_adjust_timeout(struct io_ring_ctx *ctx,
|
|
struct io_wait_queue *iowq, struct timespec64 *ts);
|
|
void __io_napi_busy_loop(struct io_ring_ctx *ctx, struct io_wait_queue *iowq);
|
|
|
|
static inline bool io_napi(struct io_ring_ctx *ctx)
|
|
{
|
|
return !list_empty(&ctx->napi_list);
|
|
}
|
|
|
|
static inline void io_napi_adjust_timeout(struct io_ring_ctx *ctx,
|
|
struct io_wait_queue *iowq,
|
|
struct timespec64 *ts)
|
|
{
|
|
if (!io_napi(ctx))
|
|
return;
|
|
__io_napi_adjust_timeout(ctx, iowq, ts);
|
|
}
|
|
|
|
static inline void io_napi_busy_loop(struct io_ring_ctx *ctx,
|
|
struct io_wait_queue *iowq)
|
|
{
|
|
if (!io_napi(ctx))
|
|
return;
|
|
__io_napi_busy_loop(ctx, iowq);
|
|
}
|
|
|
|
/*
|
|
* io_napi_add() - Add napi id to the busy poll list
|
|
* @req: pointer to io_kiocb request
|
|
*
|
|
* Add the napi id of the socket to the napi busy poll list and hash table.
|
|
*/
|
|
static inline void io_napi_add(struct io_kiocb *req)
|
|
{
|
|
struct io_ring_ctx *ctx = req->ctx;
|
|
struct socket *sock;
|
|
|
|
if (!READ_ONCE(ctx->napi_busy_poll_to))
|
|
return;
|
|
|
|
sock = sock_from_file(req->file);
|
|
if (sock)
|
|
__io_napi_add(ctx, sock);
|
|
}
|
|
|
|
#else
|
|
|
|
static inline void io_napi_init(struct io_ring_ctx *ctx)
|
|
{
|
|
}
|
|
static inline void io_napi_free(struct io_ring_ctx *ctx)
|
|
{
|
|
}
|
|
static inline bool io_napi(struct io_ring_ctx *ctx)
|
|
{
|
|
return false;
|
|
}
|
|
static inline void io_napi_add(struct io_kiocb *req)
|
|
{
|
|
}
|
|
static inline void io_napi_adjust_timeout(struct io_ring_ctx *ctx,
|
|
struct io_wait_queue *iowq,
|
|
struct timespec64 *ts)
|
|
{
|
|
}
|
|
static inline void io_napi_busy_loop(struct io_ring_ctx *ctx,
|
|
struct io_wait_queue *iowq)
|
|
{
|
|
}
|
|
|
|
#endif /* CONFIG_NET_RX_BUSY_POLL */
|
|
|
|
#endif
|