netfilter: flowtable: avoid possible false sharing
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/2 netfilter: flowtable: avoid possible false sharing
The flowtable follows the same timeout approach as conntrack, use the same idiom as in cc16921351d8 ("netfilter: conntrack: avoid same-timeout update") but also include the fix provided by e37542ba111f ("netfilter:
conntrack: avoid possible false sharing").
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nf_flow_table_core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/netfilter/nf_flow_table_core.c +5 -1
@@ -331,7 +331,11 @@ EXPORT_SYMBOL_GPL(flow_offload_add);void flow_offload_refresh (struct nf_flowtable *flow_table,struct flow_offload *flow) { - flow->timeout = nf_flowtable_time_stamp +flow_offload_get_timeout (flow); +u32 timeout; + + timeout = nf_flowtable_time_stamp +flow_offload_get_timeout (flow); +if (READ_ONCE (flow->timeout) != timeout) +WRITE_ONCE (flow->timeout, timeout);if (likely (!nf_flowtable_hw_offload (flow_table)))return ;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/2 netfilter: nft_last: avoid possible false sharing
Use the idiom described in:
https://github.com/google/ktsan/wiki/READ_ONCE-and-WRITE_ONCE#it-may-improve-performance
Moreover, prevent a compiler optimization.
Fixes 836382dc2471 ("netfilter: nf_tables: add last expression")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nft_last.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
net/netfilter/nft_last.c +13 -7
@@ -48,24 +48,30 @@ static void nft_last_eval(const struct nft_expr *expr, {struct nft_last_priv *priv =nft_expr_priv (expr); - priv->last_jiffies = jiffies; - priv->last_set =1 ; +if (READ_ONCE (priv->last_set) ==0 ) +WRITE_ONCE (priv->last_set,1 ); +if (READ_ONCE (priv->last_jiffies) != jiffies) +WRITE_ONCE (priv->last_jiffies, jiffies); }static int nft_last_dump (struct sk_buff *skb,const struct nft_expr *expr) {struct nft_last_priv *priv =nft_expr_priv (expr); +unsigned long last_jiffies =READ_ONCE (priv->last_jiffies); +u32 last_set =READ_ONCE (priv->last_set);__be64 msecs; -if (time_before (jiffies, priv->last_jiffies)) - priv->last_set =0 ; +if (time_before (jiffies, last_jiffies)) { +WRITE_ONCE (priv->last_set,0 ); + last_set =0 ; + } -if (priv->last_set) - msecs =nf_jiffies64_to_msecs (jiffies - priv->last_jiffies); +if (last_set) + msecs =nf_jiffies64_to_msecs (jiffies - last_jiffies);else msecs =0 ; -if (nla_put_be32 (skb,NFTA_LAST_SET ,htonl (priv->last_set)) || +if (nla_put_be32 (skb,NFTA_LAST_SET ,htonl (last_set)) ||nla_put_be64 (skb,NFTA_LAST_MSECS , msecs,NFTA_LAST_PAD )) goto nla_put_failure;
Signature · 1 line
2.30.2