kernel: gen_stats: Fix netlink stats dumping in the presence of padding
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Mon, 2 Jul 2018 17:27:02 +0000 (18:27 +0100)
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Fri, 13 Jul 2018 15:08:34 +0000 (16:08 +0100)
commit3e81365141e4626522c616e7870d246594eff26d
tree9cd1c0cdbfcf0475fabbcf9c3b101dcd1232b676
parentdd1f97b37d41f4d7b85cce31546bc64962ffeab7
kernel: gen_stats: Fix netlink stats dumping in the presence of padding

Backport hot off the press upstream netlink patch.  Fixes stats display
from CAKE qdisc on MIPS allowing us to bump CAKE to latest version.

The gen_stats facility will add a header for the toplevel nlattr of type
TCA_STATS2 that contains all stats added by qdisc callbacks. A reference
to this header is stored in the gnet_dump struct, and when all the
per-qdisc callbacks have finished adding their stats, the length of the
containing header will be adjusted to the right value.

However, on architectures that need padding (i.e., that don't set
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS), the padding nlattr is added
before the stats, which means that the stored pointer will point to the
padding, and so when the header is fixed up, the result is just a very
big padding nlattr. Because most qdiscs also supply the legacy TCA_STATS
struct, this problem has been mostly invisible, but we exposed it with
the netlink attribute-based statistics in CAKE.

Fix the issue by fixing up the stored pointer if it points to a padding
nlattr.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 3698b34a00d623f87a41179e656b8e89d0bb7267)
target/linux/generic/pending-4.14/900-gen_stats-fix-netlink-stats-padding.patch [new file with mode: 0644]
target/linux/generic/pending-4.9/900-gen_stats-fix-netlink-stats-padding.patch [new file with mode: 0644]