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

Commit 2717096a authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

[XFRM]: Fix aevent timer. 



Send aevent immediately if we have sent nothing since last timer and
this is the first packet.

Fixes a corner case when packet threshold is very high, the timer low
and a very low packet rate input which is bursty.

Signed-off-by: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6c97e72a

include/net/xfrm.h

+8 −0
Original line number Diff line number Diff line
@@ -143,6 +143,11 @@ struct xfrm_state 
	/* Replay detection state at the time we sent the last notification */

	struct xfrm_replay_state preplay;



	/* internal flag that only holds state for delayed aevent at the

	 * moment

	*/

	u32			xflags;



	/* Replay detection notification settings */

	u32			replay_maxage;

	u32			replay_maxdiff;
@@ -168,6 +173,9 @@ struct xfrm_state 
	void			*data;

};



/* xflags - make enum if more show up */

#define XFRM_TIME_DEFER	1



enum {

	XFRM_STATE_VOID,

	XFRM_STATE_ACQ,

net/xfrm/xfrm_state.c

+19 −6
Original line number Diff line number Diff line
@@ -805,16 +805,22 @@ void xfrm_replay_notify(struct xfrm_state *x, int event) 
	case XFRM_REPLAY_UPDATE:

		if (x->replay_maxdiff &&

		    (x->replay.seq - x->preplay.seq < x->replay_maxdiff) &&

		    (x->replay.oseq - x->preplay.oseq < x->replay_maxdiff))

		    (x->replay.oseq - x->preplay.oseq < x->replay_maxdiff)) {

			if (x->xflags & XFRM_TIME_DEFER)

				event = XFRM_REPLAY_TIMEOUT;

			else

				return;

		}



		break;



	case XFRM_REPLAY_TIMEOUT:

		if ((x->replay.seq == x->preplay.seq) &&

		    (x->replay.bitmap == x->preplay.bitmap) &&

		    (x->replay.oseq == x->preplay.oseq))

		    (x->replay.oseq == x->preplay.oseq)) {

			x->xflags |= XFRM_TIME_DEFER;

			return;

		}



		break;

	}
@@ -825,8 +831,10 @@ void xfrm_replay_notify(struct xfrm_state *x, int event) 
	km_state_notify(x, &c);



	if (x->replay_maxage &&

	    !mod_timer(&x->rtimer, jiffies + x->replay_maxage))

	    !mod_timer(&x->rtimer, jiffies + x->replay_maxage)) {

		xfrm_state_hold(x);

		x->xflags &= ~XFRM_TIME_DEFER;

	}

}

EXPORT_SYMBOL(xfrm_replay_notify);
@@ -836,10 +844,15 @@ static void xfrm_replay_timer_handler(unsigned long data) 


	spin_lock(&x->lock);



	if (xfrm_aevent_is_on() && x->km.state == XFRM_STATE_VALID)

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

		if (xfrm_aevent_is_on())

			xfrm_replay_notify(x, XFRM_REPLAY_TIMEOUT);

		else

			x->xflags |= XFRM_TIME_DEFER;

	}



	spin_unlock(&x->lock);

	xfrm_state_put(x);

}



int xfrm_replay_check(struct xfrm_state *x, u32 seq)