From patchwork Sun Mar 12 23:01:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Frederic Sowa X-Patchwork-Id: 737926 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 3vhGkr3xJSz9s78 for ; Mon, 13 Mar 2017 10:03:32 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=stressinduktion.org header.i=@stressinduktion.org header.b="Mt641xTv"; dkim=pass (1024-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="DJp0sbYV"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935784AbdCLXDb (ORCPT ); Sun, 12 Mar 2017 19:03:31 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:34973 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935672AbdCLXCV (ORCPT ); Sun, 12 Mar 2017 19:02:21 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id F2EC0206E6 for ; Sun, 12 Mar 2017 19:02:07 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute7.internal (MEProxy); Sun, 12 Mar 2017 19:02:07 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= stressinduktion.org; h=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=5n5XYWJmARgUaaHI+LCQ1I7ztRs=; b=Mt641x Tv0o/7W48LbCKOGpyQebZc4vrYMnh7NEcPJSyPkW69ZSTRNRITFQHcUWjdBDyVcy ihjRFl1s9jG9rZ/9Xzg37r7Y1D7gcppFfsX+7hcvNvCtfwgq4waQL3ghRUwKCeQe WQdyvphVVx2HiKZA+oQjvZfr4WESNSngwISms= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=smtpout; bh=5n5XYWJmARgUaaHI+LCQ1I7ztRs=; b=DJp0s bYVKZwTmpoNKFfPbNpAfvbvp6e/CnAaMVxcVWHsPjt/Sl8XIRXn5TFH6e5MNi8pE gmDTr3d5WuqjJHC/pEpEMhJ3zDNkgmX8jFWTKiVoaIYwJs3qkT/8zbKZ123g4GoE 9Kz5MdfXBQizO+W3TwP++hT3kgSw5ddkGInRlg= X-ME-Sender: X-Sasl-enc: Mf8g8wdZGZNAKV/osqh8NQry894RjG2/g2CSwj3ARfDu 1489359727 Received: from m.localhost.localhost (unknown [213.55.211.72]) by mail.messagingengine.com (Postfix) with ESMTPA id DA3A92436A for ; Sun, 12 Mar 2017 19:02:06 -0400 (EDT) From: Hannes Frederic Sowa To: netdev@vger.kernel.org Subject: [PATCH net-next RFC v1 16/27] afnetns: add udpv6 support Date: Mon, 13 Mar 2017 00:01:40 +0100 Message-Id: <20170312230151.5185-17-hannes@stressinduktion.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170312230151.5185-1-hannes@stressinduktion.org> References: <20170312230151.5185-1-hannes@stressinduktion.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Hannes Frederic Sowa --- net/ipv6/datagram.c | 6 ++++-- net/ipv6/udp.c | 18 +++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index eec27f87efaca1..cd811e8b1ba824 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -804,8 +804,10 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk, if (addr_type != IPV6_ADDR_ANY) { int strict = __ipv6_addr_src_scope(addr_type) <= IPV6_ADDR_SCOPE_LINKLOCAL; if (!(inet_sk(sk)->freebind || inet_sk(sk)->transparent) && - !ipv6_chk_addr(net, &src_info->ipi6_addr, - strict ? dev : NULL, 0) && + !ipv6_chk_addr_and_flags(net, sock_afnetns(sk), + &src_info->ipi6_addr, + strict ? dev : NULL, 0, + IFA_F_TENTATIVE) && !ipv6_chk_acast_addr_src(net, dev, &src_info->ipi6_addr)) err = -EINVAL; diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 4e4c401e3bc690..d63e0e362fe72b 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -126,6 +126,7 @@ static void udp_v6_rehash(struct sock *sk) } static int compute_score(struct sock *sk, struct net *net, + struct afnetns *afnetns, const struct in6_addr *saddr, __be16 sport, const struct in6_addr *daddr, unsigned short hnum, int dif, bool exact_dif) @@ -138,6 +139,9 @@ static int compute_score(struct sock *sk, struct net *net, sk->sk_family != PF_INET6) return -1; + if (sock_afnetns(sk) != afnetns) + return -1; + score = 0; inet = inet_sk(sk); @@ -173,6 +177,7 @@ static int compute_score(struct sock *sk, struct net *net, /* called with rcu_read_lock() */ static struct sock *udp6_lib_lookup2(struct net *net, + struct afnetns *afnetns, const struct in6_addr *saddr, __be16 sport, const struct in6_addr *daddr, unsigned int hnum, int dif, bool exact_dif, struct udp_hslot *hslot2, @@ -185,7 +190,7 @@ static struct sock *udp6_lib_lookup2(struct net *net, result = NULL; badness = -1; udp_portaddr_for_each_entry_rcu(sk, &hslot2->head) { - score = compute_score(sk, net, saddr, sport, + score = compute_score(sk, net, afnetns, saddr, sport, daddr, hnum, dif, exact_dif); if (score > badness) { reuseport = sk->sk_reuseport; @@ -224,8 +229,11 @@ struct sock *__udp6_lib_lookup(struct net *net, struct udp_hslot *hslot2, *hslot = &udptable->hash[slot]; bool exact_dif = udp6_lib_exact_dif_match(net, skb); int score, badness, matches = 0, reuseport = 0; + struct afnetns *afnetns; u32 hash = 0; + afnetns = ipv6_get_ifaddr_afnetns_rcu(net, daddr, skb->dev); + if (hslot->count > 10) { hash2 = udp6_portaddr_hash(net, daddr, hnum); slot2 = hash2 & udptable->mask; @@ -233,7 +241,7 @@ struct sock *__udp6_lib_lookup(struct net *net, if (hslot->count < hslot2->count) goto begin; - result = udp6_lib_lookup2(net, saddr, sport, + result = udp6_lib_lookup2(net, afnetns, saddr, sport, daddr, hnum, dif, exact_dif, hslot2, skb); if (!result) { @@ -248,7 +256,7 @@ struct sock *__udp6_lib_lookup(struct net *net, if (hslot->count < hslot2->count) goto begin; - result = udp6_lib_lookup2(net, saddr, sport, + result = udp6_lib_lookup2(net, afnetns, saddr, sport, daddr, hnum, dif, exact_dif, hslot2, skb); @@ -259,8 +267,8 @@ struct sock *__udp6_lib_lookup(struct net *net, result = NULL; badness = -1; sk_for_each_rcu(sk, &hslot->head) { - score = compute_score(sk, net, saddr, sport, daddr, hnum, dif, - exact_dif); + score = compute_score(sk, net, afnetns, saddr, sport, daddr, + hnum, dif, exact_dif); if (score > badness) { reuseport = sk->sk_reuseport; if (reuseport) {