Re: [B.A.T.M.A.N.] [PATCHv3 1/9] batman-adv: make struct batadv_neigh_node algorithm agnostic

Marek Lindner
2013-08-16T03:46:41Z

On Tuesday, August 13, 2013 14:43:44 Antonio Quartulli wrote:
> @@ -1011,13 +1011,13 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr
> *ethhdr, }
>
> /* if the window moved, set the update flag. */
> - need_update |= batadv_bit_get_packet(bat_priv,
> - tmp_neigh_node->real_bits,
> + bitmap = tmp_neigh_node->bat_iv.real_bits;
> + need_update |= batadv_bit_get_packet(bat_priv, bitmap,
> seq_diff, set_mark);
>
> - packet_count = bitmap_weight(tmp_neigh_node->real_bits,
> + packet_count = bitmap_weight(tmp_neigh_node->bat_iv.real_bits,
> BATADV_TQ_LOCAL_WINDOW_SIZE);
> - tmp_neigh_node->real_packet_count = packet_count;
> + tmp_neigh_node->bat_iv.real_packet_count = packet_count;
> }

You can't make assumptions about the size of bitmap because it is platform
specific which is why the variable declaration is a macro in the first place.

> @@ -174,27 +174,28 @@ batadv_orig_node_get_router(struct batadv_orig_node
> *orig_node)
>
> struct batadv_neigh_node *
> batadv_neigh_node_new(struct batadv_hard_iface *hard_iface,
> - const uint8_t *neigh_addr)
> + const uint8_t *neigh_addr,
> + struct batadv_orig_node *orig_node)
> {

That merits some kernel doc! :)

> - struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
> struct batadv_neigh_node *neigh_node;
>
> neigh_node = kzalloc(sizeof(*neigh_node), GFP_ATOMIC);
> if (!neigh_node)
> goto out;
>
> - INIT_HLIST_NODE(&neigh_node->list);
> -
> memcpy(neigh_node->addr, neigh_addr, ETH_ALEN);
> - spin_lock_init(&neigh_node->lq_update_lock);
> + neigh_node->if_incoming = hard_iface;
> + neigh_node->orig_node = orig_node;
> +
> + spin_lock_bh(&orig_node->neigh_list_lock);
> + hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list);
> + spin_unlock_bh(&orig_node->neigh_list_lock);
> +
> + INIT_LIST_HEAD(&neigh_node->bonding_list);
>
> /* extra reference for return */
> atomic_set(&neigh_node->refcount, 2);
>
> - batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
> - "Creating new neighbor %pM on interface %s\n", neigh_addr,
> - hard_iface->net_dev->name);
> -
> out:
> return neigh_node;
> }

All variables should be initialized before we add the new entry to the any
list.

> @@ -436,7 +437,8 @@ batadv_purge_orig_neighbors(struct batadv_priv
> *bat_priv, batadv_neigh_node_free_ref(neigh_node);
> } else {
> if ((!*best_neigh_node) ||
> - (neigh_node->tq_avg > (*best_neigh_node)->tq_avg))
> + (neigh_node->bat_iv.tq_avg >
> + (*best_neigh_node)->bat_iv.tq_avg))
> *best_neigh_node = neigh_node;
> }
> }

Do you think David will accept that ?

> @@ -133,7 +133,8 @@ void batadv_bonding_candidate_add(struct
> batadv_orig_node *orig_node, goto candidate_del;
>
> /* ... and is good enough to be considered */
> - if (neigh_node->tq_avg < router->tq_avg - BATADV_BONDING_TQ_THRESHOLD)
> + if (neigh_node->bat_iv.tq_avg <
> + router->bat_iv.tq_avg - BATADV_BONDING_TQ_THRESHOLD)
> goto candidate_del;
>
> /* check if we have another candidate with the same mac address or

Same here. I suggest to calculate router->bat_iv.tq_avg -
BATADV_BONDING_TQ_THRESHOLD in advance and store it in a variable.

> @@ -470,8 +471,7 @@ batadv_find_bond_router(struct batadv_orig_node
> *primary_orig, * does not exist as rcu version
> */
> list_del_rcu(&primary_orig->bond_list);
> - list_add_rcu(&primary_orig->bond_list,
> - &router->bonding_list);
> + list_add_rcu(&primary_orig->bond_list, &router->bonding_list);
> spin_unlock_bh(&primary_orig->neigh_list_lock);

Looks unrelated to the topic of this patch ?

> /**
> - * struct batadv_neigh_node - structure for single hop neighbors
> - * @list: list node for batadv_orig_node::neigh_list
> - * @addr: mac address of neigh node
> + * struct batadv_neigh_bat_iv - structure for single hop neighbors
> * @tq_recv: ring buffer of received TQ values from this neigh node
> * @tq_index: ring buffer index
> * @tq_avg: averaged tq of all tq values in the ring buffer (tq_recv)
> - * @last_ttl: last received ttl from this neigh node
> - * @bonding_list: list node for batadv_orig_node::bond_list
> - * @last_seen: when last packet via this neighbor was received
> * @real_bits: bitfield containing the number of OGMs received from this
> neigh * node (relative to orig_node->last_real_seqno)
> * @real_packet_count: counted result of real_bits
> - * @orig_node: pointer to corresponding orig_node
> - * @if_incoming: pointer to incoming hard interface
> * @lq_update_lock: lock protecting tq_recv & tq_index
> * @refcount: number of contexts the object is used
> - * @rcu: struct used for freeing in an RCU-safe manner
> */
> -struct batadv_neigh_node {
> - struct hlist_node list;
> - uint8_t addr[ETH_ALEN];
> +struct batadv_neigh_bat_iv {
> uint8_t tq_recv[BATADV_TQ_GLOBAL_WINDOW_SIZE];
> uint8_t tq_index;
> uint8_t tq_avg;
> - uint8_t last_ttl;
> - struct list_head bonding_list;
> - unsigned long last_seen;
> DECLARE_BITMAP(real_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
> uint8_t real_packet_count;
> + spinlock_t lq_update_lock; /* protects tq_recv & tq_index */
> +};

@refcount ?

> +/**
> + * struct batadv_neigh_node - structure for single hops neighbors
> + * @list: list node for batadv_orig_node::neigh_list
> + * @orig_node: pointer to corresponding orig_node
> + * @addr: the MAC address of the neighboring interface
> + * @if_incoming: pointer to incoming hard interface
> + * @last_seen: when last packet via this neighbor was received
> + * @last_ttl: last received ttl from this neigh node
> + * @bonding_list: list node for batadv_orig_node::bond_list
> + * @rcu: struct used for freeing in an RCU-safe manner
> + * @priv: pointer to the routing algorithm private data
> + */
> +struct batadv_neigh_node {
> + struct hlist_node list;
> struct batadv_orig_node *orig_node;
> + uint8_t addr[ETH_ALEN];
> struct batadv_hard_iface *if_incoming;
> - spinlock_t lq_update_lock; /* protects tq_recv & tq_index */
> + unsigned long last_seen;
> + uint8_t last_ttl;
> + struct list_head bonding_list;
> atomic_t refcount;
> struct rcu_head rcu;
> + struct batadv_neigh_bat_iv bat_iv;
> };

@priv ??? Copy and paste bug I presume ?

Cheers,
Marek