linux-merge

linux-merge@lists.open-mesh.org

3 participants
7481 discussions

Build check errors found: 2016-08-22
by postmaster＠open-mesh.org 22 Aug '16

22 Aug '16

Name of failed tests ==================== master ------ * cppcheck next ---- * difference between net-next and batadv next Output of different failed tests ================================ master: cppcheck ---------------- [net/batman-adv/bat_v.c:790] -> [net/batman-adv/bat_v.c:796]: (style) Variable 'curr_gw' is reassigned a value before the old one has been used. [net/batman-adv/bat_v_ogm.c:404] -> [net/batman-adv/bat_v_ogm.c:411]: (style) Variable 'orig_ifinfo' is reassigned a value before the old one has been used. [net/batman-adv/bat_v_ogm.c:489] -> [net/batman-adv/bat_v_ogm.c:498]: (style) Variable 'orig_neigh_node' is reassigned a value before the old one has been used. [net/batman-adv/gateway_client.c:707] -> [net/batman-adv/gateway_client.c:718]: (style) Variable 'orig_dst_node' is reassigned a value before the old one has been used. [net/batman-adv/originator.c:367] -> [net/batman-adv/originator.c:372]: (style) Variable 'orig_ifinfo' is reassigned a value before the old one has been used. [net/batman-adv/originator.c:523] -> [net/batman-adv/originator.c:528]: (style) Variable 'hardif_neigh' is reassigned a value before the old one has been used. [net/batman-adv/originator.c:566] -> [net/batman-adv/originator.c:569]: (style) Variable 'hardif_neigh' is reassigned a value before the old one has been used. [net/batman-adv/originator.c:686] -> [net/batman-adv/originator.c:689]: (style) Variable 'neigh_node' is reassigned a value before the old one has been used. [net/batman-adv/send.c:565] -> [net/batman-adv/send.c:570]: (style) Variable 'primary_if' is reassigned a value before the old one has been used. next: difference between net-next and batadv next ------------------------------------------------- netnext/Documentation/networking/batman-adv.txt | 17 netnext/include/uapi/linux/batman_adv.h | 94 + netnext/net/batman-adv/bat_algo.c | 68 + netnext/net/batman-adv/bat_algo.h | 3 netnext/net/batman-adv/bat_iv_ogm.c | 818 +++++++++++++-- netnext/net/batman-adv/bat_v.c | 722 +++++++++++++ netnext/net/batman-adv/bridge_loop_avoidance.c | 335 ++++++ netnext/net/batman-adv/bridge_loop_avoidance.h | 17 netnext/net/batman-adv/debugfs.c | 18 netnext/net/batman-adv/gateway_client.c | 275 +---- netnext/net/batman-adv/gateway_client.h | 7 netnext/net/batman-adv/gateway_common.c | 5 netnext/net/batman-adv/hard-interface.c | 76 - netnext/net/batman-adv/main.c | 17 netnext/net/batman-adv/main.h | 2 netnext/net/batman-adv/multicast.c | 2 netnext/net/batman-adv/netlink.c | 217 +++ netnext/net/batman-adv/netlink.h | 6 netnext/net/batman-adv/originator.c | 160 ++ netnext/net/batman-adv/originator.h | 4 netnext/net/batman-adv/packet.h | 36 netnext/net/batman-adv/routing.c | 43 netnext/net/batman-adv/send.c | 136 +- netnext/net/batman-adv/send.h | 6 netnext/net/batman-adv/soft-interface.c | 47 netnext/net/batman-adv/sysfs.c | 183 ++- netnext/net/batman-adv/translation-table.c | 546 +++++++++- netnext/net/batman-adv/translation-table.h | 7 netnext/net/batman-adv/types.h | 63 + 29 files changed, 3437 insertions(+), 493 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 139 Tested Linux versions: 26 Tested configs: 90 next ---- Failed tests: 1 Started build tests: 151 Tested Linux versions: 26 Tested configs: 91

1 0

Build check errors found: 2016-08-21
by postmaster＠open-mesh.org 21 Aug '16

21 Aug '16

Name of failed tests ==================== master ------ * cppcheck next ---- * difference between net-next and batadv next Output of different failed tests ================================ master: cppcheck ---------------- [net/batman-adv/bat_v.c:790] -> [net/batman-adv/bat_v.c:796]: (style) Variable 'curr_gw' is reassigned a value before the old one has been used. [net/batman-adv/bat_v_ogm.c:404] -> [net/batman-adv/bat_v_ogm.c:411]: (style) Variable 'orig_ifinfo' is reassigned a value before the old one has been used. [net/batman-adv/bat_v_ogm.c:489] -> [net/batman-adv/bat_v_ogm.c:498]: (style) Variable 'orig_neigh_node' is reassigned a value before the old one has been used. [net/batman-adv/gateway_client.c:707] -> [net/batman-adv/gateway_client.c:718]: (style) Variable 'orig_dst_node' is reassigned a value before the old one has been used. [net/batman-adv/originator.c:367] -> [net/batman-adv/originator.c:372]: (style) Variable 'orig_ifinfo' is reassigned a value before the old one has been used. [net/batman-adv/originator.c:523] -> [net/batman-adv/originator.c:528]: (style) Variable 'hardif_neigh' is reassigned a value before the old one has been used. [net/batman-adv/originator.c:566] -> [net/batman-adv/originator.c:569]: (style) Variable 'hardif_neigh' is reassigned a value before the old one has been used. [net/batman-adv/originator.c:686] -> [net/batman-adv/originator.c:689]: (style) Variable 'neigh_node' is reassigned a value before the old one has been used. [net/batman-adv/send.c:565] -> [net/batman-adv/send.c:570]: (style) Variable 'primary_if' is reassigned a value before the old one has been used. next: difference between net-next and batadv next ------------------------------------------------- netnext/Documentation/networking/batman-adv.txt | 17 netnext/include/uapi/linux/batman_adv.h | 94 + netnext/net/batman-adv/bat_algo.c | 68 + netnext/net/batman-adv/bat_algo.h | 3 netnext/net/batman-adv/bat_iv_ogm.c | 818 +++++++++++++-- netnext/net/batman-adv/bat_v.c | 722 +++++++++++++ netnext/net/batman-adv/bridge_loop_avoidance.c | 335 ++++++ netnext/net/batman-adv/bridge_loop_avoidance.h | 17 netnext/net/batman-adv/debugfs.c | 18 netnext/net/batman-adv/gateway_client.c | 275 +---- netnext/net/batman-adv/gateway_client.h | 7 netnext/net/batman-adv/gateway_common.c | 5 netnext/net/batman-adv/hard-interface.c | 76 - netnext/net/batman-adv/main.c | 17 netnext/net/batman-adv/main.h | 2 netnext/net/batman-adv/multicast.c | 2 netnext/net/batman-adv/netlink.c | 217 +++ netnext/net/batman-adv/netlink.h | 6 netnext/net/batman-adv/originator.c | 160 ++ netnext/net/batman-adv/originator.h | 4 netnext/net/batman-adv/packet.h | 36 netnext/net/batman-adv/routing.c | 43 netnext/net/batman-adv/send.c | 136 +- netnext/net/batman-adv/send.h | 6 netnext/net/batman-adv/soft-interface.c | 47 netnext/net/batman-adv/sysfs.c | 183 ++- netnext/net/batman-adv/translation-table.c | 546 +++++++++- netnext/net/batman-adv/translation-table.h | 7 netnext/net/batman-adv/types.h | 63 + 29 files changed, 3437 insertions(+), 493 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 150 Tested Linux versions: 25 Tested configs: 84 next ---- Failed tests: 1 Started build tests: 142 Tested Linux versions: 26 Tested configs: 86

1 0

Build check errors found: 2016-08-20
by postmaster＠open-mesh.org 20 Aug '16

20 Aug '16

Name of failed tests ==================== master ------ * cppcheck next ---- * difference between net-next and batadv next Output of different failed tests ================================ master: cppcheck ---------------- [net/batman-adv/bat_v.c:790] -> [net/batman-adv/bat_v.c:796]: (style) Variable 'curr_gw' is reassigned a value before the old one has been used. [net/batman-adv/bat_v_ogm.c:404] -> [net/batman-adv/bat_v_ogm.c:411]: (style) Variable 'orig_ifinfo' is reassigned a value before the old one has been used. [net/batman-adv/bat_v_ogm.c:489] -> [net/batman-adv/bat_v_ogm.c:498]: (style) Variable 'orig_neigh_node' is reassigned a value before the old one has been used. [net/batman-adv/gateway_client.c:707] -> [net/batman-adv/gateway_client.c:718]: (style) Variable 'orig_dst_node' is reassigned a value before the old one has been used. [net/batman-adv/originator.c:367] -> [net/batman-adv/originator.c:372]: (style) Variable 'orig_ifinfo' is reassigned a value before the old one has been used. [net/batman-adv/originator.c:523] -> [net/batman-adv/originator.c:528]: (style) Variable 'hardif_neigh' is reassigned a value before the old one has been used. [net/batman-adv/originator.c:566] -> [net/batman-adv/originator.c:569]: (style) Variable 'hardif_neigh' is reassigned a value before the old one has been used. [net/batman-adv/originator.c:686] -> [net/batman-adv/originator.c:689]: (style) Variable 'neigh_node' is reassigned a value before the old one has been used. [net/batman-adv/send.c:565] -> [net/batman-adv/send.c:570]: (style) Variable 'primary_if' is reassigned a value before the old one has been used. next: difference between net-next and batadv next ------------------------------------------------- netnext/Documentation/networking/batman-adv.txt | 17 netnext/include/uapi/linux/batman_adv.h | 94 + netnext/net/batman-adv/bat_algo.c | 68 + netnext/net/batman-adv/bat_algo.h | 3 netnext/net/batman-adv/bat_iv_ogm.c | 818 +++++++++++++-- netnext/net/batman-adv/bat_v.c | 722 +++++++++++++ netnext/net/batman-adv/bridge_loop_avoidance.c | 335 ++++++ netnext/net/batman-adv/bridge_loop_avoidance.h | 17 netnext/net/batman-adv/debugfs.c | 18 netnext/net/batman-adv/gateway_client.c | 275 +---- netnext/net/batman-adv/gateway_client.h | 7 netnext/net/batman-adv/gateway_common.c | 5 netnext/net/batman-adv/hard-interface.c | 76 - netnext/net/batman-adv/main.c | 17 netnext/net/batman-adv/main.h | 2 netnext/net/batman-adv/multicast.c | 2 netnext/net/batman-adv/netlink.c | 217 +++ netnext/net/batman-adv/netlink.h | 6 netnext/net/batman-adv/originator.c | 160 ++ netnext/net/batman-adv/originator.h | 4 netnext/net/batman-adv/packet.h | 36 netnext/net/batman-adv/routing.c | 43 netnext/net/batman-adv/send.c | 136 +- netnext/net/batman-adv/send.h | 6 netnext/net/batman-adv/soft-interface.c | 47 netnext/net/batman-adv/sysfs.c | 183 ++- netnext/net/batman-adv/translation-table.c | 546 +++++++++- netnext/net/batman-adv/translation-table.h | 7 netnext/net/batman-adv/types.h | 63 + 29 files changed, 3437 insertions(+), 493 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 141 Tested Linux versions: 26 Tested configs: 88 next ---- Failed tests: 1 Started build tests: 143 Tested Linux versions: 26 Tested configs: 87

1 0

Build check errors found: 2016-08-19
by postmaster＠open-mesh.org 19 Aug '16

19 Aug '16

Name of failed tests ==================== master ------ * cppcheck next ---- * difference between net-next and batadv next Output of different failed tests ================================ master: cppcheck ---------------- [net/batman-adv/bat_v.c:790] -> [net/batman-adv/bat_v.c:796]: (style) Variable 'curr_gw' is reassigned a value before the old one has been used. [net/batman-adv/bat_v_ogm.c:404] -> [net/batman-adv/bat_v_ogm.c:411]: (style) Variable 'orig_ifinfo' is reassigned a value before the old one has been used. [net/batman-adv/bat_v_ogm.c:489] -> [net/batman-adv/bat_v_ogm.c:498]: (style) Variable 'orig_neigh_node' is reassigned a value before the old one has been used. [net/batman-adv/gateway_client.c:707] -> [net/batman-adv/gateway_client.c:718]: (style) Variable 'orig_dst_node' is reassigned a value before the old one has been used. [net/batman-adv/originator.c:367] -> [net/batman-adv/originator.c:372]: (style) Variable 'orig_ifinfo' is reassigned a value before the old one has been used. [net/batman-adv/originator.c:523] -> [net/batman-adv/originator.c:528]: (style) Variable 'hardif_neigh' is reassigned a value before the old one has been used. [net/batman-adv/originator.c:566] -> [net/batman-adv/originator.c:569]: (style) Variable 'hardif_neigh' is reassigned a value before the old one has been used. [net/batman-adv/originator.c:686] -> [net/batman-adv/originator.c:689]: (style) Variable 'neigh_node' is reassigned a value before the old one has been used. [net/batman-adv/send.c:565] -> [net/batman-adv/send.c:570]: (style) Variable 'primary_if' is reassigned a value before the old one has been used. next: difference between net-next and batadv next ------------------------------------------------- netnext/Documentation/networking/batman-adv.txt | 17 netnext/include/uapi/linux/batman_adv.h | 94 + netnext/net/batman-adv/bat_algo.c | 68 + netnext/net/batman-adv/bat_algo.h | 3 netnext/net/batman-adv/bat_iv_ogm.c | 818 +++++++++++++-- netnext/net/batman-adv/bat_v.c | 722 +++++++++++++ netnext/net/batman-adv/bridge_loop_avoidance.c | 335 ++++++ netnext/net/batman-adv/bridge_loop_avoidance.h | 17 netnext/net/batman-adv/debugfs.c | 18 netnext/net/batman-adv/gateway_client.c | 275 +---- netnext/net/batman-adv/gateway_client.h | 7 netnext/net/batman-adv/gateway_common.c | 5 netnext/net/batman-adv/hard-interface.c | 76 - netnext/net/batman-adv/main.c | 17 netnext/net/batman-adv/main.h | 2 netnext/net/batman-adv/multicast.c | 2 netnext/net/batman-adv/netlink.c | 217 +++ netnext/net/batman-adv/netlink.h | 6 netnext/net/batman-adv/originator.c | 160 ++ netnext/net/batman-adv/originator.h | 4 netnext/net/batman-adv/packet.h | 36 netnext/net/batman-adv/routing.c | 43 netnext/net/batman-adv/send.c | 136 +- netnext/net/batman-adv/send.h | 6 netnext/net/batman-adv/soft-interface.c | 47 netnext/net/batman-adv/sysfs.c | 183 ++- netnext/net/batman-adv/translation-table.c | 546 +++++++++- netnext/net/batman-adv/translation-table.h | 7 netnext/net/batman-adv/types.h | 63 + 29 files changed, 3437 insertions(+), 493 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 152 Tested Linux versions: 26 Tested configs: 94 next ---- Failed tests: 1 Started build tests: 146 Tested Linux versions: 26 Tested configs: 86

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20160818
by batman＠open-mesh.org 18 Aug '16

18 Aug '16

The following commit has been merged in the master branch: commit 4c09a08b47ffac9aa3bc91870aa54c9ae39d9674 Author: Andrew Lunn <andrew(a)lunn.ch> Date: Sun Jul 3 13:31:48 2016 +0200 batman-adv: Indicate netlink socket can be used with netns. Set the netnsof flag on the family structure, indicating it can be used with different network name spaces. Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index c3f6816..18831e7 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -54,6 +54,7 @@ struct genl_family batadv_netlink_family = { .name = BATADV_NL_NAME, .version = 1, .maxattr = BATADV_ATTR_MAX, + .netnsok = true, }; /* multicast groups */ -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20160818
by batman＠open-mesh.org 18 Aug '16

18 Aug '16

The following commit has been merged in the master branch: commit 8dad6f0db6b4457b1c4b04d4edf62744921c32fd Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jul 3 13:31:46 2016 +0200 batman-adv: Provide bla group in the mesh_info netlink msg The bridge loop avoidange is the main information for the debugging of of bridge loop detection problems. It is therefore necessary when comparing the bla claim tables. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index b33675c..464de9d 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -19,6 +19,7 @@ #include "main.h" #include <linux/atomic.h> +#include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/fs.h> #include <linux/genetlink.h> @@ -42,6 +43,7 @@ #include "gateway_client.h" #include "hard-interface.h" #include "originator.h" +#include "packet.h" #include "soft-interface.h" #include "tp_meter.h" #include "translation-table.h" @@ -141,6 +143,12 @@ batadv_netlink_mesh_info_put(struct sk_buff *msg, struct net_device *soft_iface) (u8)atomic_read(&bat_priv->tt.vn))) goto out; +#ifdef CONFIG_BATMAN_ADV_BLA + if (nla_put_u16(msg, BATADV_ATTR_BLA_CRC, + ntohs(bat_priv->bla.claim_dest.group))) + goto out; +#endif + primary_if = batadv_primary_if_get_selected(bat_priv); if (primary_if && primary_if->if_status == BATADV_IF_ACTIVE) { hard_iface = primary_if->net_dev; -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20160818
by batman＠open-mesh.org 18 Aug '16

18 Aug '16

The following commit has been merged in the master branch: commit 04f3f5bf1883fbe0acba5c1fc698cf5cedebc5c5 Author: Andrew Lunn <andrew(a)lunn.ch> Date: Sun Jul 3 13:31:45 2016 +0200 batman-adv: add B.A.T.M.A.N. Dump BLA claims via netlink Dump the list of bridge loop avoidance claims via the netlink socket. Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> [sven.eckelmann(a)open-mesh.com: add policy for attributes, fix includes, fix soft_iface reference leak] Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> [sw(a)simonwunderlich.de: fix kerneldoc, fix error reporting] Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h index a13fc09..96b37ab 100644 --- a/include/uapi/linux/batman_adv.h +++ b/include/uapi/linux/batman_adv.h @@ -91,6 +91,11 @@ enum batadv_tt_client_flags { * @BATADV_ATTR_BANDWIDTH_UP: Reported uplink bandwidth * @BATADV_ATTR_BANDWIDTH_DOWN: Reported downlink bandwidth * @BATADV_ATTR_ROUTER: Gateway router MAC address + * @BATADV_ATTR_BLA_OWN: Flag indicating own originator + * @BATADV_ATTR_BLA_ADDRESS: Bridge loop avoidance claim MAC address + * @BATADV_ATTR_BLA_VID: BLA VLAN ID + * @BATADV_ATTR_BLA_BACKBONE: BLA gateway originator MAC address + * @BATADV_ATTR_BLA_CRC: BLA CRC * @__BATADV_ATTR_AFTER_LAST: internal use * @NUM_BATADV_ATTR: total number of batadv_nl_attrs available * @BATADV_ATTR_MAX: highest attribute number currently defined @@ -126,6 +131,11 @@ enum batadv_nl_attrs { BATADV_ATTR_BANDWIDTH_UP, BATADV_ATTR_BANDWIDTH_DOWN, BATADV_ATTR_ROUTER, + BATADV_ATTR_BLA_OWN, + BATADV_ATTR_BLA_ADDRESS, + BATADV_ATTR_BLA_VID, + BATADV_ATTR_BLA_BACKBONE, + BATADV_ATTR_BLA_CRC, /* add attributes above here, update the policy in netlink.c */ __BATADV_ATTR_AFTER_LAST, NUM_BATADV_ATTR = __BATADV_ATTR_AFTER_LAST, @@ -146,6 +156,7 @@ enum batadv_nl_attrs { * @BATADV_CMD_GET_ORIGINATORS: Query list of originators * @BATADV_CMD_GET_NEIGHBORS: Query list of neighbours * @BATADV_CMD_GET_GATEWAYS: Query list of gateways + * @BATADV_CMD_GET_BLA_CLAIM: Query list of bridge loop avoidance claims * @__BATADV_CMD_AFTER_LAST: internal use * @BATADV_CMD_MAX: highest used command number */ @@ -161,6 +172,7 @@ enum batadv_nl_commands { BATADV_CMD_GET_ORIGINATORS, BATADV_CMD_GET_NEIGHBORS, BATADV_CMD_GET_GATEWAYS, + BATADV_CMD_GET_BLA_CLAIM, /* add new commands above here */ __BATADV_CMD_AFTER_LAST, BATADV_CMD_MAX = __BATADV_CMD_AFTER_LAST - 1 diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index c75ef648..aafa88f 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -35,6 +35,7 @@ #include <linux/list.h> #include <linux/lockdep.h> #include <linux/netdevice.h> +#include <linux/netlink.h> #include <linux/rculist.h> #include <linux/rcupdate.h> #include <linux/seq_file.h> @@ -45,12 +46,18 @@ #include <linux/string.h> #include <linux/workqueue.h> #include <net/arp.h> +#include <net/genetlink.h> +#include <net/netlink.h> +#include <net/sock.h> +#include <uapi/linux/batman_adv.h> #include "hard-interface.h" #include "hash.h" #include "log.h" +#include "netlink.h" #include "originator.h" #include "packet.h" +#include "soft-interface.h" #include "sysfs.h" #include "translation-table.h" @@ -2052,6 +2059,168 @@ out: } /** + * batadv_bla_claim_dump_entry - dump one entry of the claim table + * to a netlink socket + * @msg: buffer for the message + * @portid: netlink port + * @seq: Sequence number of netlink message + * @primary_if: primary interface + * @claim: entry to dump + * + * Return: 0 or error code. + */ +static int +batadv_bla_claim_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, + struct batadv_hard_iface *primary_if, + struct batadv_bla_claim *claim) +{ + u8 *primary_addr = primary_if->net_dev->dev_addr; + u16 backbone_crc; + bool is_own; + void *hdr; + int ret = -EINVAL; + + hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family, + NLM_F_MULTI, BATADV_CMD_GET_BLA_CLAIM); + if (!hdr) { + ret = -ENOBUFS; + goto out; + } + + is_own = batadv_compare_eth(claim->backbone_gw->orig, + primary_addr); + + spin_lock_bh(&claim->backbone_gw->crc_lock); + backbone_crc = claim->backbone_gw->crc; + spin_unlock_bh(&claim->backbone_gw->crc_lock); + + if (is_own) + if (nla_put_flag(msg, BATADV_ATTR_BLA_OWN)) { + genlmsg_cancel(msg, hdr); + goto out; + } + + if (nla_put(msg, BATADV_ATTR_BLA_ADDRESS, ETH_ALEN, claim->addr) || + nla_put_u16(msg, BATADV_ATTR_BLA_VID, claim->vid) || + nla_put(msg, BATADV_ATTR_BLA_BACKBONE, ETH_ALEN, + claim->backbone_gw->orig) || + nla_put_u16(msg, BATADV_ATTR_BLA_CRC, + backbone_crc)) { + genlmsg_cancel(msg, hdr); + goto out; + } + + genlmsg_end(msg, hdr); + ret = 0; + +out: + return ret; +} + +/** + * batadv_bla_claim_dump_bucket - dump one bucket of the claim table + * to a netlink socket + * @msg: buffer for the message + * @portid: netlink port + * @seq: Sequence number of netlink message + * @primary_if: primary interface + * @head: bucket to dump + * @idx_skip: How many entries to skip + * + * Return: always 0. + */ +static int +batadv_bla_claim_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq, + struct batadv_hard_iface *primary_if, + struct hlist_head *head, int *idx_skip) +{ + struct batadv_bla_claim *claim; + int idx = 0; + + rcu_read_lock(); + hlist_for_each_entry_rcu(claim, head, hash_entry) { + if (idx++ < *idx_skip) + continue; + if (batadv_bla_claim_dump_entry(msg, portid, seq, + primary_if, claim)) { + *idx_skip = idx - 1; + goto unlock; + } + } + + *idx_skip = idx; +unlock: + rcu_read_unlock(); + return 0; +} + +/** + * batadv_bla_claim_dump - dump claim table to a netlink socket + * @msg: buffer for the message + * @cb: callback structure containing arguments + * + * Return: message length. + */ +int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb) +{ + struct batadv_hard_iface *primary_if = NULL; + int portid = NETLINK_CB(cb->skb).portid; + struct net *net = sock_net(cb->skb->sk); + struct net_device *soft_iface; + struct batadv_hashtable *hash; + struct batadv_priv *bat_priv; + int bucket = cb->args[0]; + struct hlist_head *head; + int idx = cb->args[1]; + int ifindex; + int ret = 0; + + ifindex = batadv_netlink_get_ifindex(cb->nlh, + BATADV_ATTR_MESH_IFINDEX); + if (!ifindex) + return -EINVAL; + + soft_iface = dev_get_by_index(net, ifindex); + if (!soft_iface || !batadv_softif_is_valid(soft_iface)) { + ret = -ENODEV; + goto out; + } + + bat_priv = netdev_priv(soft_iface); + hash = bat_priv->bla.claim_hash; + + primary_if = batadv_primary_if_get_selected(bat_priv); + if (!primary_if || primary_if->if_status != BATADV_IF_ACTIVE) { + ret = -ENOENT; + goto out; + } + + while (bucket < hash->size) { + head = &hash->table[bucket]; + + if (batadv_bla_claim_dump_bucket(msg, portid, + cb->nlh->nlmsg_seq, + primary_if, head, &idx)) + break; + bucket++; + } + + cb->args[0] = bucket; + cb->args[1] = idx; + + ret = msg->len; + +out: + if (primary_if) + batadv_hardif_put(primary_if); + + if (soft_iface) + dev_put(soft_iface); + + return ret; +} + +/** * batadv_bla_backbone_table_seq_print_text - print the backbone table in a seq * file * @seq: seq file to print on diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index 0f01dae..a80b9e9 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -23,6 +23,7 @@ #include <linux/types.h> struct net_device; +struct netlink_callback; struct seq_file; struct sk_buff; @@ -35,6 +36,7 @@ bool batadv_bla_is_backbone_gw(struct sk_buff *skb, struct batadv_orig_node *orig_node, int hdr_size); int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset); +int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb); int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset); bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, u8 *orig, @@ -47,7 +49,7 @@ void batadv_bla_update_orig_address(struct batadv_priv *bat_priv, void batadv_bla_status_update(struct net_device *net_dev); int batadv_bla_init(struct batadv_priv *bat_priv); void batadv_bla_free(struct batadv_priv *bat_priv); - +int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb); #define BATADV_BLA_CRC_INIT 0 #else /* ifdef CONFIG_BATMAN_ADV_BLA */ @@ -112,6 +114,12 @@ static inline void batadv_bla_free(struct batadv_priv *bat_priv) { } +static inline int batadv_bla_claim_dump(struct sk_buff *msg, + struct netlink_callback *cb) +{ + return -EOPNOTSUPP; +} + #endif /* ifdef CONFIG_BATMAN_ADV_BLA */ #endif /* ifndef _NET_BATMAN_ADV_BLA_H_ */ diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index c68ccb03..b33675c 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -38,6 +38,7 @@ #include <uapi/linux/batman_adv.h> #include "bat_algo.h" +#include "bridge_loop_avoidance.h" #include "gateway_client.h" #include "hard-interface.h" #include "originator.h" @@ -91,6 +92,11 @@ static struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { [BATADV_ATTR_BANDWIDTH_UP] = { .type = NLA_U32 }, [BATADV_ATTR_BANDWIDTH_DOWN] = { .type = NLA_U32 }, [BATADV_ATTR_ROUTER] = { .len = ETH_ALEN }, + [BATADV_ATTR_BLA_OWN] = { .type = NLA_FLAG }, + [BATADV_ATTR_BLA_ADDRESS] = { .len = ETH_ALEN }, + [BATADV_ATTR_BLA_VID] = { .type = NLA_U16 }, + [BATADV_ATTR_BLA_BACKBONE] = { .len = ETH_ALEN }, + [BATADV_ATTR_BLA_CRC] = { .type = NLA_U16 }, }; /** @@ -580,6 +586,12 @@ static struct genl_ops batadv_netlink_ops[] = { .policy = batadv_netlink_policy, .dumpit = batadv_gw_dump, }, + { + .cmd = BATADV_CMD_GET_BLA_CLAIM, + .flags = GENL_ADMIN_PERM, + .policy = batadv_netlink_policy, + .dumpit = batadv_bla_claim_dump, + }, }; /** -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20160818
by batman＠open-mesh.org 18 Aug '16

18 Aug '16

The following commit has been merged in the master branch: commit ea4152e1171604f325f1a5f080190823a0edbc1f Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Sun Jul 3 13:31:47 2016 +0200 batman-adv: add backbone table netlink support Dump the list of bridge loop avoidance backbones via the netlink socket. Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h index 96b37ab..734fe83 100644 --- a/include/uapi/linux/batman_adv.h +++ b/include/uapi/linux/batman_adv.h @@ -157,6 +157,7 @@ enum batadv_nl_attrs { * @BATADV_CMD_GET_NEIGHBORS: Query list of neighbours * @BATADV_CMD_GET_GATEWAYS: Query list of gateways * @BATADV_CMD_GET_BLA_CLAIM: Query list of bridge loop avoidance claims + * @BATADV_CMD_GET_BLA_BACKBONE: Query list of bridge loop avoidance backbones * @__BATADV_CMD_AFTER_LAST: internal use * @BATADV_CMD_MAX: highest used command number */ @@ -173,6 +174,7 @@ enum batadv_nl_commands { BATADV_CMD_GET_NEIGHBORS, BATADV_CMD_GET_GATEWAYS, BATADV_CMD_GET_BLA_CLAIM, + BATADV_CMD_GET_BLA_BACKBONE, /* add new commands above here */ __BATADV_CMD_AFTER_LAST, BATADV_CMD_MAX = __BATADV_CMD_AFTER_LAST - 1 diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index aafa88f..35ed1d3 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -2283,3 +2283,167 @@ out: batadv_hardif_put(primary_if); return 0; } + +/** + * batadv_bla_backbone_dump_entry - dump one entry of the backbone table + * to a netlink socket + * @msg: buffer for the message + * @portid: netlink port + * @seq: Sequence number of netlink message + * @primary_if: primary interface + * @backbone_gw: entry to dump + * + * Return: 0 or error code. + */ +static int +batadv_bla_backbone_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, + struct batadv_hard_iface *primary_if, + struct batadv_bla_backbone_gw *backbone_gw) +{ + u8 *primary_addr = primary_if->net_dev->dev_addr; + u16 backbone_crc; + bool is_own; + int msecs; + void *hdr; + int ret = -EINVAL; + + hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family, + NLM_F_MULTI, BATADV_CMD_GET_BLA_BACKBONE); + if (!hdr) { + ret = -ENOBUFS; + goto out; + } + + is_own = batadv_compare_eth(backbone_gw->orig, primary_addr); + + spin_lock_bh(&backbone_gw->crc_lock); + backbone_crc = backbone_gw->crc; + spin_unlock_bh(&backbone_gw->crc_lock); + + msecs = jiffies_to_msecs(jiffies - backbone_gw->lasttime); + + if (is_own) + if (nla_put_flag(msg, BATADV_ATTR_BLA_OWN)) { + genlmsg_cancel(msg, hdr); + goto out; + } + + if (nla_put(msg, BATADV_ATTR_BLA_BACKBONE, ETH_ALEN, + backbone_gw->orig) || + nla_put_u16(msg, BATADV_ATTR_BLA_VID, backbone_gw->vid) || + nla_put_u16(msg, BATADV_ATTR_BLA_CRC, + backbone_crc) || + nla_put_u32(msg, BATADV_ATTR_LAST_SEEN_MSECS, msecs)) { + genlmsg_cancel(msg, hdr); + goto out; + } + + genlmsg_end(msg, hdr); + ret = 0; + +out: + return ret; +} + +/** + * batadv_bla_backbone_dump_bucket - dump one bucket of the backbone table + * to a netlink socket + * @msg: buffer for the message + * @portid: netlink port + * @seq: Sequence number of netlink message + * @primary_if: primary interface + * @head: bucket to dump + * @idx_skip: How many entries to skip + * + * Return: always 0. + */ +static int +batadv_bla_backbone_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq, + struct batadv_hard_iface *primary_if, + struct hlist_head *head, int *idx_skip) +{ + struct batadv_bla_backbone_gw *backbone_gw; + int idx = 0; + + rcu_read_lock(); + hlist_for_each_entry_rcu(backbone_gw, head, hash_entry) { + if (idx++ < *idx_skip) + continue; + if (batadv_bla_backbone_dump_entry(msg, portid, seq, + primary_if, backbone_gw)) { + *idx_skip = idx - 1; + goto unlock; + } + } + + *idx_skip = idx; +unlock: + rcu_read_unlock(); + return 0; +} + +/** + * batadv_bla_backbone_dump - dump backbone table to a netlink socket + * @msg: buffer for the message + * @cb: callback structure containing arguments + * + * Return: message length. + */ +int batadv_bla_backbone_dump(struct sk_buff *msg, struct netlink_callback *cb) +{ + struct batadv_hard_iface *primary_if = NULL; + int portid = NETLINK_CB(cb->skb).portid; + struct net *net = sock_net(cb->skb->sk); + struct net_device *soft_iface; + struct batadv_hashtable *hash; + struct batadv_priv *bat_priv; + int bucket = cb->args[0]; + struct hlist_head *head; + int idx = cb->args[1]; + int ifindex; + int ret = 0; + + ifindex = batadv_netlink_get_ifindex(cb->nlh, + BATADV_ATTR_MESH_IFINDEX); + if (!ifindex) + return -EINVAL; + + soft_iface = dev_get_by_index(net, ifindex); + if (!soft_iface || !batadv_softif_is_valid(soft_iface)) { + ret = -ENODEV; + goto out; + } + + bat_priv = netdev_priv(soft_iface); + hash = bat_priv->bla.backbone_hash; + + primary_if = batadv_primary_if_get_selected(bat_priv); + if (!primary_if || primary_if->if_status != BATADV_IF_ACTIVE) { + ret = -ENOENT; + goto out; + } + + while (bucket < hash->size) { + head = &hash->table[bucket]; + + if (batadv_bla_backbone_dump_bucket(msg, portid, + cb->nlh->nlmsg_seq, + primary_if, head, &idx)) + break; + bucket++; + } + + cb->args[0] = bucket; + cb->args[1] = idx; + + ret = msg->len; + +out: + if (primary_if) + batadv_hardif_put(primary_if); + + if (soft_iface) + dev_put(soft_iface); + + return ret; +} diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index a80b9e9..1ae93e4 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -39,6 +39,7 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset); int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb); int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset); +int batadv_bla_backbone_dump(struct sk_buff *msg, struct netlink_callback *cb); bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, u8 *orig, unsigned short vid); bool batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, @@ -120,6 +121,12 @@ static inline int batadv_bla_claim_dump(struct sk_buff *msg, return -EOPNOTSUPP; } +static inline int batadv_bla_backbone_dump(struct sk_buff *msg, + struct netlink_callback *cb) +{ + return -EOPNOTSUPP; +} + #endif /* ifdef CONFIG_BATMAN_ADV_BLA */ #endif /* ifndef _NET_BATMAN_ADV_BLA_H_ */ diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 464de9d..c3f6816 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -600,6 +600,13 @@ static struct genl_ops batadv_netlink_ops[] = { .policy = batadv_netlink_policy, .dumpit = batadv_bla_claim_dump, }, + { + .cmd = BATADV_CMD_GET_BLA_BACKBONE, + .flags = GENL_ADMIN_PERM, + .policy = batadv_netlink_policy, + .dumpit = batadv_bla_backbone_dump, + }, + }; /** -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20160818
by batman＠open-mesh.org 18 Aug '16

18 Aug '16

The following commit has been merged in the master branch: commit efb766af06e39101456e3c83e98112ce9ab9739c Author: Andrew Lunn <andrew(a)lunn.ch> Date: Sun Jul 3 13:31:43 2016 +0200 batman-adv: add B.A.T.M.A.N. IV bat_gw_dump implementations Dump the list of gateways via the netlink socket. Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> [sven.eckelmann(a)open-mesh.com: integrate in batadv_algo_ops] Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 7a8c0f6..9ed4f1f 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -2681,6 +2681,110 @@ static void batadv_iv_gw_print(struct batadv_priv *bat_priv, seq_puts(seq, "No gateways in range ...\n"); } +/** + * batadv_iv_gw_dump_entry - Dump a gateway into a message + * @msg: Netlink message to dump into + * @portid: Port making netlink request + * @seq: Sequence number of netlink message + * @bat_priv: The bat priv with all the soft interface information + * @gw_node: Gateway to be dumped + * + * Return: Error code, or 0 on success + */ +static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, + struct batadv_priv *bat_priv, + struct batadv_gw_node *gw_node) +{ + struct batadv_neigh_ifinfo *router_ifinfo = NULL; + struct batadv_neigh_node *router; + struct batadv_gw_node *curr_gw; + int ret = -EINVAL; + void *hdr; + + router = batadv_orig_router_get(gw_node->orig_node, BATADV_IF_DEFAULT); + if (!router) + goto out; + + router_ifinfo = batadv_neigh_ifinfo_get(router, BATADV_IF_DEFAULT); + if (!router_ifinfo) + goto out; + + curr_gw = batadv_gw_get_selected_gw_node(bat_priv); + + hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family, + NLM_F_MULTI, BATADV_CMD_GET_GATEWAYS); + if (!hdr) { + ret = -ENOBUFS; + goto out; + } + + ret = -EMSGSIZE; + + if (curr_gw == gw_node) + if (nla_put_flag(msg, BATADV_ATTR_FLAG_BEST)) { + genlmsg_cancel(msg, hdr); + goto out; + } + + if (nla_put(msg, BATADV_ATTR_ORIG_ADDRESS, ETH_ALEN, + gw_node->orig_node->orig) || + nla_put_u8(msg, BATADV_ATTR_TQ, router_ifinfo->bat_iv.tq_avg) || + nla_put(msg, BATADV_ATTR_ROUTER, ETH_ALEN, + router->addr) || + nla_put_string(msg, BATADV_ATTR_HARD_IFNAME, + router->if_incoming->net_dev->name) || + nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_DOWN, + gw_node->bandwidth_down) || + nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_UP, + gw_node->bandwidth_up)) { + genlmsg_cancel(msg, hdr); + goto out; + } + + genlmsg_end(msg, hdr); + ret = 0; + +out: + if (router_ifinfo) + batadv_neigh_ifinfo_put(router_ifinfo); + if (router) + batadv_neigh_node_put(router); + return ret; +} + +/** + * batadv_iv_gw_dump - Dump gateways into a message + * @msg: Netlink message to dump into + * @cb: Control block containing additional options + * @bat_priv: The bat priv with all the soft interface information + */ +static void batadv_iv_gw_dump(struct sk_buff *msg, struct netlink_callback *cb, + struct batadv_priv *bat_priv) +{ + int portid = NETLINK_CB(cb->skb).portid; + struct batadv_gw_node *gw_node; + int idx_skip = cb->args[0]; + int idx = 0; + + rcu_read_lock(); + hlist_for_each_entry_rcu(gw_node, &bat_priv->gw.list, list) { + if (idx++ < idx_skip) + continue; + + if (batadv_iv_gw_dump_entry(msg, portid, cb->nlh->nlmsg_seq, + bat_priv, gw_node)) { + idx_skip = idx - 1; + goto unlock; + } + } + + idx_skip = idx; +unlock: + rcu_read_unlock(); + + cb->args[0] = idx_skip; +} + static struct batadv_algo_ops batadv_batman_iv __read_mostly = { .name = "BATMAN_IV", .iface = { @@ -2707,6 +2811,7 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = { .get_best_gw_node = batadv_iv_gw_get_best_gw_node, .is_eligible = batadv_iv_gw_is_eligible, .print = batadv_iv_gw_print, + .dump = batadv_iv_gw_dump, }, }; -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20160818
by batman＠open-mesh.org 18 Aug '16

18 Aug '16

The following commit has been merged in the master branch: commit f02a478f518ee5690f279c8c2d3a6222143a7b20 Author: Matthias Schiffer <mschiffer(a)universe-factory.net> Date: Sun Jul 3 13:31:41 2016 +0200 batman-adv: add B.A.T.M.A.N. V bat_{orig, neigh}_dump implementations Dump the algo V originators and neighbours. Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> [sven(a)narfation.org: Fix includes, fix algo_ops integration] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h index ba2359a..2e2747f 100644 --- a/include/uapi/linux/batman_adv.h +++ b/include/uapi/linux/batman_adv.h @@ -87,6 +87,7 @@ enum batadv_tt_client_flags { * @BATADV_ATTR_LAST_SEEN_MSECS: Time in milliseconds since last seen * @BATADV_ATTR_NEIGH_ADDRESS: Neighbour MAC address * @BATADV_ATTR_TQ: TQ to neighbour + * @BATADV_ATTR_THROUGHPUT: Estimated throughput to Neighbour * @__BATADV_ATTR_AFTER_LAST: internal use * @NUM_BATADV_ATTR: total number of batadv_nl_attrs available * @BATADV_ATTR_MAX: highest attribute number currently defined @@ -118,6 +119,7 @@ enum batadv_nl_attrs { BATADV_ATTR_LAST_SEEN_MSECS, BATADV_ATTR_NEIGH_ADDRESS, BATADV_ATTR_TQ, + BATADV_ATTR_THROUGHPUT, /* add attributes above here, update the policy in netlink.c */ __BATADV_ATTR_AFTER_LAST, NUM_BATADV_ATTR = __BATADV_ATTR_AFTER_LAST, diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 1d777b1..9dccfaf 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -22,17 +22,22 @@ #include <linux/bug.h> #include <linux/cache.h> #include <linux/errno.h> +#include <linux/if_ether.h> #include <linux/init.h> #include <linux/jiffies.h> #include <linux/kernel.h> #include <linux/kref.h> #include <linux/netdevice.h> +#include <linux/netlink.h> #include <linux/rculist.h> #include <linux/rcupdate.h> #include <linux/seq_file.h> #include <linux/stddef.h> #include <linux/types.h> #include <linux/workqueue.h> +#include <net/genetlink.h> +#include <net/netlink.h> +#include <uapi/linux/batman_adv.h> #include "bat_algo.h" #include "bat_v_elp.h" @@ -42,9 +47,12 @@ #include "hard-interface.h" #include "hash.h" #include "log.h" +#include "netlink.h" #include "originator.h" #include "packet.h" +struct sk_buff; + static void batadv_v_iface_activate(struct batadv_hard_iface *hard_iface) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); @@ -206,6 +214,138 @@ static void batadv_v_neigh_print(struct batadv_priv *bat_priv, } /** + * batadv_v_neigh_dump_neigh - Dump a neighbour into a message + * @msg: Netlink message to dump into + * @portid: Port making netlink request + * @seq: Sequence number of netlink message + * @hardif_neigh: Neighbour to dump + * + * Return: Error code, or 0 on success + */ +static int +batadv_v_neigh_dump_neigh(struct sk_buff *msg, u32 portid, u32 seq, + struct batadv_hardif_neigh_node *hardif_neigh) +{ + void *hdr; + unsigned int last_seen_msecs; + u32 throughput; + + last_seen_msecs = jiffies_to_msecs(jiffies - hardif_neigh->last_seen); + throughput = ewma_throughput_read(&hardif_neigh->bat_v.throughput); + throughput = throughput * 100; + + hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family, NLM_F_MULTI, + BATADV_CMD_GET_NEIGHBORS); + if (!hdr) + return -ENOBUFS; + + if (nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN, + hardif_neigh->addr) || + nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX, + hardif_neigh->if_incoming->net_dev->ifindex) || + nla_put_u32(msg, BATADV_ATTR_LAST_SEEN_MSECS, + last_seen_msecs) || + nla_put_u32(msg, BATADV_ATTR_THROUGHPUT, throughput)) + goto nla_put_failure; + + genlmsg_end(msg, hdr); + return 0; + + nla_put_failure: + genlmsg_cancel(msg, hdr); + return -EMSGSIZE; +} + +/** + * batadv_v_neigh_dump_hardif - Dump the neighbours of a hard interface into + * a message + * @msg: Netlink message to dump into + * @portid: Port making netlink request + * @seq: Sequence number of netlink message + * @bat_priv: The bat priv with all the soft interface information + * @hard_iface: The hard interface to be dumped + * @idx_s: Entries to be skipped + * + * This function assumes the caller holds rcu_read_lock(). + * + * Return: Error code, or 0 on success + */ +static int +batadv_v_neigh_dump_hardif(struct sk_buff *msg, u32 portid, u32 seq, + struct batadv_priv *bat_priv, + struct batadv_hard_iface *hard_iface, + int *idx_s) +{ + struct batadv_hardif_neigh_node *hardif_neigh; + int idx = 0; + + hlist_for_each_entry_rcu(hardif_neigh, + &hard_iface->neigh_list, list) { + if (idx++ < *idx_s) + continue; + + if (batadv_v_neigh_dump_neigh(msg, portid, seq, hardif_neigh)) { + *idx_s = idx - 1; + return -EMSGSIZE; + } + } + + *idx_s = 0; + return 0; +} + +/** + * batadv_v_neigh_dump - Dump the neighbours of a hard interface into a + * message + * @msg: Netlink message to dump into + * @cb: Control block containing additional options + * @bat_priv: The bat priv with all the soft interface information + * @single_hardif: Limit dumping to this hard interface + */ +static void +batadv_v_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb, + struct batadv_priv *bat_priv, + struct batadv_hard_iface *single_hardif) +{ + struct batadv_hard_iface *hard_iface; + int i_hardif = 0; + int i_hardif_s = cb->args[0]; + int idx = cb->args[1]; + int portid = NETLINK_CB(cb->skb).portid; + + rcu_read_lock(); + if (single_hardif) { + if (i_hardif_s == 0) { + if (batadv_v_neigh_dump_hardif(msg, portid, + cb->nlh->nlmsg_seq, + bat_priv, single_hardif, + &idx) == 0) + i_hardif++; + } + } else { + list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { + if (hard_iface->soft_iface != bat_priv->soft_iface) + continue; + + if (i_hardif++ < i_hardif_s) + continue; + + if (batadv_v_neigh_dump_hardif(msg, portid, + cb->nlh->nlmsg_seq, + bat_priv, hard_iface, + &idx)) { + i_hardif--; + break; + } + } + } + rcu_read_unlock(); + + cb->args[0] = i_hardif; + cb->args[1] = idx; +} + +/** * batadv_v_orig_print - print the originator table * @bat_priv: the bat priv with all the soft interface information * @seq: debugfs table seq_file struct @@ -272,6 +412,204 @@ next: seq_puts(seq, "No batman nodes in range ...\n"); } +/** + * batadv_v_orig_dump_subentry - Dump an originator subentry into a + * message + * @msg: Netlink message to dump into + * @portid: Port making netlink request + * @seq: Sequence number of netlink message + * @bat_priv: The bat priv with all the soft interface information + * @if_outgoing: Limit dump to entries with this outgoing interface + * @orig_node: Originator to dump + * @neigh_node: Single hops neighbour + * @best: Is the best originator + * + * Return: Error code, or 0 on success + */ +static int +batadv_v_orig_dump_subentry(struct sk_buff *msg, u32 portid, u32 seq, + struct batadv_priv *bat_priv, + struct batadv_hard_iface *if_outgoing, + struct batadv_orig_node *orig_node, + struct batadv_neigh_node *neigh_node, + bool best) +{ + struct batadv_neigh_ifinfo *n_ifinfo; + unsigned int last_seen_msecs; + u32 throughput; + void *hdr; + + n_ifinfo = batadv_neigh_ifinfo_get(neigh_node, if_outgoing); + if (!n_ifinfo) + return 0; + + throughput = n_ifinfo->bat_v.throughput * 100; + + batadv_neigh_ifinfo_put(n_ifinfo); + + last_seen_msecs = jiffies_to_msecs(jiffies - orig_node->last_seen); + + if (if_outgoing != BATADV_IF_DEFAULT && + if_outgoing != neigh_node->if_incoming) + return 0; + + hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family, NLM_F_MULTI, + BATADV_CMD_GET_ORIGINATORS); + if (!hdr) + return -ENOBUFS; + + if (nla_put(msg, BATADV_ATTR_ORIG_ADDRESS, ETH_ALEN, orig_node->orig) || + nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN, + neigh_node->addr) || + nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX, + neigh_node->if_incoming->net_dev->ifindex) || + nla_put_u32(msg, BATADV_ATTR_THROUGHPUT, throughput) || + nla_put_u32(msg, BATADV_ATTR_LAST_SEEN_MSECS, + last_seen_msecs)) + goto nla_put_failure; + + if (best && nla_put_flag(msg, BATADV_ATTR_FLAG_BEST)) + goto nla_put_failure; + + genlmsg_end(msg, hdr); + return 0; + + nla_put_failure: + genlmsg_cancel(msg, hdr); + return -EMSGSIZE; +} + +/** + * batadv_v_orig_dump_entry - Dump an originator entry into a message + * @msg: Netlink message to dump into + * @portid: Port making netlink request + * @seq: Sequence number of netlink message + * @bat_priv: The bat priv with all the soft interface information + * @if_outgoing: Limit dump to entries with this outgoing interface + * @orig_node: Originator to dump + * @sub_s: Number of sub entries to skip + * + * This function assumes the caller holds rcu_read_lock(). + * + * Return: Error code, or 0 on success + */ +static int +batadv_v_orig_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, + struct batadv_priv *bat_priv, + struct batadv_hard_iface *if_outgoing, + struct batadv_orig_node *orig_node, int *sub_s) +{ + struct batadv_neigh_node *neigh_node_best; + struct batadv_neigh_node *neigh_node; + int sub = 0; + bool best; + + neigh_node_best = batadv_orig_router_get(orig_node, if_outgoing); + if (!neigh_node_best) + goto out; + + hlist_for_each_entry_rcu(neigh_node, &orig_node->neigh_list, list) { + if (sub++ < *sub_s) + continue; + + best = (neigh_node == neigh_node_best); + + if (batadv_v_orig_dump_subentry(msg, portid, seq, bat_priv, + if_outgoing, orig_node, + neigh_node, best)) { + batadv_neigh_node_put(neigh_node_best); + + *sub_s = sub - 1; + return -EMSGSIZE; + } + } + + out: + if (neigh_node_best) + batadv_neigh_node_put(neigh_node_best); + + *sub_s = 0; + return 0; +} + +/** + * batadv_v_orig_dump_bucket - Dump an originator bucket into a + * message + * @msg: Netlink message to dump into + * @portid: Port making netlink request + * @seq: Sequence number of netlink message + * @bat_priv: The bat priv with all the soft interface information + * @if_outgoing: Limit dump to entries with this outgoing interface + * @head: Bucket to be dumped + * @idx_s: Number of entries to be skipped + * @sub: Number of sub entries to be skipped + * + * Return: Error code, or 0 on success + */ +static int +batadv_v_orig_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq, + struct batadv_priv *bat_priv, + struct batadv_hard_iface *if_outgoing, + struct hlist_head *head, int *idx_s, int *sub) +{ + struct batadv_orig_node *orig_node; + int idx = 0; + + rcu_read_lock(); + hlist_for_each_entry_rcu(orig_node, head, hash_entry) { + if (idx++ < *idx_s) + continue; + + if (batadv_v_orig_dump_entry(msg, portid, seq, bat_priv, + if_outgoing, orig_node, sub)) { + rcu_read_unlock(); + *idx_s = idx - 1; + return -EMSGSIZE; + } + } + rcu_read_unlock(); + + *idx_s = 0; + *sub = 0; + return 0; +} + +/** + * batadv_v_orig_dump - Dump the originators into a message + * @msg: Netlink message to dump into + * @cb: Control block containing additional options + * @bat_priv: The bat priv with all the soft interface information + * @if_outgoing: Limit dump to entries with this outgoing interface + */ +static void +batadv_v_orig_dump(struct sk_buff *msg, struct netlink_callback *cb, + struct batadv_priv *bat_priv, + struct batadv_hard_iface *if_outgoing) +{ + struct batadv_hashtable *hash = bat_priv->orig_hash; + struct hlist_head *head; + int bucket = cb->args[0]; + int idx = cb->args[1]; + int sub = cb->args[2]; + int portid = NETLINK_CB(cb->skb).portid; + + while (bucket < hash->size) { + head = &hash->table[bucket]; + + if (batadv_v_orig_dump_bucket(msg, portid, + cb->nlh->nlmsg_seq, + bat_priv, if_outgoing, head, &idx, + &sub)) + break; + + bucket++; + } + + cb->args[0] = bucket; + cb->args[1] = idx; + cb->args[2] = sub; +} + static int batadv_v_neigh_cmp(struct batadv_neigh_node *neigh1, struct batadv_hard_iface *if_outgoing1, struct batadv_neigh_node *neigh2, @@ -573,9 +911,11 @@ static struct batadv_algo_ops batadv_batman_v __read_mostly = { .cmp = batadv_v_neigh_cmp, .is_similar_or_better = batadv_v_neigh_is_sob, .print = batadv_v_neigh_print, + .dump = batadv_v_neigh_dump, }, .orig = { .print = batadv_v_orig_print, + .dump = batadv_v_orig_dump, }, .gw = { .store_sel_class = batadv_v_store_sel_class, diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 0c7940c..025f2ec 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -86,6 +86,7 @@ static struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { [BATADV_ATTR_LAST_SEEN_MSECS] = { .type = NLA_U32 }, [BATADV_ATTR_NEIGH_ADDRESS] = { .len = ETH_ALEN }, [BATADV_ATTR_TQ] = { .type = NLA_U8 }, + [BATADV_ATTR_THROUGHPUT] = { .type = NLA_U32 }, }; /** -- LinuxNextTracking

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge