From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nathan Harold Subject: [PATCH ipsec-next] xfrm: Allow xfrmi if_id to be updated by UPDSA Date: Thu, 19 Jul 2018 19:07:47 -0700 Message-ID: <20180720020747.243630-1-nharold@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Cc: lorenzo@google.com, benedictwong@google.com, nharold@google.com To: netdev@vger.kernel.org Return-path: Received: from mail-io0-f202.google.com ([209.85.223.202]:48313 "EHLO mail-io0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730505AbeGTCyE (ORCPT ); Thu, 19 Jul 2018 22:54:04 -0400 Received: by mail-io0-f202.google.com with SMTP id t11-v6so7294764iog.15 for ; Thu, 19 Jul 2018 19:08:10 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: Allow attaching an SA to an xfrm interface id after the creation of the SA, so that tasks such as keying which must be done as the SA is created, can remain separate from the decision on how to route traffic from an SA. This permits SA creation to be decomposed in to three separate steps: 1) allocation of a SPI 2) algorithm and key negotiation 3) insertion into the data path Signed-off-by: Nathan Harold --- net/xfrm/xfrm_state.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 27c84e63c7ff..c4c563d9be47 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -1562,10 +1562,14 @@ int xfrm_state_update(struct xfrm_state *x) if (x1->curlft.use_time) xfrm_state_check_expire(x1); - if (x->props.smark.m || x->props.smark.v) { + if (x->props.smark.m || x->props.smark.v || x->if_id) { spin_lock_bh(&net->xfrm.xfrm_state_lock); - x1->props.smark = x->props.smark; + if (x->props.smark.m || x->props.smark.v) + x1->props.smark = x->props.smark; + + if (x->if_id) + x1->if_id = x->if_id; __xfrm_state_bump_genids(x1); spin_unlock_bh(&net->xfrm.xfrm_state_lock); -- 2.18.0.233.g985f88cf7e-goog