bnxt_en: Report the ethtool coredump length after copying the coredump

ethtool first calls .get_dump_flags() to get the dump length.  For
coredump, the driver calls the FW to get the coredump length (L1).  The
min. of L1 and the user specified length is then passed to
.get_dump_data() (L2) to get the coredump.  The actual coredump length
retrieved by the FW (L3) during .get_dump_data() may be smaller than L1.
This length discrepancy will trigger a WARN_ON() in
ethtool_get_dump_data().

ethtool has already vzalloc'ed a buffer with size L1.  Just report
the coredump length as L2 even though the actual coredump length L3
may be smaller.  The extra zero padding does not matter.  This will
prevent the warning that may alarm the user.

For correctness, only do the final length update if there is no error.

Reviewed-by: Andy Gospodarek <andrew.gospodarek@broadcom.com>
Reviewed-by: Damodharam Ammepalli <damodharam.ammepalli@broadcom.com>
Signed-off-by: Shruti Parab <shruti.parab@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Link: https://patch.msgid.link/20250417172448.1206107-3-michael.chan@broadcom.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c
index 5576e7cf8463176c6350f3cf30d210dbd2a1b79c..9b6489e417fc1b8c5455832f90e1d70e3c72abed 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c
@@ -496,9 +496,16 @@ err:
                                          start_utc, coredump.total_segs + 1,
                                          rc);
        kfree(coredump.data);
-       *dump_len += sizeof(struct bnxt_coredump_record);
-       if (rc == -ENOBUFS)
+       if (!rc) {
+               *dump_len += sizeof(struct bnxt_coredump_record);
+               /* The actual coredump length can be smaller than the FW
+                * reported length earlier.  Use the ethtool provided length.
+                */
+               if (buf_len)
+                       *dump_len = buf_len;
+       } else if (rc == -ENOBUFS) {
                netdev_err(bp->dev, "Firmware returned large coredump buffer\n");
+       }
        return rc;
 }