UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfp: fix fw dump handling of absolute rtsym size 

Fix bug that causes _absolute_ rtsym sizes of > 8 bytes (as per symbol
table) to result in incorrect space used during a TLV-based debug dump.

Detail: The size calculation stage calculates the correct size (size of
the rtsym address field == 8), while the dump uses the size in the table
to calculate the TLV size to reserve. Symbols with size <= 8 are handled
OK due to aligning sizes to 8, but including any absolute symbol with
listed size > 8 leads to an ENOSPC error during the dump.

Fixes: da762863ed ("nfp: fix absolute rtsym handling in debug dump")
Signed-off-by: Carl Heymann <carl.heymann@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Carl Heymann 2018-01-22 17:29:43 -08:00 committed by David S. Miller
parent c13da21cdb
commit e71494ae68
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/ethernet/netronome/nfp/nfp_net_debugdump.c
View File

@ -640,8 +640,8 @@ nfp_dump_single_rtsym(struct nfp_pf *pf, struct nfp_dumpspec_rtsym *spec,
struct nfp_dump_rtsym *dump_header = dump->p; struct nfp_dump_rtsym *dump_header = dump->p;
struct nfp_dumpspec_cpp_isl_id cpp_params; struct nfp_dumpspec_cpp_isl_id cpp_params;
struct nfp_rtsym_table *rtbl = pf->rtbl; struct nfp_rtsym_table *rtbl = pf->rtbl;
u32 header_size, total_size, sym_size;
const struct nfp_rtsym *sym; const struct nfp_rtsym *sym;
u32 header_size, total_size;
u32 tl_len, key_len; u32 tl_len, key_len;
int bytes_read; int bytes_read;
u32 cpp_id; u32 cpp_id;
@ -657,9 +657,14 @@ nfp_dump_single_rtsym(struct nfp_pf *pf, struct nfp_dumpspec_rtsym *spec,
if (!sym) if (!sym)
return nfp_dump_error_tlv(&spec->tl, -ENOENT, dump); return nfp_dump_error_tlv(&spec->tl, -ENOENT, dump);
if (sym->type == NFP_RTSYM_TYPE_ABS)
sym_size = sizeof(sym->addr);
else
sym_size = sym->size;
header_size = header_size =
ALIGN8(offsetof(struct nfp_dump_rtsym, rtsym) + key_len + 1); ALIGN8(offsetof(struct nfp_dump_rtsym, rtsym) + key_len + 1);
total_size = header_size + ALIGN8(sym->size); total_size = header_size + ALIGN8(sym_size);
dest = dump->p + header_size; dest = dump->p + header_size;
err = nfp_add_tlv(be32_to_cpu(spec->tl.type), total_size, dump); err = nfp_add_tlv(be32_to_cpu(spec->tl.type), total_size, dump);
@ -669,9 +674,9 @@ nfp_dump_single_rtsym(struct nfp_pf *pf, struct nfp_dumpspec_rtsym *spec,
dump_header->padded_name_length = dump_header->padded_name_length =
header_size - offsetof(struct nfp_dump_rtsym, rtsym); header_size - offsetof(struct nfp_dump_rtsym, rtsym);
memcpy(dump_header->rtsym, spec->rtsym, key_len + 1); memcpy(dump_header->rtsym, spec->rtsym, key_len + 1);
dump_header->cpp.dump_length = cpu_to_be32(sym_size);
if (sym->type == NFP_RTSYM_TYPE_ABS) { if (sym->type == NFP_RTSYM_TYPE_ABS) {
dump_header->cpp.dump_length = cpu_to_be32(sizeof(sym->addr));
*(u64 *)dest = sym->addr; *(u64 *)dest = sym->addr;
} else { } else {
cpp_params.target = sym->target; cpp_params.target = sym->target;
@ -681,10 +686,9 @@ nfp_dump_single_rtsym(struct nfp_pf *pf, struct nfp_dumpspec_rtsym *spec,
cpp_id = nfp_get_numeric_cpp_id(&cpp_params); cpp_id = nfp_get_numeric_cpp_id(&cpp_params);
dump_header->cpp.cpp_id = cpp_params; dump_header->cpp.cpp_id = cpp_params;
dump_header->cpp.offset = cpu_to_be32(sym->addr); dump_header->cpp.offset = cpu_to_be32(sym->addr);
dump_header->cpp.dump_length = cpu_to_be32(sym->size);
bytes_read = nfp_cpp_read(pf->cpp, cpp_id, sym->addr, dest, bytes_read = nfp_cpp_read(pf->cpp, cpp_id, sym->addr, dest,
sym->size); sym_size);
if (bytes_read != sym->size) { if (bytes_read != sym_size) {
if (bytes_read >= 0) if (bytes_read >= 0)
bytes_read = -EIO; bytes_read = -EIO;
dump_header->error = cpu_to_be32(bytes_read); dump_header->error = cpu_to_be32(bytes_read);