hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netfilter: conntrack: avoid same-timeout update 

No need to dirty a cache line if timeout is unchanged.
Also, WARN() is useless here: we crash on 'skb->len' access
if skb is NULL.

Last, ct->timeout is u32, not 'unsigned long' so adapt the
function prototype accordingly.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal 2019-02-21 15:38:29 +01:00 committed by Pablo Neira Ayuso
parent d2c5c103b1
commit cc16921351
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/net/netfilter/nf_conntrack.h
View File

@ -190,23 +190,23 @@ bool nf_ct_get_tuplepr(const struct sk_buff *skb, unsigned int nhoff,
void __nf_ct_refresh_acct(struct nf_conn *ct, enum ip_conntrack_info ctinfo, void __nf_ct_refresh_acct(struct nf_conn *ct, enum ip_conntrack_info ctinfo,
const struct sk_buff *skb, const struct sk_buff *skb,
unsigned long extra_jiffies, int do_acct); u32 extra_jiffies, bool do_acct);
/* Refresh conntrack for this many jiffies and do accounting */ /* Refresh conntrack for this many jiffies and do accounting */
static inline void nf_ct_refresh_acct(struct nf_conn *ct, static inline void nf_ct_refresh_acct(struct nf_conn *ct,
enum ip_conntrack_info ctinfo, enum ip_conntrack_info ctinfo,
const struct sk_buff *skb, const struct sk_buff *skb,
unsigned long extra_jiffies) u32 extra_jiffies)
{ {
__nf_ct_refresh_acct(ct, ctinfo, skb, extra_jiffies, 1); __nf_ct_refresh_acct(ct, ctinfo, skb, extra_jiffies, true);
} }
/* Refresh conntrack for this many jiffies */ /* Refresh conntrack for this many jiffies */
static inline void nf_ct_refresh(struct nf_conn *ct, static inline void nf_ct_refresh(struct nf_conn *ct,
const struct sk_buff *skb, const struct sk_buff *skb,
unsigned long extra_jiffies) u32 extra_jiffies)
{ {
__nf_ct_refresh_acct(ct, 0, skb, extra_jiffies, 0); __nf_ct_refresh_acct(ct, 0, skb, extra_jiffies, false);
} }
/* kill conntrack and do accounting */ /* kill conntrack and do accounting */

9
net/netfilter/nf_conntrack_core.c
View File

@ -1751,11 +1751,9 @@ EXPORT_SYMBOL_GPL(nf_conntrack_alter_reply);
void __nf_ct_refresh_acct(struct nf_conn *ct, void __nf_ct_refresh_acct(struct nf_conn *ct,
enum ip_conntrack_info ctinfo, enum ip_conntrack_info ctinfo,
const struct sk_buff *skb, const struct sk_buff *skb,
unsigned long extra_jiffies, u32 extra_jiffies,
int do_acct) bool do_acct)
{ {
WARN_ON(!skb);
/* Only update if this is not a fixed timeout */ /* Only update if this is not a fixed timeout */
if (test_bit(IPS_FIXED_TIMEOUT_BIT, &ct->status)) if (test_bit(IPS_FIXED_TIMEOUT_BIT, &ct->status))
goto acct; goto acct;
@ -1764,7 +1762,8 @@ void __nf_ct_refresh_acct(struct nf_conn *ct,
if (nf_ct_is_confirmed(ct)) if (nf_ct_is_confirmed(ct))
extra_jiffies += nfct_time_stamp; extra_jiffies += nfct_time_stamp;
ct->timeout = extra_jiffies; if (ct->timeout != extra_jiffies)
ct->timeout = extra_jiffies;
acct: acct:
if (do_acct) if (do_acct)
nf_ct_acct_update(ct, ctinfo, skb->len); nf_ct_acct_update(ct, ctinfo, skb->len);