Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/980268/?format=api
{ "id": 980268, "url": "http://patchwork.ozlabs.org/api/patches/980268/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20181008031644.15989-6-dsahern@kernel.org/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20181008031644.15989-6-dsahern@kernel.org>", "list_archive_url": null, "date": "2018-10-08T03:16:26", "name": "[v2,net-next,05/23] net/ipv6: Refactor address dump to push inet6_fill_args to in6_dump_addrs", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "2ea4e6258da7d0d7cd7d27345d3f098a394bf61e", "submitter": { "id": 74101, "url": "http://patchwork.ozlabs.org/api/people/74101/?format=api", "name": "David Ahern", "email": "dsahern@kernel.org" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20181008031644.15989-6-dsahern@kernel.org/mbox/", "series": [ { "id": 69470, "url": "http://patchwork.ozlabs.org/api/series/69470/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=69470", "date": "2018-10-08T03:16:21", "name": "rtnetlink: Add support for rigid checking of data in dump request", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/69470/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/980268/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/980268/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming-netdev@ozlabs.org", "Delivered-To": "patchwork-incoming-netdev@ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=pass (p=none dis=none) header.from=kernel.org", "ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=kernel.org header.i=@kernel.org\n\theader.b=\"I4Krm29P\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 42T5Bh163Yz9sCV\n\tfor <patchwork-incoming-netdev@ozlabs.org>;\n\tMon, 8 Oct 2018 14:17:16 +1100 (AEDT)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1726966AbeJHK0U (ORCPT\n\t<rfc822;patchwork-incoming-netdev@ozlabs.org>);\n\tMon, 8 Oct 2018 06:26:20 -0400", "from mail.kernel.org ([198.145.29.99]:42578 \"EHLO mail.kernel.org\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1726897AbeJHK0S (ORCPT <rfc822;netdev@vger.kernel.org>);\n\tMon, 8 Oct 2018 06:26:18 -0400", "from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com\n\t[216.129.126.126])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits)) (No client certificate requested)\n\tby mail.kernel.org (Postfix) with ESMTPSA id 2B23C208D9;\n\tMon, 8 Oct 2018 03:16:48 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n\ts=default; t=1538968608;\n\tbh=i9UCk1g1LtQeFWgpdtjZFp4WmS2HJeMoSz3LmyIrF0A=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=I4Krm29PfNeHNwb8kKKpQ7QSSAIS0BYakgkrZ74yKSNHYywSvEqbRBzvWyjSmU2E8\n\tj/i+ENi2wWRfbtLTTqihzROOxPRhaWwRWKyim9aXa5ZHww3CWdPOTYSq5I/A3TyHas\n\txgOEhLXQw00OR163VdruSeN8rHSjE20rUYmgdDP8=", "From": "David Ahern <dsahern@kernel.org>", "To": "netdev@vger.kernel.org, davem@davemloft.net", "Cc": "christian@brauner.io, jbenc@redhat.com, stephen@networkplumber.org,\n\tDavid Ahern <dsahern@gmail.com>", "Subject": "[PATCH v2 net-next 05/23] net/ipv6: Refactor address dump to push\n\tinet6_fill_args to in6_dump_addrs", "Date": "Sun, 7 Oct 2018 20:16:26 -0700", "Message-Id": "<20181008031644.15989-6-dsahern@kernel.org>", "X-Mailer": "git-send-email 2.11.0", "In-Reply-To": "<20181008031644.15989-1-dsahern@kernel.org>", "References": "<20181008031644.15989-1-dsahern@kernel.org>", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "From: David Ahern <dsahern@gmail.com>\n\nPull the inet6_fill_args arg up to in6_dump_addrs and move netnsid\ninto it.\n\nSigned-off-by: David Ahern <dsahern@gmail.com>\nAcked-by: Christian Brauner <christian@brauner.io>\n---\n net/ipv6/addrconf.c | 57 ++++++++++++++++++++++++++++-------------------------\n 1 file changed, 30 insertions(+), 27 deletions(-)", "diff": "diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c\nindex 2f8aa4fd5e55..afa279170ba5 100644\n--- a/net/ipv6/addrconf.c\n+++ b/net/ipv6/addrconf.c\n@@ -4793,12 +4793,19 @@ static inline int inet6_ifaddr_msgsize(void)\n \t + nla_total_size(4) /* IFA_RT_PRIORITY */;\n }\n \n+enum addr_type_t {\n+\tUNICAST_ADDR,\n+\tMULTICAST_ADDR,\n+\tANYCAST_ADDR,\n+};\n+\n struct inet6_fill_args {\n \tu32 portid;\n \tu32 seq;\n \tint event;\n \tunsigned int flags;\n \tint netnsid;\n+\tenum addr_type_t type;\n };\n \n static int inet6_fill_ifaddr(struct sk_buff *skb, struct inet6_ifaddr *ifa,\n@@ -4930,39 +4937,28 @@ static int inet6_fill_ifacaddr(struct sk_buff *skb, struct ifacaddr6 *ifaca,\n \treturn 0;\n }\n \n-enum addr_type_t {\n-\tUNICAST_ADDR,\n-\tMULTICAST_ADDR,\n-\tANYCAST_ADDR,\n-};\n-\n /* called with rcu_read_lock() */\n static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,\n-\t\t\t struct netlink_callback *cb, enum addr_type_t type,\n-\t\t\t int s_ip_idx, int *p_ip_idx, int netnsid)\n+\t\t\t struct netlink_callback *cb,\n+\t\t\t int s_ip_idx, int *p_ip_idx,\n+\t\t\t struct inet6_fill_args *fillargs)\n {\n-\tstruct inet6_fill_args fillargs = {\n-\t\t.portid = NETLINK_CB(cb->skb).portid,\n-\t\t.seq = cb->nlh->nlmsg_seq,\n-\t\t.flags = NLM_F_MULTI,\n-\t\t.netnsid = netnsid,\n-\t};\n \tstruct ifmcaddr6 *ifmca;\n \tstruct ifacaddr6 *ifaca;\n \tint err = 1;\n \tint ip_idx = *p_ip_idx;\n \n \tread_lock_bh(&idev->lock);\n-\tswitch (type) {\n+\tswitch (fillargs->type) {\n \tcase UNICAST_ADDR: {\n \t\tstruct inet6_ifaddr *ifa;\n-\t\tfillargs.event = RTM_NEWADDR;\n+\t\tfillargs->event = RTM_NEWADDR;\n \n \t\t/* unicast address incl. temp addr */\n \t\tlist_for_each_entry(ifa, &idev->addr_list, if_list) {\n \t\t\tif (++ip_idx < s_ip_idx)\n \t\t\t\tcontinue;\n-\t\t\terr = inet6_fill_ifaddr(skb, ifa, &fillargs);\n+\t\t\terr = inet6_fill_ifaddr(skb, ifa, fillargs);\n \t\t\tif (err < 0)\n \t\t\t\tbreak;\n \t\t\tnl_dump_check_consistent(cb, nlmsg_hdr(skb));\n@@ -4970,26 +4966,26 @@ static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,\n \t\tbreak;\n \t}\n \tcase MULTICAST_ADDR:\n-\t\tfillargs.event = RTM_GETMULTICAST;\n+\t\tfillargs->event = RTM_GETMULTICAST;\n \n \t\t/* multicast address */\n \t\tfor (ifmca = idev->mc_list; ifmca;\n \t\t ifmca = ifmca->next, ip_idx++) {\n \t\t\tif (ip_idx < s_ip_idx)\n \t\t\t\tcontinue;\n-\t\t\terr = inet6_fill_ifmcaddr(skb, ifmca, &fillargs);\n+\t\t\terr = inet6_fill_ifmcaddr(skb, ifmca, fillargs);\n \t\t\tif (err < 0)\n \t\t\t\tbreak;\n \t\t}\n \t\tbreak;\n \tcase ANYCAST_ADDR:\n-\t\tfillargs.event = RTM_GETANYCAST;\n+\t\tfillargs->event = RTM_GETANYCAST;\n \t\t/* anycast address */\n \t\tfor (ifaca = idev->ac_list; ifaca;\n \t\t ifaca = ifaca->aca_next, ip_idx++) {\n \t\t\tif (ip_idx < s_ip_idx)\n \t\t\t\tcontinue;\n-\t\t\terr = inet6_fill_ifacaddr(skb, ifaca, &fillargs);\n+\t\t\terr = inet6_fill_ifacaddr(skb, ifaca, fillargs);\n \t\t\tif (err < 0)\n \t\t\t\tbreak;\n \t\t}\n@@ -5005,10 +5001,16 @@ static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,\n static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,\n \t\t\t enum addr_type_t type)\n {\n+\tstruct inet6_fill_args fillargs = {\n+\t\t.portid = NETLINK_CB(cb->skb).portid,\n+\t\t.seq = cb->nlh->nlmsg_seq,\n+\t\t.flags = NLM_F_MULTI,\n+\t\t.netnsid = -1,\n+\t\t.type = type,\n+\t};\n \tstruct net *net = sock_net(skb->sk);\n \tstruct nlattr *tb[IFA_MAX+1];\n \tstruct net *tgt_net = net;\n-\tint netnsid = -1;\n \tint h, s_h;\n \tint idx, ip_idx;\n \tint s_idx, s_ip_idx;\n@@ -5023,9 +5025,10 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,\n \tif (nlmsg_parse(cb->nlh, sizeof(struct ifaddrmsg), tb, IFA_MAX,\n \t\t\tifa_ipv6_policy, cb->extack) >= 0) {\n \t\tif (tb[IFA_TARGET_NETNSID]) {\n-\t\t\tnetnsid = nla_get_s32(tb[IFA_TARGET_NETNSID]);\n+\t\t\tfillargs.netnsid = nla_get_s32(tb[IFA_TARGET_NETNSID]);\n \n-\t\t\ttgt_net = rtnl_get_net_ns_capable(skb->sk, netnsid);\n+\t\t\ttgt_net = rtnl_get_net_ns_capable(skb->sk,\n+\t\t\t\t\t\t\t fillargs.netnsid);\n \t\t\tif (IS_ERR(tgt_net))\n \t\t\t\treturn PTR_ERR(tgt_net);\n \t\t}\n@@ -5046,8 +5049,8 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,\n \t\t\tif (!idev)\n \t\t\t\tgoto cont;\n \n-\t\t\tif (in6_dump_addrs(idev, skb, cb, type,\n-\t\t\t\t\t s_ip_idx, &ip_idx, netnsid) < 0)\n+\t\t\tif (in6_dump_addrs(idev, skb, cb, s_ip_idx, &ip_idx,\n+\t\t\t\t\t &fillargs) < 0)\n \t\t\t\tgoto done;\n cont:\n \t\t\tidx++;\n@@ -5058,7 +5061,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,\n \tcb->args[0] = h;\n \tcb->args[1] = idx;\n \tcb->args[2] = ip_idx;\n-\tif (netnsid >= 0)\n+\tif (fillargs.netnsid >= 0)\n \t\tput_net(tgt_net);\n \n \treturn skb->len;\n", "prefixes": [ "v2", "net-next", "05/23" ] }