Skip to contentSkip to conversation

bnx2x: use ktime_get_seconds() for timestamp

PATCH Applied Arnd Bergmann 3 participants 3 messages Sep 11, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bnx2x: use ktime_get_seconds() for timestamp

commit c48f350ff5e7 "bnx2x: Add MFW dump support" added the bnx2x_update_mfw_dump() function that reads the current time and stores it in a 32-bit field that gets passed into a buffer in a fixed format.

This is potentially broken when the epoch overflows in 2038, and otherwise overflows in 2106. As we're trying to avoid uses of struct timeval for this reason, I noticed the addition of this function, and tried to rewrite it in a way that is more explicit about the overflow and that will keep working once we deprecate struct timeval.

I assume that it is not possible to change the ABI any more, otherwise we should try to use a 64-bit field for the seconds right away.

Cc Yuval Mintz <[email protected]>
Cc Ariel Elior <[email protected]>

---

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +2 -4
index e3da2bddf143..89a174fa1300 100644
@@ -3705,16 +3705,14 @@ out:
 
 void bnx2x_update_mfw_dump(struct bnx2x *bp)
 {
-	struct timeval epoc;
 	u32 drv_ver;
 	u32 valid_dump;
 
 	if (!SHMEM2_HAS(bp, drv_info))
 		return;
 
-	/* Update Driver load time */
-	do_gettimeofday(&epoc);
-	SHMEM2_WR(bp, drv_info.epoc, epoc.tv_sec);
+	/* Update Driver load time, possibly broken in y2038 */
+	SHMEM2_WR(bp, drv_info.epoc, (u32)ktime_get_real_seconds());
 
 	drv_ver = bnx2x_update_mng_version_utility(DRV_MODULE_VERSION, true);
 	SHMEM2_WR(bp, drv_info.drv_ver, drv_ver);
Acked-by on v1 1/1
#1 lore raw
Quoted 2 lines

I assume that it is not possible to change the ABI any more, otherwise we should try to use a 64-bit field.

Actually, I did suggest exactly that to our management team, But this was the decided ABI.

maintainer Applied
#2 lore raw
In reply to Arnd Bergmann

From: Arnd Bergmann <[email protected]>
Date: Fri, 11 Sep 2015 11:33:01 +0200

Quoted 11 lines

commit c48f350ff5e7 "bnx2x: Add MFW dump support" added the bnx2x_update_mfw_dump() function that reads the current time and stores it in a 32-bit field that gets passed into a buffer in a fixed format.

This is potentially broken when the epoch overflows in 2038, and otherwise overflows in 2106. As we're trying to avoid uses of struct timeval for this reason, I noticed the addition of this function, and tried to rewrite it in a way that is more explicit about the overflow and that will keep working once we deprecate struct timeval.

Quoted 4 lines

I assume that it is not possible to change the ABI any more, otherwise we should try to use a 64-bit field for the seconds right away.

Applied, thanks.