{"id":811348,"url":"http://patchwork.ozlabs.org/api/patches/811348/?format=json","web_url":"http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/20170908070142.4440-8-daniel.axtens@canonical.com/","project":{"id":15,"url":"http://patchwork.ozlabs.org/api/projects/15/?format=json","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":"<20170908070142.4440-8-daniel.axtens@canonical.com>","list_archive_url":null,"date":"2017-09-08T07:01:42","name":"[SRU,Xenial,7/7] net: pending_confirm is not used anymore","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"1eea9f28d4a212c91935fdfb4a00ee6c977fa816","submitter":{"id":71548,"url":"http://patchwork.ozlabs.org/api/people/71548/?format=json","name":"Daniel Axtens","email":"daniel.axtens@canonical.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/20170908070142.4440-8-daniel.axtens@canonical.com/mbox/","series":[{"id":2112,"url":"http://patchwork.ozlabs.org/api/series/2112/?format=json","web_url":"http://patchwork.ozlabs.org/project/ubuntu-kernel/list/?series=2112","date":"2017-09-08T07:01:35","name":"Fixes for LP#1715812","version":1,"mbox":"http://patchwork.ozlabs.org/series/2112/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811348/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811348/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","Received":["from huckleberry.canonical.com (huckleberry.canonical.com\n\t[91.189.94.19])\n\tby ozlabs.org (Postfix) with ESMTP id 3xpStX2vC1z9s83;\n\tFri, 8 Sep 2017 17:02:12 +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 )\n\tid 1dqDIn-0001Nz-IR; Fri, 08 Sep 2017 07:02:09 +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 )\n\tid 1dqDIk-0001MA-N0\n\tfor kernel-team@lists.canonical.com; Fri, 08 Sep 2017 07:02:06 +0000","from mail-pg0-f72.google.com ([74.125.83.72])\n\tby youngberry.canonical.com with esmtps\n\t(TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.76) (envelope-from )\n\tid 1dqDIk-0003Df-BR\n\tfor kernel-team@lists.canonical.com; Fri, 08 Sep 2017 07:02:06 +0000","by mail-pg0-f72.google.com with SMTP id v82so3635506pgb.5\n\tfor ;\n\tFri, 08 Sep 2017 00:02:06 -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\th1sm2255518pfg.153.2017.09.08.00.02.02\n\tfor \n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tFri, 08 Sep 2017 00:02:04 -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=JZb51qPWQ9kVxTJ6/IyjnHTqfgMEjCbFxi07WuLr34I=;\n\tb=fz5VfzEa/FJFbqsLOXAyIUrD7dPSwEa5k9KnKf5z0ScIF0306Bk5E8BvUj+aLvLrHH\n\tX9bJyBE6jotg/e0yKv9p2SDxqE87wopgHZomSAa6S7c+LWd4TaTqQS4+wVIXjC8jOnXc\n\t1IAh07tRn1LEMSkkoOnMG1eLxMacSPdHlVGCKCm+6BNmAku1UhMH9WGWWy+RXBxVYUUy\n\t4+ffHRJcfK9EJxGpI0K9q0wNzDSnV+IjMluhYHp2w9IBUs7rnHzzkrMboyBDvixxEm4X\n\t/soEj36Xgyj1eErNIntbDN2p9kpeT6SYDTeRi93BkZyHyOpmHh8xeOmtwW0q6TpKWrTQ\n\tf45A==","X-Gm-Message-State":"AHPjjUhW0JNoTZ9zRlHJxUUy4eSvrApTA0r701TwASnZU/ShHPeEELBv\n\t18awbTB/wghGKq/LYtYMBPqi6rN8/BTndML0eYu+gvE1YMWv4PP019dwAcwdXJXepCFc+fg/T8x\n\tAlRyNRKExyk9bK/kphLVis9rKu7rwXDl4SATtIJY=","X-Received":["by 10.99.54.7 with SMTP id d7mr2118300pga.115.1504854124944;\n\tFri, 08 Sep 2017 00:02:04 -0700 (PDT)","by 10.99.54.7 with SMTP id d7mr2118291pga.115.1504854124752;\n\tFri, 08 Sep 2017 00:02:04 -0700 (PDT)"],"X-Google-Smtp-Source":"ADKCNb40dT/2qyU5u6iNYN2/bKZmKoWi2B5AdHa3nCxbxDfGfqCouqMey8os6Rp/0e8Ppe8N+ntNVQ==","From":"Daniel Axtens ","To":"kernel-team@lists.canonical.com","Subject":"[SRU][Xenial][PATCH 7/7] net: pending_confirm is not used anymore","Date":"Fri, 8 Sep 2017 17:01:42 +1000","Message-Id":"<20170908070142.4440-8-daniel.axtens@canonical.com>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170908070142.4440-1-daniel.axtens@canonical.com>","References":"<20170908070142.4440-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 ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","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\" "},"content":"From: Julian Anastasov \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.\nAs last step, we can remove the pending_confirm flag.\n\nReported-by: YueHaibing \nFixes: 5110effee8fd (\"net: Do delayed neigh confirmation.\")\nFixes: f2bb4bedf35d (\"ipv4: Cache output routes in fib_info nexthops.\")\nSigned-off-by: Julian Anastasov \nAcked-by: Eric Dumazet \nSigned-off-by: David S. Miller \n(cherry picked from commit 51ce8bd4d17a761e1a90a34a1b5c9b762cce7553)\nSigned-off-by: Daniel Axtens \n---\n include/net/dst.h | 14 ++------------\n net/core/dst.c | 1 -\n 2 files changed, 2 insertions(+), 13 deletions(-)","diff":"diff --git a/include/net/dst.h b/include/net/dst.h\nindex 4d97bd8a8c92..4194509b51b6 100644\n--- a/include/net/dst.h\n+++ b/include/net/dst.h\n@@ -59,8 +59,6 @@ struct dst_entry {\n #define DST_XFRM_QUEUE\t\t0x0100\n #define DST_METADATA\t\t0x0200\n \n-\tunsigned short\t\tpending_confirm;\n-\n \tshort\t\t\terror;\n \n \t/* A non-zero value of dst->obsolete forces by-hand validation\n@@ -78,6 +76,8 @@ struct dst_entry {\n #define DST_OBSOLETE_KILL\t-2\n \tunsigned short\t\theader_len;\t/* more space at head required */\n \tunsigned short\t\ttrailer_len;\t/* space to reserve at tail */\n+\tunsigned short\t\t__pad3;\n+\n #ifdef CONFIG_IP_ROUTE_CLASSID\n \t__u32\t\t\ttclassid;\n #else\n@@ -437,7 +437,6 @@ static inline void dst_rcu_free(struct rcu_head *head)\n \n static inline void dst_confirm(struct dst_entry *dst)\n {\n-\tdst->pending_confirm = 1;\n }\n \n static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n,\n@@ -445,15 +444,6 @@ static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n,\n {\n \tconst struct hh_cache *hh;\n \n-\tif (dst->pending_confirm) {\n-\t\tunsigned long now = jiffies;\n-\n-\t\tdst->pending_confirm = 0;\n-\t\t/* avoid dirtying neighbour */\n-\t\tif (n->confirmed != now)\n-\t\t\tn->confirmed = now;\n-\t}\n-\n \thh = &n->hh;\n \tif ((n->nud_state & NUD_CONNECTED) && hh->hh_len)\n \t\treturn neigh_hh_output(hh, skb);\ndiff --git a/net/core/dst.c b/net/core/dst.c\nindex e72d706f8d0c..5cede68c51c6 100644\n--- a/net/core/dst.c\n+++ b/net/core/dst.c\n@@ -190,7 +190,6 @@ void dst_init(struct dst_entry *dst, struct dst_ops *ops,\n \tdst->__use = 0;\n \tdst->lastuse = jiffies;\n \tdst->flags = flags;\n-\tdst->pending_confirm = 0;\n \tdst->next = NULL;\n \tif (!(flags & DST_NOCOUNT))\n \t\tdst_entries_add(ops, 1);\n","prefixes":["SRU","Xenial","7/7"]}