2019-06-13 15:09:22

by Willem de Bruijn

Subject: [PATCH net-next 0/2] enable and use static_branch_deferred_inc

From: Willem de Bruijn <[email protected]>

1. make static_branch_deferred_inc available if !CONFIG_JUMP_LABEL
2. convert the existing STATIC_KEY_DEFERRED_FALSE user to this api

Willem de Bruijn (2):
locking/static_key: always define static_branch_deferred_inc
tcp: use static_branch_deferred_inc for clean_acked_data_enabled

include/linux/jump_label_ratelimit.h | 5 +++--
net/ipv4/tcp_input.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)

--
2.22.0.rc2.383.gf4fbbf30c2-goog

2019-06-13 15:10:23

by Willem de Bruijn

Subject: [PATCH net-next 1/2] locking/static_key: always define static_branch_deferred_inc

From: Willem de Bruijn <[email protected]>

This interface is currently only defined if CONFIG_JUMP_LABEL. Make it
available also when jump labels are off.

Signed-off-by: Willem de Bruijn <[email protected]>
Acked-by: Peter Zijlstra (Intel) <[email protected]>
---
include/linux/jump_label_ratelimit.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/linux/jump_label_ratelimit.h b/include/linux/jump_label_ratelimit.h
index 42710d5949ba..8c3ee291b2d8 100644
--- a/include/linux/jump_label_ratelimit.h
+++ b/include/linux/jump_label_ratelimit.h
@@ -60,8 +60,6 @@ extern void jump_label_update_timeout(struct work_struct *work);
0), \
}

-#define static_branch_deferred_inc(x) static_branch_inc(&(x)->key)
-
#else /* !CONFIG_JUMP_LABEL */
struct static_key_deferred {
struct static_key key;
@@ -95,4 +93,7 @@ jump_label_rate_limit(struct static_key_deferred *key,
STATIC_KEY_CHECK_USE(key);
}
#endif /* CONFIG_JUMP_LABEL */
+
+#define static_branch_deferred_inc(x) static_branch_inc(&(x)->key)
+
#endif /* _LINUX_JUMP_LABEL_RATELIMIT_H */
--
2.22.0.rc2.383.gf4fbbf30c2-goog

2019-06-13 17:09:59

by Jakub Kicinski

Subject: Re: [PATCH net-next 0/2] enable and use static_branch_deferred_inc

On Thu, 13 Jun 2019 11:08:14 -0400, Willem de Bruijn wrote:
> From: Willem de Bruijn <[email protected]>
>
> 1. make static_branch_deferred_inc available if !CONFIG_JUMP_LABEL
> 2. convert the existing STATIC_KEY_DEFERRED_FALSE user to this api

Reviewed-by: Jakub Kicinski <[email protected]>

Thanks/sorry :)

2019-06-15 02:33:38

by David Miller

Subject: Re: [PATCH net-next 0/2] enable and use static_branch_deferred_inc

From: Willem de Bruijn <[email protected]>
Date: Thu, 13 Jun 2019 11:08:14 -0400

> From: Willem de Bruijn <[email protected]>
>
> 1. make static_branch_deferred_inc available if !CONFIG_JUMP_LABEL
> 2. convert the existing STATIC_KEY_DEFERRED_FALSE user to this api

Series applied.