From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: [email protected]
Subject: [PATCH 2/8] io_uring: dont ifdef io_alloc_cache_kasan()
Date: Tue, 28 Jan 2025 20:56:10 +0000 [thread overview]
Message-ID: <35e53e83f6e16478dca0028a64a6cc905dc764d3.1738087204.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
Use IS_ENABLED in io_alloc_cache_kasan() so at least it gets compile
tested without KASAN.
Signed-off-by: Pavel Begunkov <[email protected]>
---
io_uring/alloc_cache.h | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/io_uring/alloc_cache.h b/io_uring/alloc_cache.h
index 28436f413bd2c..9eb374ad7490c 100644
--- a/io_uring/alloc_cache.h
+++ b/io_uring/alloc_cache.h
@@ -8,18 +8,14 @@
*/
#define IO_ALLOC_CACHE_MAX 128
-#if defined(CONFIG_KASAN)
-static inline void io_alloc_cache_kasan(struct iovec **iov, int *nr)
-{
- kfree(*iov);
- *iov = NULL;
- *nr = 0;
-}
-#else
static inline void io_alloc_cache_kasan(struct iovec **iov, int *nr)
{
+ if (IS_ENABLED(CONFIG_KASAN)) {
+ kfree(*iov);
+ *iov = NULL;
+ *nr = 0;
+ }
}
-#endif
static inline bool io_alloc_cache_put(struct io_alloc_cache *cache,
void *entry)
--
2.47.1
next prev parent reply other threads:[~2025-01-28 20:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-28 20:56 [PATCH 0/8] alloc cache and iovec assorted cleanups Pavel Begunkov
2025-01-28 20:56 ` [PATCH 1/8] io_uring: include all deps for alloc_cache.h Pavel Begunkov
2025-01-28 20:56 ` Pavel Begunkov [this message]
2025-01-28 20:56 ` [PATCH 3/8] io_uring: add alloc_cache.c Pavel Begunkov
2025-01-28 20:56 ` [PATCH 4/8] io_uring/net: make io_net_vec_assign() return void Pavel Begunkov
2025-01-28 20:56 ` [PATCH 5/8] io_uring/net: clean io_msg_copy_hdr() Pavel Begunkov
2025-01-28 20:56 ` [PATCH 6/8] io_uring/net: extract io_send_select_buffer() Pavel Begunkov
2025-01-28 20:56 ` [PATCH 7/8] io_uring: remove !KASAN guards from cache free Pavel Begunkov
2025-01-28 20:56 ` [PATCH 8/8] io_uring/rw: simplify io_rw_recycle() Pavel Begunkov
2025-01-28 21:59 ` [PATCH 0/8] alloc cache and iovec assorted cleanups Gabriel Krisman Bertazi
2025-01-28 22:42 ` Jens Axboe
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=35e53e83f6e16478dca0028a64a6cc905dc764d3.1738087204.git.asml.silence@gmail.com \
[email protected] \
[email protected] \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox