Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb65a9cb authored by Li RongQing's avatar Li RongQing Committed by Steffen Klassert
Browse files

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: default avatarLi RongQing <roy.qing.li@gmail.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 483f7772

include/uapi/linux/snmp.h

+1 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ enum 
	LINUX_MIB_XFRMOUTPOLDEAD,		/* XfrmOutPolDead */

	LINUX_MIB_XFRMOUTPOLERROR,		/* XfrmOutPolError */

	LINUX_MIB_XFRMFWDHDRERROR,		/* XfrmFwdHdrError*/

	LINUX_MIB_XFRMOUTSTATEINVALID,		/* XfrmOutStateInvalid */

	__LINUX_MIB_XFRMMAX

};

net/xfrm/xfrm_output.c

+6 −0
Original line number Diff line number Diff line
@@ -61,6 +61,12 @@ static int xfrm_output_one(struct sk_buff *skb, int err) 
		}



		spin_lock_bh(&x->lock);



		if (unlikely(x->km.state != XFRM_STATE_VALID)) {

			XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTSTATEINVALID);

			goto error_nolock;

		}



		err = xfrm_state_check_expire(x);

		if (err) {

			XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTSTATEEXPIRED);

net/xfrm/xfrm_proc.c

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ static const struct snmp_mib xfrm_mib_list[] = { 
	SNMP_MIB_ITEM("XfrmOutPolDead", LINUX_MIB_XFRMOUTPOLDEAD),

	SNMP_MIB_ITEM("XfrmOutPolError", LINUX_MIB_XFRMOUTPOLERROR),

	SNMP_MIB_ITEM("XfrmFwdHdrError", LINUX_MIB_XFRMFWDHDRERROR),

	SNMP_MIB_ITEM("XfrmOutStateInvalid", LINUX_MIB_XFRMOUTSTATEINVALID),

	SNMP_MIB_SENTINEL

};

net/xfrm/xfrm_state.c

+0 −3
Original line number Diff line number Diff line
@@ -1370,9 +1370,6 @@ int xfrm_state_check_expire(struct xfrm_state *x) 
	if (!x->curlft.use_time)

		x->curlft.use_time = get_seconds();



	if (x->km.state != XFRM_STATE_VALID)

		return -EINVAL;



	if (x->curlft.bytes >= x->lft.hard_byte_limit ||

	    x->curlft.packets >= x->lft.hard_packet_limit) {

		x->km.state = XFRM_STATE_EXPIRED;