The patch titled
Subject: fs/eventpoll.c: simply CONFIG_NET_RX_BUSY_POLL ifdefery
has been added to the -mm tree. Its filename is
fs-epoll-simply-config_net_rx_busy_poll-ifdefery.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/fs-epoll-simply-config_net_rx_busy_poll-ifdefery.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/fs-epoll-simply-config_net_rx_busy_poll-ifdefery.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Davidlohr Bueso <dave@xxxxxxxxxxxx>
Subject: fs/eventpoll.c: simply CONFIG_NET_RX_BUSY_POLL ifdefery
... 'tis easier on the eye.
Link: http://lkml.kernel.org/r/20180725185620.11020-1-dave@xxxxxxxxxxxx
Signed-off-by: Davidlohr Bueso <dbueso@xxxxxxx>
Cc: Jason Baron <jbaron@xxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
diff -puN fs/eventpoll.c~fs-epoll-simply-config_net_rx_busy_poll-ifdefery fs/eventpoll.c
--- a/fs/eventpoll.c~fs-epoll-simply-config_net_rx_busy_poll-ifdefery
+++ a/fs/eventpoll.c
@@ -391,7 +391,6 @@ static bool ep_busy_loop_end(void *p, un
return ep_events_available(ep) || busy_loop_timeout(start_time);
}
-#endif /* CONFIG_NET_RX_BUSY_POLL */
/*
* Busy poll if globally on and supporting sockets found && no events,
@@ -401,20 +400,16 @@ static bool ep_busy_loop_end(void *p, un
*/
static void ep_busy_loop(struct eventpoll *ep, int nonblock)
{
-#ifdef CONFIG_NET_RX_BUSY_POLL
unsigned int napi_id = READ_ONCE(ep->napi_id);
if ((napi_id >= MIN_NAPI_ID) && net_busy_loop_on())
napi_busy_loop(napi_id, nonblock ? NULL : ep_busy_loop_end, ep);
-#endif
}
static inline void ep_reset_busy_poll_napi_id(struct eventpoll *ep)
{
-#ifdef CONFIG_NET_RX_BUSY_POLL
if (ep->napi_id)
ep->napi_id = 0;
-#endif
}
/*
@@ -422,7 +417,6 @@ static inline void ep_reset_busy_poll_na
*/
static inline void ep_set_busy_poll_napi_id(struct epitem *epi)
{
-#ifdef CONFIG_NET_RX_BUSY_POLL
struct eventpoll *ep;
unsigned int napi_id;
struct socket *sock;
@@ -452,9 +446,15 @@ static inline void ep_set_busy_poll_napi
/* record NAPI ID for use in next busy poll */
ep->napi_id = napi_id;
-#endif
}
+#else
+#define ep_busy_loop(ep, nonblock) do { } while (0)
+#define ep_reset_busy_poll_napi_id(ep) do { } while (0)
+#define ep_set_busy_poll_napi_id(epi) do { } while (0)
+
+#endif /* CONFIG_NET_RX_BUSY_POLL */
+
/**
* ep_call_nested - Perform a bound (possibly) nested call, by checking
* that the recursion limit is not exceeded, and that
_
Patches currently in -mm which might be from dave@xxxxxxxxxxxx are
ipc-sem-prevent-queuestatus-tearing-in-semop.patch
fs-epoll-loosen-irq-safety-in-ep_scan_ready_list.patch
fs-epoll-loosen-irq-safety-in-epoll_insert-and-epoll_remove.patch
fs-epoll-robustify-irq-safety-with-lockdep_assert_irqs_enabled.patch
fs-epoll-simply-config_net_rx_busy_poll-ifdefery.patch
ipc-drop-ipc_lock.patch
lib-rhashtable-simplify-bucket_table_alloc.patch
lib-rhashtable-guarantee-initial-hashtable-allocation.patch
ipc-get-rid-of-ids-tables_initialized-hack.patch
ipc-simplify-ipc-initialization.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
