commits

commits@lists.open-mesh.org

1 participants
12404 discussions

[batman-adv] master: batman-adv: Use GCC attribute for fallthrough compat (890c6748)
by postmaster＠open-mesh.org 09 Nov '19

09 Nov '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 890c67484bbccda1523b739db31d6f84e8c1af1c Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Nov 9 10:53:13 2019 +0100 batman-adv: Use GCC attribute for fallthrough compat The /* fallthrough */ comment in a define doesn't work in all situations for GCC 8.3.0. The attribute works a lot better but is only supported for GCC 7 (and higher). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 890c67484bbccda1523b739db31d6f84e8c1af1c compat-include/linux/compiler.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compat-include/linux/compiler.h b/compat-include/linux/compiler.h index a4704209..95ded26c 100644 --- a/compat-include/linux/compiler.h +++ b/compat-include/linux/compiler.h @@ -31,7 +31,11 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) #ifndef fallthrough -#define fallthrough do {} while (0) /* fallthrough */ +#if __GNUC__ > 7 && !defined(__CHECKER__) +# define fallthrough __attribute__((__fallthrough__)) +#else +# define fallthrough do {} while (0) /* fallthrough */ +#endif #endif #endif /* < KERNEL_VERSION(5, 4, 0) */

1 0

[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20191105, created. batadv-next-for-davem-20191105
by postmaster＠open-mesh.org 05 Nov '19

05 Nov '19

The annotated tag, batadv-next-for-davem-20191105 has been created at 9acf6bc4aaa214f3c70a6ad56d501ec5d07fa4e9 (tag) tagging 5759af0682b3395e64cf615e062d6ecad01428dc (commit) replaces v5.4-rc5 tagged by Simon Wunderlich on Tue Nov 5 10:34:04 2019 +0100 - Shortlog ------------------------------------------------------------ This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Simplify batadv_v_ogm_aggr_list_free using skb_queue_purge, by Christophe Jaillet - Replace aggr_list_lock with lock free skb handlers, by Christophe Jaillet - explicitly mark fallthrough cases, by Sven Eckelmann - Drop lockdep.h include from soft-interface.c, by Sven Eckelmann -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAl3BQgwWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoYaMD/93QapwlEvS+C/BQXk7B8nmrOUM a/Q2E/Pgp4VX8EjJ031urkWNsqtOOdgi3fx0iUassTDU8ei0bK6vkPN+XYrNoAPO G3Y4kBcyh2gViKC8ClNM2eUkrOpMJD31n7QiVmCPgyxwcK3pNoxvHSLVPgXx65BQ kE+ZEKwfQTe2wATzzYZQbFl8tSj245euBjGKqrV8uVhXIu1EvNsyHKDWZWKZs1v/ igMDKssIn9JBO/AHqxcVqykps6uR8SD2ZPa3n72nDcJcUz5SMgFXuDU2b/QouvUj bjlUxzGfD2V+J6ZcJyQmY3XNq4Ugs1xrqLWkvHlCeisyG3E98pWt1vF2fDl73jyd jjamv6tjdvePYH4xALcxRD5PW+INaIrOjIse3j7gezZPdnVTeUiwpgrixV/eQoeH Ku4RjFiE2eGTFpBHeWvDbtz6KU9f/p0RDlgxBr5ZU+cWvMR2Mqd7ZW6ICvx4UVB8 I/1GwKMsjJcO2FlsVbDXrFvOGHBirzk2BWG8/hLnrQe+E8QAvUaA7pJoqs1YFnSj KnU2pVS1TV8PQTrxIe3CIwBL9uLPD9DjJ1wS7zdvswVQoZxXPof3Ebwe31v+xjsX GmZMeC2nfVxmPojPcXCKf40Ffa8D1PP9YoAQfbhcuEgkeo98uybcfGqBWB7pWQhu 8t7HjEAS8VMx7btLfA== =h5/d -----END PGP SIGNATURE----- Christophe JAILLET (2): batman-adv: Simplify 'batadv_v_ogm_aggr_list_free()' batman-adv: Axe 'aggr_list_lock' David S. Miller (1): Merge tag 'batadv-net-for-davem-20191025' of git://git.open-mesh.org/linux-merge Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (4): batman-adv: Avoid free/alloc race when handling OGM2 buffer batman-adv: Avoid free/alloc race when handling OGM buffer batman-adv: Use 'fallthrough' pseudo keyword batman-adv: Drop lockdep.h include for soft-interface.c Taehee Yoo (1): net: core: add generic lockdep keys ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v5.4-rc6, created. v5.4-rc6
by postmaster＠open-mesh.org 03 Nov '19

03 Nov '19

The annotated tag, v5.4-rc6 has been created at 52bed4561efc5aa3ddeda5e62d083f398c217335 (tag) tagging a99d8080aaf358d5d23581244e5da23b35e340b9 (commit) replaces v5.4-rc5 tagged by Linus Torvalds on Sun Nov 3 14:07:38 2019 -0800 - Shortlog ------------------------------------------------------------ Linux 5.4-rc6 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl2/T6oeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGB7kH/2asrl7RylHPQfsI pkjPPq32MHLq6Zmr8y0N0hyJCm1Dxu8qCIktqrEV5vsbKdv5pb8EMdQRlhJUtR8e TZdYDGHiL0sFb2HYiEvL0qD9BNeI+Kftw/kUffVXRzyMWex/f5S6mW5QNTuv9SQT Zfa+sXreFPCCyd3jhQFRyguogaCXBmTYvO6glmc96Yi4nA1URtIxNXhXumoklElF 8Ka7UqtoJk2nPns+oV9I5xohghgJHHjA3A96WURku1UdO9dRoHiyS05RjnijBxsk ffenk09qbGvnvvgP93Q23CoTO8ndIm12ZL8C9jX49CS21j5SVG0PLPhS08f70vEf h5K/OtE= =nmDP -----END PGP SIGNATURE----- David S. Miller (1): Merge tag 'batadv-net-for-davem-20191025' of git://git.open-mesh.org/linux-merge Sven Eckelmann (2): batman-adv: Avoid free/alloc race when handling OGM2 buffer batman-adv: Avoid free/alloc race when handling OGM buffer Taehee Yoo (1): net: core: add generic lockdep keys ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] ecsv/perf_hacks, ecsv/pu, master: batman-adv: Use 'fallthrough' pseudo keyword (7bb9b06a)
by postmaster＠open-mesh.org 03 Nov '19

03 Nov '19

Repository : ssh://git@open-mesh.org/batman-adv On branches: ecsv/perf_hacks,ecsv/pu,master >--------------------------------------------------------------- commit 7bb9b06ac44dfd0189cf58d6564bfc890cc10e9c Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 31 17:34:37 2019 +0100 batman-adv: Use 'fallthrough' pseudo keyword The usage of the '/* fall through */' comments in switches are no longer marked as non-deprecated variant of implicit fall throughs for switch statements. The commit 294f69e662d1 ("compiler_attributes.h: Add 'fallthrough' pseudo keyword for switch/case use") introduced a replacement keyword which should be used instead. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 7bb9b06ac44dfd0189cf58d6564bfc890cc10e9c compat-include/linux/compiler.h | 9 +++++++++ compat-sources/net/core/skbuff.c | 4 ++-- net/batman-adv/multicast.c | 2 +- net/batman-adv/soft-interface.c | 4 ++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/compat-include/linux/compiler.h b/compat-include/linux/compiler.h index e9ccbc6e..a4704209 100644 --- a/compat-include/linux/compiler.h +++ b/compat-include/linux/compiler.h @@ -27,4 +27,13 @@ #endif /* < KERNEL_VERSION(3, 19, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) + +#ifndef fallthrough +#define fallthrough do {} while (0) /* fallthrough */ +#endif + +#endif /* < KERNEL_VERSION(5, 4, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ */ diff --git a/compat-sources/net/core/skbuff.c b/compat-sources/net/core/skbuff.c index 7386b3c7..16ec56ef 100644 --- a/compat-sources/net/core/skbuff.c +++ b/compat-sources/net/core/skbuff.c @@ -46,7 +46,7 @@ __sum16 skb_checksum_simple_validate(struct sk_buff *skb) case CHECKSUM_COMPLETE: if (!csum_fold(skb->csum)) break; - /* fall through */ + fallthrough; case CHECKSUM_NONE: skb->csum = 0; return skb_checksum_complete(skb); @@ -72,7 +72,7 @@ skb_checksum_validate(struct sk_buff *skb, int proto, if (!csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr, skb->len, IPPROTO_ICMPV6, skb->csum)) break; - /*FALLTHROUGH*/ + fallthrough; case CHECKSUM_NONE: skb->csum = ~csum_unfold(csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr, diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 1d5bdf3a..f9ec8e75 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -1421,7 +1421,7 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, if (*orig) return BATADV_FORW_SINGLE; - /* fall through */ + fallthrough; case 0: return BATADV_FORW_NONE; default: diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index a203dc1b..832e156c 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -229,7 +229,7 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, break; } - /* fall through */ + fallthrough; case ETH_P_BATMAN: goto dropped; } @@ -454,7 +454,7 @@ void batadv_interface_rx(struct net_device *soft_iface, if (vhdr->h_vlan_encapsulated_proto != htons(ETH_P_BATMAN)) break; - /* fall through */ + fallthrough; case ETH_P_BATMAN: goto dropped; }

1 0

[linux-merge]linux integration; annotated tag, batadv-net-for-davem-20191025, deleted. v5.4-rc1-2-g40e220b4218b
by postmaster＠open-mesh.org 31 Oct '19

31 Oct '19

The annotated tag, batadv-net-for-davem-20191025 has been deleted was c58f38f1a81fd434175b17e37209e403c2b61ca6 ----------------------------------------------------------------------- tag batadv-net-for-davem-20191025 Here are two batman-adv bugfixes: * Fix free/alloc race for OGM and OGMv2, by Sven Eckelmann (2 patches) -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAl2yvoAWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoVosEAC7Ei09QJKa2Wh6by4c8OQKvloK ecei39e0FjMUx4/XETSR/kdHrRFwzMPvIhqe+DUCski7p5x9sHWrkJwIWWirGrDf mAsF8mhA1E0pfsQmQRqu4h/UbDyLLhsbfEf95B75Uf6Nq2cIG0Ko7rb2ao3DR7c2 YwvSjzT+zwlS8Q6Hj1YsJKSS3BEk5NQ9r9soD9WhwWmYynn9TxTWy8o9z3lBCXtV j+mOm0qNebxsDKhr7jbfujjIaepmTOQJHwqPzm1Vo/v6CMEdJzd6j8vbsxCUyXvI /Cg3V+8INEGmRmCDT96paO5kYkHptr8i467Raj3DAdwlh3BuoMo382i3D3GOXgEK VtieWhuOplAJrbc+GFifvFSAA75+B8rZ/IV8CDFIbWHhEjZ/fdtyl1panqQkKSqw n5m/nAyKmfTZ9CH0kZ/zKU8EKPaMNh0BUTbjhU/8Zn0lDI+loBs024K5a00TWtD8 GnjCGKi87HhtCn/3hxasbaVEyJIrMvPlzyYRylzFfSml55GCBuA8i8l/7ql0QKCe xq78J08x/n3RjAj+aguLQ1v4Vz/EgOvzj4RdfHS2CGSI9m37z7wz5oFTKcqi4tX+ 4Phpl7onRnMDx6AiZHMGxwrti/AdFO3YZmOiIh/IEBjUBhmABuj6Eq40thl/8Hkv DfoOTKf98HhmaW6d/g== =usWf -----END PGP SIGNATURE----- 40e220b4218bb3d278e5e8cc04ccdfd1c7ff8307 batman-adv: Avoid free/alloc race when handling OGM buffer ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: Use 'fallthrough' pseudo keyword (bf2a47ff)
by postmaster＠open-mesh.org 31 Oct '19

31 Oct '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit bf2a47ffcf2b9b1e201c84a1b6720e1135cb7451 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 31 17:34:37 2019 +0100 batman-adv: Use 'fallthrough' pseudo keyword The usage of the '/* fall through */' comments in switches are no longer marked as non-deprecated variant of implicit fall throughs for switch statements. The commit 294f69e662d1 ("compiler_attributes.h: Add 'fallthrough' pseudo keyword for switch/case use") introduced a replacement keyword which should be used instead. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- bf2a47ffcf2b9b1e201c84a1b6720e1135cb7451 compat-include/linux/compiler.h | 9 +++++++++ compat-sources/net/core/skbuff.c | 4 ++-- net/batman-adv/multicast.c | 2 +- net/batman-adv/soft-interface.c | 4 ++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/compat-include/linux/compiler.h b/compat-include/linux/compiler.h index e9ccbc6e..0c57e156 100644 --- a/compat-include/linux/compiler.h +++ b/compat-include/linux/compiler.h @@ -27,4 +27,13 @@ #endif /* < KERNEL_VERSION(3, 19, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 0) + +#ifndef fallthrough +#define fallthrough do {} while (0) /* fallthrough */ +#endif + +#endif /* < KERNEL_VERSION(5, 3, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ */ diff --git a/compat-sources/net/core/skbuff.c b/compat-sources/net/core/skbuff.c index 7386b3c7..16ec56ef 100644 --- a/compat-sources/net/core/skbuff.c +++ b/compat-sources/net/core/skbuff.c @@ -46,7 +46,7 @@ __sum16 skb_checksum_simple_validate(struct sk_buff *skb) case CHECKSUM_COMPLETE: if (!csum_fold(skb->csum)) break; - /* fall through */ + fallthrough; case CHECKSUM_NONE: skb->csum = 0; return skb_checksum_complete(skb); @@ -72,7 +72,7 @@ skb_checksum_validate(struct sk_buff *skb, int proto, if (!csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr, skb->len, IPPROTO_ICMPV6, skb->csum)) break; - /*FALLTHROUGH*/ + fallthrough; case CHECKSUM_NONE: skb->csum = ~csum_unfold(csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr, diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 1d5bdf3a..f9ec8e75 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -1421,7 +1421,7 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, if (*orig) return BATADV_FORW_SINGLE; - /* fall through */ + fallthrough; case 0: return BATADV_FORW_NONE; default: diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index a203dc1b..832e156c 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -229,7 +229,7 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, break; } - /* fall through */ + fallthrough; case ETH_P_BATMAN: goto dropped; } @@ -454,7 +454,7 @@ void batadv_interface_rx(struct net_device *soft_iface, if (vhdr->h_vlan_encapsulated_proto != htons(ETH_P_BATMAN)) break; - /* fall through */ + fallthrough; case ETH_P_BATMAN: goto dropped; }

1 0

[batman-adv] master: batman-adv: Simplify 'batadv_v_ogm_aggr_list_free()' (af0f7040)
by postmaster＠open-mesh.org 31 Oct '19

31 Oct '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit af0f704023e11cf45106664cdbdfeeb869859497 Author: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Date: Thu Oct 31 08:42:55 2019 +0100 batman-adv: Simplify 'batadv_v_ogm_aggr_list_free()' Use 'skb_queue_purge()' instead of re-implementing it. Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- af0f704023e11cf45106664cdbdfeeb869859497 net/batman-adv/bat_v_ogm.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 8033f24f..76b732e2 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -178,13 +178,9 @@ static bool batadv_v_ogm_queue_left(struct sk_buff *skb, */ static void batadv_v_ogm_aggr_list_free(struct batadv_hard_iface *hard_iface) { - struct sk_buff *skb; - lockdep_assert_held(&hard_iface->bat_v.aggr_list_lock); - while ((skb = skb_dequeue(&hard_iface->bat_v.aggr_list))) - kfree_skb(skb); - + skb_queue_purge(&hard_iface->bat_v.aggr_list); hard_iface->bat_v.aggr_len = 0; }

1 0

[batman-adv] master: batman-adv: Axe 'aggr_list_lock' (ecebfa46)
by postmaster＠open-mesh.org 31 Oct '19

31 Oct '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit ecebfa467770e76ae2bde09b3c03b36f663e0cff Author: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Date: Thu Oct 31 09:52:40 2019 +0100 batman-adv: Axe 'aggr_list_lock' 'aggr_list.lock' can safely be used in place of another explicit spinlock when access to 'aggr_list' has to be guarded. This avoids to take 2 locks, knowing that the 2nd one is always successful. Now that the 'aggr_list.lock' is handled explicitly, the lock-free __sbk_something() variants should be used when dealing with 'aggr_list'. Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- ecebfa467770e76ae2bde09b3c03b36f663e0cff net/batman-adv/bat_v.c | 1 - net/batman-adv/bat_v_ogm.c | 30 +++++++++++++++--------------- net/batman-adv/types.h | 3 --- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 64054edc..4ff6cf1e 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -1085,7 +1085,6 @@ void batadv_v_hardif_init(struct batadv_hard_iface *hard_iface) hard_iface->bat_v.aggr_len = 0; skb_queue_head_init(&hard_iface->bat_v.aggr_list); - spin_lock_init(&hard_iface->bat_v.aggr_list_lock); INIT_DELAYED_WORK(&hard_iface->bat_v.aggr_wq, batadv_v_ogm_aggr_work); } diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 76b732e2..714ce56c 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -152,7 +152,7 @@ static unsigned int batadv_v_ogm_len(struct sk_buff *skb) * @skb: the OGM to check * @hard_iface: the interface to use to send the OGM * - * Caller needs to hold the hard_iface->bat_v.aggr_list_lock. + * Caller needs to hold the hard_iface->bat_v.aggr_list.lock. * * Return: True, if the given OGMv2 packet still fits, false otherwise. */ @@ -163,7 +163,7 @@ static bool batadv_v_ogm_queue_left(struct sk_buff *skb, BATADV_MAX_AGGREGATION_BYTES); unsigned int ogm_len = batadv_v_ogm_len(skb); - lockdep_assert_held(&hard_iface->bat_v.aggr_list_lock); + lockdep_assert_held(&hard_iface->bat_v.aggr_list.lock); return hard_iface->bat_v.aggr_len + ogm_len <= max; } @@ -174,13 +174,13 @@ static bool batadv_v_ogm_queue_left(struct sk_buff *skb, * * Empties the OGMv2 aggregation queue and frees all the skbs it contained. * - * Caller needs to hold the hard_iface->bat_v.aggr_list_lock. + * Caller needs to hold the hard_iface->bat_v.aggr_list.lock. */ static void batadv_v_ogm_aggr_list_free(struct batadv_hard_iface *hard_iface) { - lockdep_assert_held(&hard_iface->bat_v.aggr_list_lock); + lockdep_assert_held(&hard_iface->bat_v.aggr_list.lock); - skb_queue_purge(&hard_iface->bat_v.aggr_list); + __skb_queue_purge(&hard_iface->bat_v.aggr_list); hard_iface->bat_v.aggr_len = 0; } @@ -193,7 +193,7 @@ static void batadv_v_ogm_aggr_list_free(struct batadv_hard_iface *hard_iface) * * The aggregation queue is empty after this call. * - * Caller needs to hold the hard_iface->bat_v.aggr_list_lock. + * Caller needs to hold the hard_iface->bat_v.aggr_list.lock. */ static void batadv_v_ogm_aggr_send(struct batadv_hard_iface *hard_iface) { @@ -202,7 +202,7 @@ static void batadv_v_ogm_aggr_send(struct batadv_hard_iface *hard_iface) unsigned int ogm_len; struct sk_buff *skb; - lockdep_assert_held(&hard_iface->bat_v.aggr_list_lock); + lockdep_assert_held(&hard_iface->bat_v.aggr_list.lock); if (!aggr_len) return; @@ -216,7 +216,7 @@ static void batadv_v_ogm_aggr_send(struct batadv_hard_iface *hard_iface) skb_reserve(skb_aggr, ETH_HLEN + NET_IP_ALIGN); skb_reset_network_header(skb_aggr); - while ((skb = skb_dequeue(&hard_iface->bat_v.aggr_list))) { + while ((skb = __skb_dequeue(&hard_iface->bat_v.aggr_list))) { hard_iface->bat_v.aggr_len -= batadv_v_ogm_len(skb); ogm_len = batadv_v_ogm_len(skb); @@ -243,13 +243,13 @@ static void batadv_v_ogm_queue_on_if(struct sk_buff *skb, return; } - spin_lock_bh(&hard_iface->bat_v.aggr_list_lock); + spin_lock_bh(&hard_iface->bat_v.aggr_list.lock); if (!batadv_v_ogm_queue_left(skb, hard_iface)) batadv_v_ogm_aggr_send(hard_iface); hard_iface->bat_v.aggr_len += batadv_v_ogm_len(skb); - skb_queue_tail(&hard_iface->bat_v.aggr_list, skb); - spin_unlock_bh(&hard_iface->bat_v.aggr_list_lock); + __skb_queue_tail(&hard_iface->bat_v.aggr_list, skb); + spin_unlock_bh(&hard_iface->bat_v.aggr_list.lock); } /** @@ -388,9 +388,9 @@ void batadv_v_ogm_aggr_work(struct work_struct *work) batv = container_of(work, struct batadv_hard_iface_bat_v, aggr_wq.work); hard_iface = container_of(batv, struct batadv_hard_iface, bat_v); - spin_lock_bh(&hard_iface->bat_v.aggr_list_lock); + spin_lock_bh(&hard_iface->bat_v.aggr_list.lock); batadv_v_ogm_aggr_send(hard_iface); - spin_unlock_bh(&hard_iface->bat_v.aggr_list_lock); + spin_unlock_bh(&hard_iface->bat_v.aggr_list.lock); batadv_v_ogm_start_queue_timer(hard_iface); } @@ -421,9 +421,9 @@ void batadv_v_ogm_iface_disable(struct batadv_hard_iface *hard_iface) { cancel_delayed_work_sync(&hard_iface->bat_v.aggr_wq); - spin_lock_bh(&hard_iface->bat_v.aggr_list_lock); + spin_lock_bh(&hard_iface->bat_v.aggr_list.lock); batadv_v_ogm_aggr_list_free(hard_iface); - spin_unlock_bh(&hard_iface->bat_v.aggr_list_lock); + spin_unlock_bh(&hard_iface->bat_v.aggr_list.lock); } /** diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 4d7f1bae..47718a82 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -130,9 +130,6 @@ struct batadv_hard_iface_bat_v { /** @aggr_len: size of the OGM aggregate (excluding ethernet header) */ unsigned int aggr_len; - /** @aggr_list_lock: protects aggr_list */ - spinlock_t aggr_list_lock; - /** * @throughput_override: throughput override to disable link * auto-detection

1 0

[batman-adv] master: batman-adv: Use sizeof_member() macro (8a54d0aa)
by postmaster＠open-mesh.org 31 Oct '19

31 Oct '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 8a54d0aaf9d3c674516eeb03e2768c5cc12c84e1 Author: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya(a)intel.com> Date: Tue Sep 24 16:28:36 2019 +0530 batman-adv: Use sizeof_member() macro Replace all the occurrences of FIELD_SIZEOF() and sizeof_field() with sizeof_member() except at places where these are defined. Later patches will remove the unused definitions. This patch is generated using following script: EXCLUDE_FILES="include/linux/stddef.h|include/linux/kernel.h" git grep -l -e "\bFIELD_SIZEOF\b" -e "\bsizeof_field\b" | while read file; do if [[ "$file" =~ $EXCLUDE_FILES ]]; then continue fi sed -i -e 's/\bFIELD_SIZEOF\b/sizeof_member/g' \ -e 's/\bsizeof_field\b/sizeof_member/g' \ $file; done Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya(a)intel.com> Link: https://lore.kernel.org/r/20190924105839.110713-3-pankaj.laxminarayan.bhara… Co-developed-by: Kees Cook <keescook(a)chromium.org> Signed-off-by: Kees Cook <keescook(a)chromium.org> Acked-by: David Miller <davem(a)davemloft.net> # for net/ [sven(a)narfation.org: add compat code] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 8a54d0aaf9d3c674516eeb03e2768c5cc12c84e1 compat-include/linux/stddef.h | 24 ++++++++++++++++++++++++ net/batman-adv/main.c | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/compat-include/linux/stddef.h b/compat-include/linux/stddef.h new file mode 100644 index 00000000..a09b4201 --- /dev/null +++ b/compat-include/linux/stddef.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_STDDEF_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_STDDEF_H_ + +#include <linux/version.h> +#include_next <linux/stddef.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0) + +#ifndef sizeof_member +#define sizeof_member(TYPE, MEMBER) (sizeof(((TYPE *)0)->MEMBER)) +#endif + +#endif /* < KERNEL_VERSION(5, 5, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_STDDEF_H_ */ diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 4a89177d..49cce458 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -548,7 +548,7 @@ static void batadv_recv_handler_init(void) BUILD_BUG_ON(sizeof(struct batadv_tvlv_tt_change) != 12); BUILD_BUG_ON(sizeof(struct batadv_tvlv_roam_adv) != 8); - i = FIELD_SIZEOF(struct sk_buff, cb); + i = sizeof_member(struct sk_buff, cb); BUILD_BUG_ON(sizeof(struct batadv_skb_cb) > i); /* broadcast packet */

1 0

[batman-adv] master: batman-adv: Drop lockdep.h include for soft-interface.c (25703aaf)
by postmaster＠open-mesh.org 30 Oct '19

30 Oct '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 25703aaf0fe31d1187f0f7d83bb73d67c6b38ad3 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Oct 30 08:03:49 2019 +0100 batman-adv: Drop lockdep.h include for soft-interface.c The commit fced7f6bdf34 ("batman-adv: use generic lockdep keys") removed all lockdep functionality from soft-interface.c but didn't remove the include for this functionality. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 25703aaf0fe31d1187f0f7d83bb73d67c6b38ad3 net/batman-adv/soft-interface.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 5ee8e9a1..a203dc1b 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -22,7 +22,6 @@ #include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> -#include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/percpu.h>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits