From patchwork Wed May 9 20:46:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Harold X-Patchwork-Id: 911172 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="Ij9MrG/Z"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40h7h41QMcz9s1w for ; Thu, 10 May 2018 06:47:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964891AbeEIUq5 (ORCPT ); Wed, 9 May 2018 16:46:57 -0400 Received: from mail-ot0-f202.google.com ([74.125.82.202]:35668 "EHLO mail-ot0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935279AbeEIUq4 (ORCPT ); Wed, 9 May 2018 16:46:56 -0400 Received: by mail-ot0-f202.google.com with SMTP id 37-v6so26324697otv.2 for ; Wed, 09 May 2018 13:46:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:date:message-id:subject:from:to:cc; bh=fp5TafikT4AoTolQzu7aHXIOT0ksAWRDraK2KsbvVj4=; b=Ij9MrG/Z115F//cTCgYzDI9AK/Xzfb6cFvBy4XnsR/WjtvCH8+0Y7C/LlvvVxRTXNF o9vNHCyIkrVm+DnO567IrnC91zeI/Uc/WerApAwoUvhvo5izwbQ6e70VF3uuKeNUVnGt YfmT5k5DmxI71JWBRBTWwfxm4RsH42Nrmocxcrrc1fxDs5aD2WdiPCjKhoYEkKGNACsI 9H9uINYmk8TOKuXq1XyODbNmN678PW86SEDsrHQ7Vr/0bQ2inpjab7h4qRqnJKr9nEK4 eVky0BnAFHD9wfqc3Zt0iJgOC7hs/2Dcopb9TbLm0PBZA15xbXTSEv8HT1zHOtqTzjqo KMXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc; bh=fp5TafikT4AoTolQzu7aHXIOT0ksAWRDraK2KsbvVj4=; b=ApnjI+zZ23jN5TA+KJHwPMGFLd2LFkTUFLB3+YYuiteQqtG4HKLVwZUY2jTslUdbNl sJqdvwO3nBiJ3PRQdTOHm78xDRDCnKpxl+VnSSETY9UMC5nzK6jczDg09A7D4zaVMmQk f7arATEUyjJ50il7mqUfh0XWqGQJh//JKw3tjvTHcaWOA6bqWNaZd0aPCla1IhzBvep9 QZ0sP9Yn2vRE2DSmEVPGcaV3hX7eEz4KGOdAAiWqVp+MGGQ4bSDnvg6eOHMz3d1CcEit xI5fF8Yhbdy0Yerhe6ucG1PTcrqs3CCzylbIwKP7foOssJm8E2vIsmgMz2LJT1JMNtQE MnHg== X-Gm-Message-State: ALQs6tBQzih+4WiEvPwPjNlNUtyFla3FW3Y0XXdsCpD26VicnSR110um fHi2sKh8rJT709wks7ywNo328mOd1+08z/GcdCIOxTM5b8uunt9ha5ar3lhFpAty7hAmSjJz9+1 wzI6G1eqOzw1sn3lv7D/NCZIOEQZELh6HgwYCvl2UQv12vl42hTbpuRjO9PdCKzFv X-Google-Smtp-Source: AB8JxZoDqFQoE4tPF9rlMV5gfVzBvmAhW9/9Yu2ni/x3kqP+zDvvDOPlr5fpOJWZVa+pBuCqXnqYhMP6Ox2T MIME-Version: 1.0 X-Received: by 2002:a9d:2e91:: with SMTP id w17-v6mr27022500ota.33.1525898815629; Wed, 09 May 2018 13:46:55 -0700 (PDT) Date: Wed, 9 May 2018 13:46:26 -0700 Message-Id: <20180509204626.56561-1-nharold@google.com> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog Subject: [PATCH ipsec-next] xfrm: Allow Output Mark to be Updated Using UPDSA From: Nathan Harold To: netdev@vger.kernel.org, nharold@google.com Cc: Nathan Harold Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Allow UPDSA to change output_mark to permit policy separation of packet routing decisions from SA keying in systems that use mark-based routing. In the output_mark, used as a routing and firewall mark for outbound packets, is made update-able which allows routing decisions to be handled independently of keying/SA creation. To maintain consistency with other optional attributes, the output mark is only updated if sent with a non-zero value. Once set, the output mark may not be reset to zero, which ensures that updating the SA does not require the mark to be re-sent to avoid the value being clobbered. The per-SA lock and the xfrm_state_lock are taken in that order to avoid a deadlock with xfrm_timer_handler(), which also takes the locks in that order. Signed-off-by: Nathan Harold Change-Id: Ia05c6733a94c1901cd1e54eb7c7e237704678d71 --- net/xfrm/xfrm_state.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index f595797a20ce..5d6085e81030 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -1554,6 +1554,13 @@ int xfrm_state_update(struct xfrm_state *x) if (x1->curlft.use_time) xfrm_state_check_expire(x1); + spin_lock_bh(&net->xfrm.xfrm_state_lock); + if (x->props.output_mark) { + x1->props.output_mark = x->props.output_mark; + __xfrm_state_bump_genids(x1); + } + spin_unlock_bh(&net->xfrm.xfrm_state_lock); + err = 0; x->km.state = XFRM_STATE_DEAD; __xfrm_state_put(x);