From patchwork Wed Dec 16 09:50:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 557366 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3C6B91402D6 for ; Wed, 16 Dec 2015 20:50:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=qOgnMjvi; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934093AbbLPJuT (ORCPT ); Wed, 16 Dec 2015 04:50:19 -0500 Received: from mail-pa0-f43.google.com ([209.85.220.43]:35550 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933999AbbLPJuR (ORCPT ); Wed, 16 Dec 2015 04:50:17 -0500 Received: by mail-pa0-f43.google.com with SMTP id hk6so21075527pad.2 for ; Wed, 16 Dec 2015 01:50:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=VRjZ5vi9exLw6JMhjBXcmPcS/yAO/bVMi9Y1tioUvUA=; b=qOgnMjvinZMqjM7xdC4PNMlVv/LyyfMA31tfJJpkwDDSrJeKafrjUwh9ct2ABlwj0O Z8HhNHN7qa27rGh0Jq5TrYqKdoChpnoT6kQmdtfzp0UTTBOKWeiYb16dCI+otipdoqCy JiZFrJ1kfF+N5WcU4JryyIhutwWEXm7bhVXFrGQcn69bo8sZwnTECV0pZ1NGUYhapan0 HBVL+35LZ2uHUawVXo/ECecys3jSBtHkD5Q8JPwP5eYJie7vepBIGaDT4IRJf9Bv1B3M +JS93GjHsBOSun9VwOHGrqVPGvhZEj/TpoRSoPpAe4pKQ9V4kWuuBt1NadvBRKyUkAkm ooXA== X-Received: by 10.66.116.81 with SMTP id ju17mr55035895pab.59.1450259417190; Wed, 16 Dec 2015 01:50:17 -0800 (PST) Received: from localhost (138.128.208.20.16clouds.com. [138.128.208.20]) by smtp.gmail.com with ESMTPSA id q67sm3541287pfi.81.2015.12.16.01.50.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Dec 2015 01:50:16 -0800 (PST) From: Xin Long To: network dev Cc: davem@davemloft.net, Hannes Frederic Sowa Subject: [PATCHv3 net-next] ipv6: allow routes to be configured with expire values Date: Wed, 16 Dec 2015 17:50:11 +0800 Message-Id: <3b977653c7ade52e180d754eb660ec66af212e94.1450259411.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add the support for adding expire value to routes, requested by Tom Gundersen for systemd-networkd, and NetworkManager wants it too. implement it by adding the new RTNETLINK attribute RTA_EXPIRES. Signed-off-by: Xin Long Acked-by: Hannes Frederic Sowa --- include/uapi/linux/rtnetlink.h | 1 + net/ipv6/route.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h index 123a5af..ca764b5 100644 --- a/include/uapi/linux/rtnetlink.h +++ b/include/uapi/linux/rtnetlink.h @@ -311,6 +311,7 @@ enum rtattr_type_t { RTA_PREF, RTA_ENCAP_TYPE, RTA_ENCAP, + RTA_EXPIRES, __RTA_MAX }; diff --git a/net/ipv6/route.c b/net/ipv6/route.c index c83b6a5..3c8834b 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -2709,6 +2709,7 @@ static const struct nla_policy rtm_ipv6_policy[RTA_MAX+1] = { [RTA_PREF] = { .type = NLA_U8 }, [RTA_ENCAP_TYPE] = { .type = NLA_U16 }, [RTA_ENCAP] = { .type = NLA_NESTED }, + [RTA_EXPIRES] = { .type = NLA_U32 }, }; static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh, @@ -2809,6 +2810,15 @@ static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh, if (tb[RTA_ENCAP_TYPE]) cfg->fc_encap_type = nla_get_u16(tb[RTA_ENCAP_TYPE]); + if (tb[RTA_EXPIRES]) { + unsigned long timeout = addrconf_timeout_fixup(nla_get_u32(tb[RTA_EXPIRES]), HZ); + + if (addrconf_finite_timeout(timeout)) { + cfg->fc_expires = jiffies_to_clock_t(timeout * HZ); + cfg->fc_flags |= RTF_EXPIRES; + } + } + err = 0; errout: return err;