Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1145971/?format=api
{ "id": 1145971, "url": "http://patchwork.ozlabs.org/api/patches/1145971/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1565657261-15979-7-git-send-email-tom@quantonium.net/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1565657261-15979-7-git-send-email-tom@quantonium.net>", "list_archive_url": null, "date": "2019-08-13T00:47:40", "name": "[net-next,6/7] ip6tlvs: Add netlink interface", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "2c3b7fb33e28830e1981f6b88a72d823b9bd98e2", "submitter": { "id": 65986, "url": "http://patchwork.ozlabs.org/api/people/65986/?format=api", "name": "Tom Herbert", "email": "tom@herbertland.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1565657261-15979-7-git-send-email-tom@quantonium.net/mbox/", "series": [ { "id": 124709, "url": "http://patchwork.ozlabs.org/api/series/124709/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=124709", "date": "2019-08-13T00:47:39", "name": "ipv6: Extension header infrastructure", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/124709/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1145971/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1145971/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "Intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "Intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.137; helo=fraxinus.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dmarc=none (p=none dis=none)\n\theader.from=herbertland.com", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=herbertland-com.20150623.gappssmtp.com\n\theader.i=@herbertland-com.20150623.gappssmtp.com\n\theader.b=\"j6HX3Gbi\"; dkim-atps=neutral" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 466vQB5CQFz9sNf\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 13 Aug 2019 10:55:14 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 396FC85F5B;\n\tTue, 13 Aug 2019 00:55:12 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id CfaEtsWFNXXD; Tue, 13 Aug 2019 00:55:09 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id C782C85F43;\n\tTue, 13 Aug 2019 00:55:09 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 0B26E1BF989\n\tfor <Intel-wired-lan@lists.osuosl.org>;\n\tTue, 13 Aug 2019 00:55:09 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 070DE87B8A\n\tfor <Intel-wired-lan@lists.osuosl.org>;\n\tTue, 13 Aug 2019 00:55:09 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id o7FUrfXh2VeO for <Intel-wired-lan@lists.osuosl.org>;\n\tTue, 13 Aug 2019 00:55:08 +0000 (UTC)", "from mail-pl1-f195.google.com (mail-pl1-f195.google.com\n\t[209.85.214.195])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 00F5887B4F\n\tfor <Intel-wired-lan@lists.osuosl.org>;\n\tTue, 13 Aug 2019 00:55:07 +0000 (UTC)", "by mail-pl1-f195.google.com with SMTP id i2so48585252plt.1\n\tfor <Intel-wired-lan@lists.osuosl.org>;\n\tMon, 12 Aug 2019 17:55:07 -0700 (PDT)", "from localhost.localdomain (c-73-202-182-113.hsd1.ca.comcast.net.\n\t[73.202.182.113]) by smtp.gmail.com with ESMTPSA id\n\t14sm105671426pfy.40.2019.08.12.17.48.11\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tMon, 12 Aug 2019 17:48:11 -0700 (PDT)" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "from auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=herbertland-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=gXEcv4AZ1aEVdStzYmxP1j1iyAvDlCWMXbv6ra0oxLo=;\n\tb=j6HX3Gbi8PnCSURIjDll9SufZlBmVsuv8vC00b+YDDyR/c66Ndcrsfg1elNvA05HJl\n\tkDihz4eN3kYRc+6pQeDpxni3et558gDHhCqQon/8Wctkf12A3i+e5Gr2N11EgQruJvTJ\n\ttvUPOfaz1pBbIhLhgzqBFZyDX/6Z6ZhPXtTlWDKQhldf6tk3IhmLhsync5K+2rgYlpXA\n\tkWWWPjZO9KapyJwUgwZ0KB4nodruYy13Y/RiEDvCOflNJp4Qwllfp68AoHkO7HKjtC+Y\n\t0eVt7weG4xN8JCmtdSDJwQQ1ej49iT5m/u4Gknj1odQ8yInv83ywQuSAeTp9dL4vM/Gh\n\tCHoA==", "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:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=gXEcv4AZ1aEVdStzYmxP1j1iyAvDlCWMXbv6ra0oxLo=;\n\tb=Xk8Xp2hiyP8ALZKMpRDlr61jyNddNQ55Xl9MzqcL8H/KcqX7rtQiNYVaHqgptM7zhV\n\tcjGvLcllsK405+3e92Uq3O1AmoJbZhfJP20pRpHHvEpIEPND3WT6arvGQVLZQFONZuOu\n\tnbBUYkX/J7pV7p7an7Et4D6uK8IevGCwUq7/C5xN9PZO+YoLSg8VlGuynJzF+m8ez+FK\n\tEOj6j6XAMOas4/9SVswpCIkrf+NCbgjQ9MJasQ7jrn3Fx+ygw6ZuFwL5ZfWjg1C6+sLN\n\tbrVQpp90d8gedkm6fKrr0t+4ikZrydXO7cxkKoFrlg3VrzBoWDBLvMVaT8bZ7gXYbBCJ\n\tfrZA==", "X-Gm-Message-State": "APjAAAUW2lvdVucwYjTpKTBlAYxt31Cm2ob7fsZ0+r7VktqWy1cww/uN\n\tp84xA8L/mIZNpUHrCwynT/yvFaCfmW8=", "X-Google-Smtp-Source": "APXvYqwq/C9fvvRVgSX7201b1jjTkLN3A37vwqygeeBCAHvXyfBjsx1Pyt7U8beIY0FEIqe3OsZUfw==", "X-Received": "by 2002:a17:902:bc4c:: with SMTP id\n\tt12mr17842701plz.1.1565657292121; \n\tMon, 12 Aug 2019 17:48:12 -0700 (PDT)", "From": "Tom Herbert <tom@herbertland.com>", "X-Google-Original-From": "Tom Herbert <tom@quantonium.net>", "To": "Intel-wired-lan@lists.osuosl.org", "Date": "Mon, 12 Aug 2019 17:47:40 -0700", "Message-Id": "<1565657261-15979-7-git-send-email-tom@quantonium.net>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1565657261-15979-1-git-send-email-tom@quantonium.net>", "References": "<1565657261-15979-1-git-send-email-tom@quantonium.net>", "Subject": "[Intel-wired-lan] [PATCH net-next 6/7] ip6tlvs: Add netlink\n\tinterface", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Cc": "Tom Herbert <tom@quantonium.net>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "Add a netlink interface to manage the TX TLV parameters. Managed\nparameters include those for validating and sending TLVs being sent\nsuch as alignment, TLV ordering, length limits, etc.\n\nSigned-off-by: Tom Herbert <tom@quantonium.net>\n---\n include/net/ipeh.h | 15 +++\n include/net/ipv6.h | 1 +\n include/uapi/linux/in6.h | 6 ++\n include/uapi/linux/ipeh.h | 29 ++++++\n net/ipv6/exthdrs_common.c | 238 +++++++++++++++++++++++++++++++++++++++++++++\n net/ipv6/exthdrs_options.c | 81 ++++++++++++++-\n 6 files changed, 368 insertions(+), 2 deletions(-)", "diff": "diff --git a/include/net/ipeh.h b/include/net/ipeh.h\nindex 7d91558..cee76fe 100644\n--- a/include/net/ipeh.h\n+++ b/include/net/ipeh.h\n@@ -104,6 +104,21 @@ static inline int ipeh_tlv_unset_proc(struct tlv_param_table *tlv_param_table,\n \treturn __ipeh_tlv_unset(tlv_param_table, type, false);\n }\n \n+extern const struct nla_policy ipeh_tlv_nl_policy[];\n+\n+int ipeh_tlv_nl_cmd_set(struct tlv_param_table *tlv_param_table,\n+\t\t\tstruct genl_family *tlv_nl_family,\n+\t\t\tstruct sk_buff *skb, struct genl_info *info);\n+int ipeh_tlv_nl_cmd_unset(struct tlv_param_table *tlv_param_table,\n+\t\t\t struct genl_family *tlv_nl_family,\n+\t\t\t struct sk_buff *skb, struct genl_info *info);\n+int ipeh_tlv_nl_cmd_get(struct tlv_param_table *tlv_param_table,\n+\t\t\tstruct genl_family *tlv_nl_family,\n+\t\t\tstruct sk_buff *skb, struct genl_info *info);\n+int ipeh_tlv_nl_dump(struct tlv_param_table *tlv_param_table,\n+\t\t struct genl_family *tlv_nl_family,\n+\t\t struct sk_buff *skb, struct netlink_callback *cb);\n+\n /* ipeh_tlv_get_proc_by_type assumes rcu_read_lock is held */\n static inline struct tlv_proc *ipeh_tlv_get_proc_by_type(\n \t\tstruct tlv_param_table *tlv_param_table, unsigned char type)\ndiff --git a/include/net/ipv6.h b/include/net/ipv6.h\nindex 07bafad..51517a1 100644\n--- a/include/net/ipv6.h\n+++ b/include/net/ipv6.h\n@@ -14,6 +14,7 @@\n #include <linux/jhash.h>\n #include <linux/refcount.h>\n #include <linux/jump_label_ratelimit.h>\n+#include <net/genetlink.h>\n #include <net/if_inet6.h>\n #include <net/ndisc.h>\n #include <net/flow.h>\ndiff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h\nindex 9f2273a..d5fe3d9 100644\n--- a/include/uapi/linux/in6.h\n+++ b/include/uapi/linux/in6.h\n@@ -297,4 +297,10 @@ struct in6_flowlabel_req {\n * ...\n * MRT6_MAX\n */\n+\n+ /* NETLINK_GENERIC related info for IPv6 TLVs */\n+\n+#define IPV6_TLV_GENL_NAME\t\t\"ipv6-tlv\"\n+#define IPV6_TLV_GENL_VERSION\t\t0x1\n+\n #endif /* _UAPI_LINUX_IN6_H */\ndiff --git a/include/uapi/linux/ipeh.h b/include/uapi/linux/ipeh.h\nindex dbf0728..bac36a7 100644\n--- a/include/uapi/linux/ipeh.h\n+++ b/include/uapi/linux/ipeh.h\n@@ -21,4 +21,33 @@ enum {\n \tIPEH_TLV_PERM_MAX = IPEH_TLV_PERM_NO_CHECK\n };\n \n+/* NETLINK_GENERIC related info for IP TLVs */\n+\n+enum {\n+\tIPEH_TLV_ATTR_UNSPEC,\n+\tIPEH_TLV_ATTR_TYPE,\t\t\t/* u8, > 1 */\n+\tIPEH_TLV_ATTR_ORDER,\t\t\t/* u16 */\n+\tIPEH_TLV_ATTR_ADMIN_PERM,\t\t/* u8, perm value */\n+\tIPEH_TLV_ATTR_USER_PERM,\t\t/* u8, perm value */\n+\tIPEH_TLV_ATTR_CLASS,\t\t\t/* u8, 3 bit flags */\n+\tIPEH_TLV_ATTR_ALIGN_MULT,\t\t/* u8, 1 to 16 */\n+\tIPEH_TLV_ATTR_ALIGN_OFF,\t\t/* u8, 0 to 15 */\n+\tIPEH_TLV_ATTR_MIN_DATA_LEN,\t\t/* u8 (option data length) */\n+\tIPEH_TLV_ATTR_MAX_DATA_LEN,\t\t/* u8 (option data length) */\n+\tIPEH_TLV_ATTR_DATA_LEN_MULT,\t\t/* u8, 1 to 16 */\n+\tIPEH_TLV_ATTR_DATA_LEN_OFF,\t\t/* u8, 0 to 15 */\n+\n+\t__IPEH_TLV_ATTR_MAX,\n+};\n+\n+#define IPEH_TLV_ATTR_MAX (__IPEH_TLV_ATTR_MAX - 1)\n+\n+enum {\n+\tIPEH_TLV_CMD_SET,\n+\tIPEH_TLV_CMD_UNSET,\n+\tIPEH_TLV_CMD_GET,\n+\n+\t__IPEH_TLV_CMD_MAX,\n+};\n+\n #endif /* _UAPI_LINUX_IPEH_H */\ndiff --git a/net/ipv6/exthdrs_common.c b/net/ipv6/exthdrs_common.c\nindex 791f6e4..b44c6fd 100644\n--- a/net/ipv6/exthdrs_common.c\n+++ b/net/ipv6/exthdrs_common.c\n@@ -454,6 +454,244 @@ int __ipeh_tlv_unset(struct tlv_param_table *tlv_param_table,\n }\n EXPORT_SYMBOL(__ipeh_tlv_unset);\n \n+const struct nla_policy ipeh_tlv_nl_policy[IPEH_TLV_ATTR_MAX + 1] = {\n+\t[IPEH_TLV_ATTR_TYPE] =\t\t{ .type = NLA_U8, },\n+\t[IPEH_TLV_ATTR_ORDER] =\t\t{ .type = NLA_U16, },\n+\t[IPEH_TLV_ATTR_ADMIN_PERM] =\t{ .type = NLA_U8, },\n+\t[IPEH_TLV_ATTR_USER_PERM] =\t{ .type = NLA_U8, },\n+\t[IPEH_TLV_ATTR_CLASS] =\t\t{ .type = NLA_U8, },\n+\t[IPEH_TLV_ATTR_ALIGN_MULT] =\t{ .type = NLA_U8, },\n+\t[IPEH_TLV_ATTR_ALIGN_OFF] =\t{ .type = NLA_U8, },\n+\t[IPEH_TLV_ATTR_MIN_DATA_LEN] =\t{ .type = NLA_U8, },\n+\t[IPEH_TLV_ATTR_MAX_DATA_LEN] =\t{ .type = NLA_U8, },\n+\t[IPEH_TLV_ATTR_DATA_LEN_OFF] =\t{ .type = NLA_U8, },\n+\t[IPEH_TLV_ATTR_DATA_LEN_MULT] =\t{ .type = NLA_U8, },\n+};\n+EXPORT_SYMBOL(ipeh_tlv_nl_policy);\n+\n+int ipeh_tlv_nl_cmd_set(struct tlv_param_table *tlv_param_table,\n+\t\t\tstruct genl_family *tlv_nl_family,\n+\t\t\tstruct sk_buff *skb, struct genl_info *info)\n+{\n+\tstruct tlv_params new_params;\n+\tstruct tlv_proc *tproc;\n+\tunsigned char type;\n+\tunsigned int v;\n+\tint retv = -EINVAL;\n+\n+\tif (!info->attrs[IPEH_TLV_ATTR_TYPE])\n+\t\treturn -EINVAL;\n+\n+\ttype = nla_get_u8(info->attrs[IPEH_TLV_ATTR_TYPE]);\n+\tif (type < 2)\n+\t\treturn -EINVAL;\n+\n+\trcu_read_lock();\n+\n+\t/* Base new parameters on existing ones */\n+\ttproc = ipeh_tlv_get_proc_by_type(tlv_param_table, type);\n+\tnew_params = tproc->params;\n+\n+\tif (info->attrs[IPEH_TLV_ATTR_ORDER]) {\n+\t\tv = nla_get_u16(info->attrs[IPEH_TLV_ATTR_ORDER]);\n+\t\tnew_params.t.preferred_order = v;\n+\t}\n+\n+\tif (info->attrs[IPEH_TLV_ATTR_ADMIN_PERM]) {\n+\t\tv = nla_get_u8(info->attrs[IPEH_TLV_ATTR_ADMIN_PERM]);\n+\t\tif (v > IPEH_TLV_PERM_MAX)\n+\t\t\tgoto out;\n+\t\tnew_params.t.admin_perm = v;\n+\t}\n+\n+\tif (info->attrs[IPEH_TLV_ATTR_USER_PERM]) {\n+\t\tv = nla_get_u8(info->attrs[IPEH_TLV_ATTR_USER_PERM]);\n+\t\tif (v > IPEH_TLV_PERM_MAX)\n+\t\t\tgoto out;\n+\t\tnew_params.t.user_perm = v;\n+\t}\n+\n+\tif (info->attrs[IPEH_TLV_ATTR_CLASS]) {\n+\t\tv = nla_get_u8(info->attrs[IPEH_TLV_ATTR_CLASS]);\n+\t\tif (!v || (v & ~IPEH_TLV_CLASS_FLAG_MASK))\n+\t\t\tgoto out;\n+\t\tnew_params.t.class = v;\n+\t}\n+\n+\tif (info->attrs[IPEH_TLV_ATTR_ALIGN_MULT]) {\n+\t\tv = nla_get_u8(info->attrs[IPEH_TLV_ATTR_ALIGN_MULT]);\n+\t\tif (v > 16 || v < 1)\n+\t\t\tgoto out;\n+\t\tnew_params.t.align_mult = v - 1;\n+\t}\n+\n+\tif (info->attrs[IPEH_TLV_ATTR_ALIGN_OFF]) {\n+\t\tv = nla_get_u8(info->attrs[IPEH_TLV_ATTR_ALIGN_OFF]);\n+\t\tif (v > 15)\n+\t\t\tgoto out;\n+\t\tnew_params.t.align_off = v;\n+\t}\n+\n+\tif (info->attrs[IPEH_TLV_ATTR_MAX_DATA_LEN])\n+\t\tnew_params.t.max_data_len =\n+\t\t nla_get_u8(info->attrs[IPEH_TLV_ATTR_MAX_DATA_LEN]);\n+\n+\tif (info->attrs[IPEH_TLV_ATTR_MIN_DATA_LEN])\n+\t\tnew_params.t.min_data_len =\n+\t\t nla_get_u8(info->attrs[IPEH_TLV_ATTR_MIN_DATA_LEN]);\n+\n+\tif (info->attrs[IPEH_TLV_ATTR_DATA_LEN_MULT]) {\n+\t\tv = nla_get_u8(info->attrs[IPEH_TLV_ATTR_DATA_LEN_MULT]);\n+\t\tif (v > 16 || v < 1)\n+\t\t\tgoto out;\n+\t\tnew_params.t.data_len_mult = v - 1;\n+\t}\n+\n+\tif (info->attrs[IPEH_TLV_ATTR_DATA_LEN_OFF]) {\n+\t\tv = nla_get_u8(info->attrs[IPEH_TLV_ATTR_DATA_LEN_OFF]);\n+\t\tif (v > 15)\n+\t\t\tgoto out;\n+\t\tnew_params.t.data_len_off = v;\n+\t}\n+\n+\tretv = ipeh_tlv_set_params(tlv_param_table, type, &new_params);\n+\n+out:\n+\trcu_read_unlock();\n+\treturn retv;\n+}\n+EXPORT_SYMBOL(ipeh_tlv_nl_cmd_set);\n+\n+int ipeh_tlv_nl_cmd_unset(struct tlv_param_table *tlv_param_table,\n+\t\t\t struct genl_family *tlv_nl_family,\n+\t\t\t struct sk_buff *skb, struct genl_info *info)\n+{\n+\tunsigned char type;\n+\n+\tif (!info->attrs[IPEH_TLV_ATTR_TYPE])\n+\t\treturn -EINVAL;\n+\n+\ttype = nla_get_u8(info->attrs[IPEH_TLV_ATTR_TYPE]);\n+\tif (type < 2)\n+\t\treturn -EINVAL;\n+\n+\treturn ipeh_tlv_unset_params(tlv_param_table, type);\n+}\n+EXPORT_SYMBOL(ipeh_tlv_nl_cmd_unset);\n+\n+static int tlv_fill_info(struct tlv_proc *tproc, unsigned char type,\n+\t\t\t struct sk_buff *msg, bool admin)\n+{\n+\tstruct tlv_params *tp = &tproc->params;\n+\tint ret = 0;\n+\n+\tif (nla_put_u8(msg, IPEH_TLV_ATTR_TYPE, type) ||\n+\t nla_put_u16(msg, IPEH_TLV_ATTR_ORDER, tp->t.preferred_order) ||\n+\t nla_put_u8(msg, IPEH_TLV_ATTR_USER_PERM, tp->t.user_perm) ||\n+\t (admin && nla_put_u8(msg, IPEH_TLV_ATTR_ADMIN_PERM,\n+\t\t\t\t tp->t.admin_perm)) ||\n+\t nla_put_u8(msg, IPEH_TLV_ATTR_CLASS, tp->t.class) ||\n+\t nla_put_u8(msg, IPEH_TLV_ATTR_ALIGN_MULT, tp->t.align_mult + 1) ||\n+\t nla_put_u8(msg, IPEH_TLV_ATTR_ALIGN_OFF, tp->t.align_off) ||\n+\t nla_put_u8(msg, IPEH_TLV_ATTR_MIN_DATA_LEN, tp->t.min_data_len) ||\n+\t nla_put_u8(msg, IPEH_TLV_ATTR_MAX_DATA_LEN, tp->t.max_data_len) ||\n+\t nla_put_u8(msg, IPEH_TLV_ATTR_DATA_LEN_MULT,\n+\t\t tp->t.data_len_mult + 1) ||\n+\t nla_put_u8(msg, IPEH_TLV_ATTR_DATA_LEN_OFF, tp->t.data_len_off))\n+\t\tret = -1;\n+\n+\treturn ret;\n+}\n+\n+static int tlv_dump_info(struct tlv_proc *tproc, unsigned char type,\n+\t\t\t struct genl_family *tlv_nl_family, u32 portid,\n+\t\t\t u32 seq, u32 flags, struct sk_buff *skb, u8 cmd,\n+\t\t\t bool admin)\n+{\n+\tvoid *hdr;\n+\n+\thdr = genlmsg_put(skb, portid, seq, tlv_nl_family, flags, cmd);\n+\tif (!hdr)\n+\t\treturn -ENOMEM;\n+\n+\tif (tlv_fill_info(tproc, type, skb, admin) < 0) {\n+\t\tgenlmsg_cancel(skb, hdr);\n+\t\treturn -EMSGSIZE;\n+\t}\n+\n+\tgenlmsg_end(skb, hdr);\n+\n+\treturn 0;\n+}\n+\n+int ipeh_tlv_nl_cmd_get(struct tlv_param_table *tlv_param_table,\n+\t\t\tstruct genl_family *tlv_nl_family,\n+\t\t\tstruct sk_buff *skb, struct genl_info *info)\n+{\n+\tstruct tlv_proc *tproc;\n+\tstruct sk_buff *msg;\n+\tunsigned char type;\n+\tint ret;\n+\n+\tif (!info->attrs[IPEH_TLV_ATTR_TYPE])\n+\t\treturn -EINVAL;\n+\n+\ttype = nla_get_u8(info->attrs[IPEH_TLV_ATTR_TYPE]);\n+\tif (type < 2)\n+\t\treturn -EINVAL;\n+\n+\tmsg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);\n+\tif (!msg)\n+\t\treturn -ENOMEM;\n+\n+\trcu_read_lock();\n+\n+\ttproc = ipeh_tlv_get_proc_by_type(tlv_param_table, type);\n+\tret = tlv_dump_info(tproc, type, tlv_nl_family, info->snd_portid,\n+\t\t\t info->snd_seq, 0, msg, info->genlhdr->cmd,\n+\t\t\t netlink_capable(skb, CAP_NET_ADMIN));\n+\n+\trcu_read_unlock();\n+\n+\tif (ret < 0) {\n+\t\tnlmsg_free(msg);\n+\t\treturn ret;\n+\t}\n+\n+\treturn genlmsg_reply(msg, info);\n+}\n+EXPORT_SYMBOL(ipeh_tlv_nl_cmd_get);\n+\n+int ipeh_tlv_nl_dump(struct tlv_param_table *tlv_param_table,\n+\t\t struct genl_family *tlv_nl_family,\n+\t\t struct sk_buff *skb, struct netlink_callback *cb)\n+{\n+\tstruct tlv_proc *tproc;\n+\tint idx = 0, ret, i;\n+\n+\trcu_read_lock();\n+\n+\tfor (i = 2; i < 256; i++) {\n+\t\tif (idx++ < cb->args[0])\n+\t\t\tcontinue;\n+\n+\t\ttproc = ipeh_tlv_get_proc_by_type(tlv_param_table, i);\n+\t\tret = tlv_dump_info(tproc, i, tlv_nl_family,\n+\t\t\t\t NETLINK_CB(cb->skb).portid,\n+\t\t\t\t cb->nlh->nlmsg_seq, NLM_F_MULTI,\n+\t\t\t\t skb, IPEH_TLV_CMD_GET,\n+\t\t\t\t netlink_capable(cb->skb, CAP_NET_ADMIN));\n+\t\tif (ret)\n+\t\t\tbreak;\n+\t}\n+\n+\trcu_read_unlock();\n+\n+\tcb->args[0] = idx;\n+\treturn skb->len;\n+}\n+EXPORT_SYMBOL(ipeh_tlv_nl_dump);\n+\n int ipeh_exthdrs_init(struct tlv_param_table *tlv_param_table,\n \t\t const struct tlv_proc_init *tlv_init_params,\n \t\t int num_init_params)\ndiff --git a/net/ipv6/exthdrs_options.c b/net/ipv6/exthdrs_options.c\nindex 3b50b58..c1889f6 100644\n--- a/net/ipv6/exthdrs_options.c\n+++ b/net/ipv6/exthdrs_options.c\n@@ -6,6 +6,7 @@\n #include <linux/socket.h>\n #include <linux/types.h>\n #include <net/calipso.h>\n+#include <net/genetlink.h>\n #include <net/ipv6.h>\n #include <net/ip6_route.h>\n #if IS_ENABLED(CONFIG_IPV6_MIP6)\n@@ -253,13 +254,89 @@ static const struct tlv_proc_init tlv_ipv6_init_params[] __initconst = {\n struct tlv_param_table __rcu ipv6_tlv_param_table;\n EXPORT_SYMBOL(ipv6_tlv_param_table);\n \n+static int ipv6_tlv_nl_cmd_set(struct sk_buff *skb, struct genl_info *info);\n+static int ipv6_tlv_nl_cmd_unset(struct sk_buff *skb, struct genl_info *info);\n+static int ipv6_tlv_nl_cmd_get(struct sk_buff *skb, struct genl_info *info);\n+static int ipv6_tlv_nl_dump(struct sk_buff *skb, struct netlink_callback *cb);\n+\n+static const struct genl_ops ipv6_tlv_nl_ops[] = {\n+{\n+\t.cmd = IPEH_TLV_CMD_SET,\n+\t.doit = ipv6_tlv_nl_cmd_set,\n+\t.flags = GENL_ADMIN_PERM,\n+},\n+{\n+\t.cmd = IPEH_TLV_CMD_UNSET,\n+\t.doit = ipv6_tlv_nl_cmd_unset,\n+\t.flags = GENL_ADMIN_PERM,\n+},\n+{\n+\t.cmd = IPEH_TLV_CMD_GET,\n+\t.doit = ipv6_tlv_nl_cmd_get,\n+\t.dumpit = ipv6_tlv_nl_dump,\n+},\n+};\n+\n+struct genl_family ipv6_tlv_nl_family __ro_after_init = {\n+\t.hdrsize\t= 0,\n+\t.name\t\t= IPV6_TLV_GENL_NAME,\n+\t.version\t= IPV6_TLV_GENL_VERSION,\n+\t.maxattr\t= IPEH_TLV_ATTR_MAX,\n+\t.policy\t\t= ipeh_tlv_nl_policy,\n+\t.netnsok\t= true,\n+\t.parallel_ops\t= true,\n+\t.ops\t\t= ipv6_tlv_nl_ops,\n+\t.n_ops\t\t= ARRAY_SIZE(ipv6_tlv_nl_ops),\n+\t.module\t\t= THIS_MODULE,\n+};\n+\n+static int ipv6_tlv_nl_cmd_set(struct sk_buff *skb, struct genl_info *info)\n+{\n+\treturn ipeh_tlv_nl_cmd_set(&ipv6_tlv_param_table, &ipv6_tlv_nl_family,\n+\t\t\t\t skb, info);\n+}\n+\n+static int ipv6_tlv_nl_cmd_unset(struct sk_buff *skb, struct genl_info *info)\n+{\n+\treturn ipeh_tlv_nl_cmd_unset(&ipv6_tlv_param_table, &ipv6_tlv_nl_family,\n+\t\t\t\t skb, info);\n+}\n+\n+static int ipv6_tlv_nl_cmd_get(struct sk_buff *skb, struct genl_info *info)\n+{\n+\treturn ipeh_tlv_nl_cmd_get(&ipv6_tlv_param_table, &ipv6_tlv_nl_family,\n+\t\t\t\t skb, info);\n+}\n+\n+static int ipv6_tlv_nl_dump(struct sk_buff *skb, struct netlink_callback *cb)\n+{\n+\treturn ipeh_tlv_nl_dump(&ipv6_tlv_param_table, &ipv6_tlv_nl_family,\n+\t\t\t\tskb, cb);\n+}\n+\n int __init ipv6_exthdrs_options_init(void)\n {\n-\treturn ipeh_exthdrs_init(&ipv6_tlv_param_table, tlv_ipv6_init_params,\n-\t\t\t\t ARRAY_SIZE(tlv_ipv6_init_params));\n+\tint err;\n+\n+\terr = genl_register_family(&ipv6_tlv_nl_family);\n+\tif (err)\n+\t\tgoto genl_fail;\n+\n+\tipeh_exthdrs_init(&ipv6_tlv_param_table, tlv_ipv6_init_params,\n+\t\t\t ARRAY_SIZE(tlv_ipv6_init_params));\n+\tif (err)\n+\t\tgoto ipv6_fail;\n+\n+\treturn 0;\n+\n+ipv6_fail:\n+\tgenl_unregister_family(&ipv6_tlv_nl_family);\n+genl_fail:\n+\treturn err;\n }\n \n void ipv6_exthdrs_options_exit(void)\n {\n \tipeh_exthdrs_fini(&ipv6_tlv_param_table);\n+\tgenl_unregister_family(&ipv6_tlv_nl_family);\n }\n", "prefixes": [ "net-next", "6/7" ] }