Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/811339/?format=api
{ "id": 811339, "url": "http://patchwork.ozlabs.org/api/patches/811339/?format=api", "web_url": "http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/20170908070018.4141-7-daniel.axtens@canonical.com/", "project": { "id": 15, "url": "http://patchwork.ozlabs.org/api/projects/15/?format=api", "name": "Ubuntu Kernel", "link_name": "ubuntu-kernel", "list_id": "kernel-team.lists.ubuntu.com", "list_email": "kernel-team@lists.ubuntu.com", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170908070018.4141-7-daniel.axtens@canonical.com>", "list_archive_url": null, "date": "2017-09-08T07:00:17", "name": "[SRU,Zesty,6/7] net: use dst_confirm_neigh for UDP, RAW, ICMP, L2TP", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "7ab4efa0a2910d14ce58d83229b2adeeb5c33edb", "submitter": { "id": 71548, "url": "http://patchwork.ozlabs.org/api/people/71548/?format=api", "name": "Daniel Axtens", "email": "daniel.axtens@canonical.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/20170908070018.4141-7-daniel.axtens@canonical.com/mbox/", "series": [ { "id": 2111, "url": "http://patchwork.ozlabs.org/api/series/2111/?format=api", "web_url": "http://patchwork.ozlabs.org/project/ubuntu-kernel/list/?series=2111", "date": "2017-09-08T07:00:11", "name": "Fixes for LP#1715812", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/2111/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/811339/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/811339/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<kernel-team-bounces@lists.ubuntu.com>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com\n\t(client-ip=91.189.94.19; helo=huckleberry.canonical.com;\n\tenvelope-from=kernel-team-bounces@lists.ubuntu.com;\n\treceiver=<UNKNOWN>)", "Received": [ "from huckleberry.canonical.com (huckleberry.canonical.com\n\t[91.189.94.19])\n\tby ozlabs.org (Postfix) with ESMTP id 3xpSrw4Rxhz9t16;\n\tFri, 8 Sep 2017 17:00:48 +1000 (AEST)", "from localhost ([127.0.0.1] helo=huckleberry.canonical.com)\n\tby huckleberry.canonical.com with esmtp (Exim 4.86_2)\n\t(envelope-from <kernel-team-bounces@lists.ubuntu.com>)\n\tid 1dqDHR-0000vS-Hf; Fri, 08 Sep 2017 07:00:45 +0000", "from youngberry.canonical.com ([91.189.89.112])\n\tby huckleberry.canonical.com with esmtps\n\t(TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128)\n\t(Exim 4.86_2) (envelope-from <daniel.axtens@canonical.com>)\n\tid 1dqDHP-0000tf-Ea\n\tfor kernel-team@lists.canonical.com; Fri, 08 Sep 2017 07:00:43 +0000", "from mail-pf0-f200.google.com ([209.85.192.200])\n\tby youngberry.canonical.com with esmtps\n\t(TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.76) (envelope-from <daniel.axtens@canonical.com>)\n\tid 1dqDHO-00039i-UJ\n\tfor kernel-team@lists.canonical.com; Fri, 08 Sep 2017 07:00:43 +0000", "by mail-pf0-f200.google.com with SMTP id q76so3469936pfq.5\n\tfor <kernel-team@lists.canonical.com>;\n\tFri, 08 Sep 2017 00:00:42 -0700 (PDT)", "from localhost.localdomain (124-171-202-56.dyn.iinet.net.au.\n\t[124.171.202.56]) by smtp.gmail.com with ESMTPSA id\n\t125sm2138129pff.5.2017.09.08.00.00.38\n\tfor <kernel-team@lists.canonical.com>\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tFri, 08 Sep 2017 00:00:40 -0700 (PDT)" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=buKUZpUvpXsDiWoFHxu7bDQIXWjGZFAWqPqg1x95P4g=;\n\tb=oIMm2o+i6UCDR/GBDMK5svZRDgOHVMGL42/ROjNwZ2FQFR+qBuiA3D9WmOLL0mVhQQ\n\teUmefBj2q6jigKgdjy9iqv5YpUy8NjgOkJ6pjASN8BqTJBkUPddlZaWZX0KX6LYGtG9I\n\tHP3WRjYla5P5/lJSEU8qidMRQClhKrNMbAYB4k3FVddqGIpEYWIIz5WonsXhv6wMjDQE\n\tGpMYpkR4BhJ+FAz6a0VbkY5qhELLdFYH2TgeRMawxyFxK0ihmQPNOo0sP+WmhTWarTvu\n\tEnltfg7/7uQa2/KvSlz/13LnN/cmlyBXvyKsHJZOOQXPULp0zn+Tcw+v5cPueBgfKH5X\n\tDJmA==", "X-Gm-Message-State": "AHPjjUgPA/ZNus5qwrcuG/DfKdQVfRrqVb2/XP3Vg0P6eF2BRvHZgZpd\n\tJuR10u/fQmDl9Jm05Ge+xw226LS27Jqf2zRKt9/1EpYLL/nfa9qKOfucKWBsdhBMrPhMYX+LStg\n\tXt1iGUgvaspThRFNA8Jdq9VY6FJ6huslo56f/Mq4=", "X-Received": [ "by 10.98.7.67 with SMTP id b64mr2092544pfd.194.1504854040997;\n\tFri, 08 Sep 2017 00:00:40 -0700 (PDT)", "by 10.98.7.67 with SMTP id b64mr2092520pfd.194.1504854040738;\n\tFri, 08 Sep 2017 00:00:40 -0700 (PDT)" ], "X-Google-Smtp-Source": "ADKCNb4KBgYtjHKfO54qxah11H7Rf1MJARRaf6WlJkQYGHQl44nALYadPJBIS7eHl67elD4AyHlD5g==", "From": "Daniel Axtens <daniel.axtens@canonical.com>", "To": "kernel-team@lists.canonical.com", "Subject": "[SRU][Zesty][PATCH 6/7] net: use dst_confirm_neigh for UDP, RAW,\n\tICMP, L2TP", "Date": "Fri, 8 Sep 2017 17:00:17 +1000", "Message-Id": "<20170908070018.4141-7-daniel.axtens@canonical.com>", "X-Mailer": "git-send-email 2.11.0", "In-Reply-To": "<20170908070018.4141-1-daniel.axtens@canonical.com>", "References": "<20170908070018.4141-1-daniel.axtens@canonical.com>", "X-BeenThere": "kernel-team@lists.ubuntu.com", "X-Mailman-Version": "2.1.20", "Precedence": "list", "List-Id": "Kernel team discussions <kernel-team.lists.ubuntu.com>", "List-Unsubscribe": "<https://lists.ubuntu.com/mailman/options/kernel-team>,\n\t<mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe>", "List-Archive": "<https://lists.ubuntu.com/archives/kernel-team>", "List-Post": "<mailto:kernel-team@lists.ubuntu.com>", "List-Help": "<mailto:kernel-team-request@lists.ubuntu.com?subject=help>", "List-Subscribe": "<https://lists.ubuntu.com/mailman/listinfo/kernel-team>,\n\t<mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "kernel-team-bounces@lists.ubuntu.com", "Sender": "\"kernel-team\" <kernel-team-bounces@lists.ubuntu.com>" }, "content": "From: Julian Anastasov <ja@ssi.bg>\n\nBugLink: https://bugs.launchpad.net/bugs/1715812\n\nWhen same struct dst_entry can be used for many different\nneighbours we can not use it for pending confirmations.\n\nThe datagram protocols can use MSG_CONFIRM to confirm the\nneighbour. When used with MSG_PROBE we do not reach the\ncode where neighbour is confirmed, so we have to do the\nsame slow lookup by using the dst_confirm_neigh() helper.\nWhen MSG_PROBE is not used, ip_append_data/ip6_append_data\nwill set the skb flag dst_pending_confirm.\n\nReported-by: YueHaibing <yuehaibing@huawei.com>\nFixes: 5110effee8fd (\"net: Do delayed neigh confirmation.\")\nFixes: f2bb4bedf35d (\"ipv4: Cache output routes in fib_info nexthops.\")\nSigned-off-by: Julian Anastasov <ja@ssi.bg>\nAcked-by: Eric Dumazet <edumazet@google.com>\nSigned-off-by: David S. Miller <davem@davemloft.net>\n(cherry picked from commit 0dec879f636f11b0ffda1cb5fd96a1754c59ead3)\nSigned-off-by: Daniel Axtens <daniel.axtens@canonical.com>\n---\n net/ipv4/ip_output.c | 6 ++++++\n net/ipv4/ping.c | 3 ++-\n net/ipv4/raw.c | 6 +++++-\n net/ipv4/udp.c | 3 ++-\n net/ipv6/ip6_output.c | 6 ++++++\n net/ipv6/raw.c | 6 +++++-\n net/ipv6/route.c | 27 ++++++++++++++-------------\n net/ipv6/udp.c | 3 ++-\n net/l2tp/l2tp_ip6.c | 3 ++-\n 9 files changed, 44 insertions(+), 19 deletions(-)", "diff": "diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c\nindex 8c85cad2b2af..2b558a01c3a9 100644\n--- a/net/ipv4/ip_output.c\n+++ b/net/ipv4/ip_output.c\n@@ -889,6 +889,9 @@ static inline int ip_ufo_append_data(struct sock *sk,\n \n \t\tskb->csum = 0;\n \n+\t\tif (flags & MSG_CONFIRM)\n+\t\t\tskb_set_dst_pending_confirm(skb, 1);\n+\n \t\t__skb_queue_tail(queue, skb);\n \t} else if (skb_is_gso(skb)) {\n \t\tgoto append;\n@@ -1091,6 +1094,9 @@ static int __ip_append_data(struct sock *sk,\n \t\t\texthdrlen = 0;\n \t\t\tcsummode = CHECKSUM_NONE;\n \n+\t\t\tif ((flags & MSG_CONFIRM) && !skb_prev)\n+\t\t\t\tskb_set_dst_pending_confirm(skb, 1);\n+\n \t\t\t/*\n \t\t\t * Put the packet on the pending queue.\n \t\t\t */\ndiff --git a/net/ipv4/ping.c b/net/ipv4/ping.c\nindex 51e2f3c5e954..4f2d94c5f91f 100644\n--- a/net/ipv4/ping.c\n+++ b/net/ipv4/ping.c\n@@ -851,7 +851,8 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)\n \treturn err;\n \n do_confirm:\n-\tdst_confirm(&rt->dst);\n+\tif (msg->msg_flags & MSG_PROBE)\n+\t\tdst_confirm_neigh(&rt->dst, &fl4.daddr);\n \tif (!(msg->msg_flags & MSG_PROBE) || len)\n \t\tgoto back_from_confirm;\n \terr = 0;\ndiff --git a/net/ipv4/raw.c b/net/ipv4/raw.c\nindex 259fbcd8c479..43b0297ed980 100644\n--- a/net/ipv4/raw.c\n+++ b/net/ipv4/raw.c\n@@ -386,6 +386,9 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4,\n \n \tsock_tx_timestamp(sk, sockc->tsflags, &skb_shinfo(skb)->tx_flags);\n \n+\tif (flags & MSG_CONFIRM)\n+\t\tskb_set_dst_pending_confirm(skb, 1);\n+\n \tskb->transport_header = skb->network_header;\n \terr = -EFAULT;\n \tif (memcpy_from_msg(iph, msg, length))\n@@ -669,7 +672,8 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)\n \treturn len;\n \n do_confirm:\n-\tdst_confirm(&rt->dst);\n+\tif (msg->msg_flags & MSG_PROBE)\n+\t\tdst_confirm_neigh(&rt->dst, &fl4.daddr);\n \tif (!(msg->msg_flags & MSG_PROBE) || len)\n \t\tgoto back_from_confirm;\n \terr = 0;\ndiff --git a/net/ipv4/udp.c b/net/ipv4/udp.c\nindex 2d20e23ea420..8a75840c5d84 100644\n--- a/net/ipv4/udp.c\n+++ b/net/ipv4/udp.c\n@@ -1113,7 +1113,8 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)\n \treturn err;\n \n do_confirm:\n-\tdst_confirm(&rt->dst);\n+\tif (msg->msg_flags & MSG_PROBE)\n+\t\tdst_confirm_neigh(&rt->dst, &fl4->daddr);\n \tif (!(msg->msg_flags&MSG_PROBE) || len)\n \t\tgoto back_from_confirm;\n \terr = 0;\ndiff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c\nindex 7ceac3b8694a..d50322b51fa7 100644\n--- a/net/ipv6/ip6_output.c\n+++ b/net/ipv6/ip6_output.c\n@@ -1158,6 +1158,9 @@ static inline int ip6_ufo_append_data(struct sock *sk,\n \t\tskb->protocol = htons(ETH_P_IPV6);\n \t\tskb->csum = 0;\n \n+\t\tif (flags & MSG_CONFIRM)\n+\t\t\tskb_set_dst_pending_confirm(skb, 1);\n+\n \t\t__skb_queue_tail(queue, skb);\n \t} else if (skb_is_gso(skb)) {\n \t\tgoto append;\n@@ -1532,6 +1535,9 @@ static int __ip6_append_data(struct sock *sk,\n \t\t\texthdrlen = 0;\n \t\t\tdst_exthdrlen = 0;\n \n+\t\t\tif ((flags & MSG_CONFIRM) && !skb_prev)\n+\t\t\t\tskb_set_dst_pending_confirm(skb, 1);\n+\n \t\t\t/*\n \t\t\t * Put the packet on the pending queue\n \t\t\t */\ndiff --git a/net/ipv6/raw.c b/net/ipv6/raw.c\nindex 6006b3281a2e..1f992d9e261d 100644\n--- a/net/ipv6/raw.c\n+++ b/net/ipv6/raw.c\n@@ -656,6 +656,9 @@ static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,\n \n \tskb->ip_summed = CHECKSUM_NONE;\n \n+\tif (flags & MSG_CONFIRM)\n+\t\tskb_set_dst_pending_confirm(skb, 1);\n+\n \tskb->transport_header = skb->network_header;\n \terr = memcpy_from_msg(iph, msg, length);\n \tif (err)\n@@ -936,7 +939,8 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)\n \ttxopt_put(opt_to_free);\n \treturn err < 0 ? err : len;\n do_confirm:\n-\tdst_confirm(dst);\n+\tif (msg->msg_flags & MSG_PROBE)\n+\t\tdst_confirm_neigh(dst, &fl6.daddr);\n \tif (!(msg->msg_flags & MSG_PROBE) || len)\n \t\tgoto back_from_confirm;\n \terr = 0;\ndiff --git a/net/ipv6/route.c b/net/ipv6/route.c\nindex 9737526aefdf..d319256db79a 100644\n--- a/net/ipv6/route.c\n+++ b/net/ipv6/route.c\n@@ -1375,6 +1375,7 @@ static bool rt6_cache_allowed_for_pmtu(const struct rt6_info *rt)\n static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk,\n \t\t\t\t const struct ipv6hdr *iph, u32 mtu)\n {\n+\tconst struct in6_addr *daddr, *saddr;\n \tstruct rt6_info *rt6 = (struct rt6_info *)dst;\n \n \tif (rt6->rt6i_flags & RTF_LOCAL)\n@@ -1383,26 +1384,26 @@ static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk,\n \tif (dst_metric_locked(dst, RTAX_MTU))\n \t\treturn;\n \n-\tdst_confirm(dst);\n+\tif (iph) {\n+\t\tdaddr = &iph->daddr;\n+\t\tsaddr = &iph->saddr;\n+\t} else if (sk) {\n+\t\tdaddr = &sk->sk_v6_daddr;\n+\t\tsaddr = &inet6_sk(sk)->saddr;\n+\t} else {\n+\t\tdaddr = NULL;\n+\t\tsaddr = NULL;\n+\t}\n+\tdst_confirm_neigh(dst, daddr);\n \tmtu = max_t(u32, mtu, IPV6_MIN_MTU);\n \tif (mtu >= dst_mtu(dst))\n \t\treturn;\n \n \tif (!rt6_cache_allowed_for_pmtu(rt6)) {\n \t\trt6_do_update_pmtu(rt6, mtu);\n-\t} else {\n-\t\tconst struct in6_addr *daddr, *saddr;\n+\t} else if (daddr) {\n \t\tstruct rt6_info *nrt6;\n \n-\t\tif (iph) {\n-\t\t\tdaddr = &iph->daddr;\n-\t\t\tsaddr = &iph->saddr;\n-\t\t} else if (sk) {\n-\t\t\tdaddr = &sk->sk_v6_daddr;\n-\t\t\tsaddr = &inet6_sk(sk)->saddr;\n-\t\t} else {\n-\t\t\treturn;\n-\t\t}\n \t\tnrt6 = ip6_rt_cache_alloc(rt6, daddr, saddr);\n \t\tif (nrt6) {\n \t\t\trt6_do_update_pmtu(nrt6, mtu);\n@@ -2278,7 +2279,7 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu\n \t * Look, redirects are sent only in response to data packets,\n \t * so that this nexthop apparently is reachable. --ANK\n \t */\n-\tdst_confirm(&rt->dst);\n+\tdst_confirm_neigh(&rt->dst, &ipv6_hdr(skb)->saddr);\n \n \tneigh = __neigh_lookup(&nd_tbl, &msg->target, skb->dev, 1);\n \tif (!neigh)\ndiff --git a/net/ipv6/udp.c b/net/ipv6/udp.c\nindex 0770f95f5e1c..7b01ee260f56 100644\n--- a/net/ipv6/udp.c\n+++ b/net/ipv6/udp.c\n@@ -1299,7 +1299,8 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)\n \treturn err;\n \n do_confirm:\n-\tdst_confirm(dst);\n+\tif (msg->msg_flags & MSG_PROBE)\n+\t\tdst_confirm_neigh(dst, &fl6.daddr);\n \tif (!(msg->msg_flags&MSG_PROBE) || len)\n \t\tgoto back_from_confirm;\n \terr = 0;\ndiff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c\nindex 4e4fa1538cbb..9f7a516ca808 100644\n--- a/net/l2tp/l2tp_ip6.c\n+++ b/net/l2tp/l2tp_ip6.c\n@@ -651,7 +651,8 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)\n \treturn err < 0 ? err : len;\n \n do_confirm:\n-\tdst_confirm(dst);\n+\tif (msg->msg_flags & MSG_PROBE)\n+\t\tdst_confirm_neigh(dst, &fl6.daddr);\n \tif (!(msg->msg_flags & MSG_PROBE) || len)\n \t\tgoto back_from_confirm;\n \terr = 0;\n", "prefixes": [ "SRU", "Zesty", "6/7" ] }