From patchwork Fri Nov 15 17:48:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haller X-Patchwork-Id: 291635 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 C88182C00D1 for ; Sat, 16 Nov 2013 04:50:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752914Ab3KORuA (ORCPT ); Fri, 15 Nov 2013 12:50:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59125 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751869Ab3KORt6 (ORCPT ); Fri, 15 Nov 2013 12:49:58 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rAFHn9jq003512 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 15 Nov 2013 12:49:09 -0500 Received: from rh1.brq.redhat.com.com (dhcp-24-122.brq.redhat.com [10.34.24.122]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rAFHn4iB005362 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 15 Nov 2013 12:49:05 -0500 From: Thomas Haller To: jiri@resnulli.us, netdev@vger.kernel.org Cc: davem@davemloft.net, kuznet@ms2.inr.ac.ru, jmorris@namei.org, yoshfuji@linux-ipv6.org, kaber@trash.net, thaller@redhat.com, stephen@networkplumber.org, hannes@stressinduktion.org, vyasevich@gmail.com, dcbw@redhat.com Subject: [PATCH 1/1] fixup! ipv6 addrconf: introduce IFA_F_MANAGETEMPADDR to tell kernel to manage temporary addresses Date: Fri, 15 Nov 2013 18:48:46 +0100 Message-Id: <1384537726-14079-1-git-send-email-thaller@redhat.com> In-Reply-To: <1384181359-23199-3-git-send-email-jiri@resnulli.us> References: <1384181359-23199-3-git-send-email-jiri@resnulli.us> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Handle IFA_F_MANAGETEMPADDR flag when modifying existing addresses too. Signed-off-by: Thomas Haller --- Hi, I'd like to suggest this change, I think it makes it easier for the user space application to set this flag of (potentially) existing addresses. Note, that if the flag gets cleared if the ifa had it set before and the temporary addresses will exprire immediatly. This makes sense for me. Or if we don't want this, then the command should fail (EEXIST?) when trying to set MANAGETEMPADDR for an existing address that doesn't have the flag already. Thomas net/ipv6/addrconf.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 9e217b8..9e726c8 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -3613,20 +3613,21 @@ inet6_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh) return inet6_addr_del(net, ifm->ifa_index, pfx, ifm->ifa_prefixlen); } static int inet6_addr_modify(struct inet6_ifaddr *ifp, u32 ifa_flags, u32 prefered_lft, u32 valid_lft) { u32 flags; clock_t expires; unsigned long timeout; + int mngtmp; if (!valid_lft || (prefered_lft > valid_lft)) return -EINVAL; timeout = addrconf_timeout_fixup(valid_lft, HZ); if (addrconf_finite_timeout(timeout)) { expires = jiffies_to_clock_t(timeout * HZ); valid_lft = timeout; flags = RTF_EXPIRES; } else { @@ -3636,35 +3637,48 @@ static int inet6_addr_modify(struct inet6_ifaddr *ifp, u32 ifa_flags, } timeout = addrconf_timeout_fixup(prefered_lft, HZ); if (addrconf_finite_timeout(timeout)) { if (timeout == 0) ifa_flags |= IFA_F_DEPRECATED; prefered_lft = timeout; } spin_lock_bh(&ifp->lock); - ifp->flags = (ifp->flags & ~(IFA_F_DEPRECATED | IFA_F_PERMANENT | IFA_F_NODAD | IFA_F_HOMEADDRESS)) | ifa_flags; + if (ifa_flags & IFA_F_MANAGETEMPADDR && + (ifp->prefix_len != 64 || ifp->flags & IFA_F_TEMPORARY)) { + spin_unlock_bh(&ifp->lock); + return -EEXIST; + } + mngtmp = ifp->flags & IFA_F_MANAGETEMPADDR; + ifp->flags = (ifp->flags & ~(IFA_F_DEPRECATED | IFA_F_PERMANENT | IFA_F_NODAD | IFA_F_HOMEADDRESS | + IFA_F_MANAGETEMPADDR)) | ifa_flags; ifp->tstamp = jiffies; ifp->valid_lft = valid_lft; ifp->prefered_lft = prefered_lft; spin_unlock_bh(&ifp->lock); if (!(ifp->flags&IFA_F_TENTATIVE)) ipv6_ifa_notify(0, ifp); addrconf_prefix_route(&ifp->addr, ifp->prefix_len, ifp->idev->dev, expires, flags); - if (ifp->flags & IFA_F_MANAGETEMPADDR) - manage_tempaddrs(ifp->idev, ifp, valid_lft, prefered_lft, + if (mngtmp && !(ifa_flags & IFA_F_MANAGETEMPADDR)) { + /* expire the life time of the temporary addresses */ + manage_tempaddrs(ifp->idev, ifp, 0, 0, false, jiffies); + } else if (ifa_flags & IFA_F_MANAGETEMPADDR) { + /* if we did not yet mngtmp, create temporary addresses */ + manage_tempaddrs(ifp->idev, ifp, valid_lft, prefered_lft, + !mngtmp, jiffies); + } addrconf_verify(0); return 0; } static int inet6_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh) { struct net *net = sock_net(skb->sk); @@ -3710,23 +3724,20 @@ inet6_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh) if (ifa == NULL) { /* * It would be best to check for !NLM_F_CREATE here but * userspace alreay relies on not having to provide this. */ return inet6_addr_add(net, ifm->ifa_index, pfx, peer_pfx, ifm->ifa_prefixlen, ifa_flags, preferred_lft, valid_lft); } - /* We ignore IFA_F_MANAGETEMPADDR for modify. */ - ifa_flags &= ~IFA_F_MANAGETEMPADDR; - if (nlh->nlmsg_flags & NLM_F_EXCL || !(nlh->nlmsg_flags & NLM_F_REPLACE)) err = -EEXIST; else err = inet6_addr_modify(ifa, ifa_flags, preferred_lft, valid_lft); in6_ifa_put(ifa); return err; }