Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bb65a9cb953fdfe9c507e8dbb6c4ec2540484bd3

Authored by Li RongQing
Committed by Steffen Klassert
1 parent 483f777266
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

xfrm: removes a superfluous check and add a statistic 

Remove the check if x->km.state equal to XFRM_STATE_VALID in
xfrm_state_check_expire(), which will be done before call
xfrm_state_check_expire().

add a LINUX_MIB_XFRMOUTSTATEINVALID statistic to record the
outbound error due to invalid xfrm state.

Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

Showing 4 changed files with 8 additions and 3 deletions Side-by-side Diff

include/uapi/linux/snmp.h
Diff comments   View file @ bb65a9c
... ... @@ -278,6 +278,7 @@
278 278 LINUX_MIB_XFRMOUTPOLDEAD, /* XfrmOutPolDead */
279 279 LINUX_MIB_XFRMOUTPOLERROR, /* XfrmOutPolError */
280 280 LINUX_MIB_XFRMFWDHDRERROR, /* XfrmFwdHdrError*/
  281 + LINUX_MIB_XFRMOUTSTATEINVALID, /* XfrmOutStateInvalid */
281 282 __LINUX_MIB_XFRMMAX
282 283 };
283 284  
net/xfrm/xfrm_output.c
Diff comments   View file @ bb65a9c
... ... @@ -61,6 +61,12 @@
61 61 }
62 62  
63 63 spin_lock_bh(&x->lock);
  64 +
  65 + if (unlikely(x->km.state != XFRM_STATE_VALID)) {
  66 + XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTSTATEINVALID);
  67 + goto error_nolock;
  68 + }
  69 +
64 70 err = xfrm_state_check_expire(x);
65 71 if (err) {
66 72 XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTSTATEEXPIRED);
net/xfrm/xfrm_proc.c
Diff comments   View file @ bb65a9c
... ... @@ -43,6 +43,7 @@
43 43 SNMP_MIB_ITEM("XfrmOutPolDead", LINUX_MIB_XFRMOUTPOLDEAD),
44 44 SNMP_MIB_ITEM("XfrmOutPolError", LINUX_MIB_XFRMOUTPOLERROR),
45 45 SNMP_MIB_ITEM("XfrmFwdHdrError", LINUX_MIB_XFRMFWDHDRERROR),
  46 + SNMP_MIB_ITEM("XfrmOutStateInvalid", LINUX_MIB_XFRMOUTSTATEINVALID),
46 47 SNMP_MIB_SENTINEL
47 48 };
48 49  
net/xfrm/xfrm_state.c
Diff comments   View file @ bb65a9c
... ... @@ -1370,9 +1370,6 @@
1370 1370 if (!x->curlft.use_time)
1371 1371 x->curlft.use_time = get_seconds();
1372 1372  
1373   - if (x->km.state != XFRM_STATE_VALID)
1374   - return -EINVAL;
1375   -
1376 1373 if (x->curlft.bytes >= x->lft.hard_byte_limit ||
1377 1374 x->curlft.packets >= x->lft.hard_packet_limit) {
1378 1375 x->km.state = XFRM_STATE_EXPIRED;