cfg80211: track time using boottime (fe0984d3) · Commits · 戴 / test

The cfg80211 layer uses get_seconds() to read the current time in its supend handling. This function is deprecated because of the 32-bit time_t overflow, and it can cause unexpected behavior when the time changes due to settimeofday() calls or leap second updates. In many cases, we want to use monotonic time instead, however cfg80211 explicitly tracks the time spent in suspend, so this changes the driver over to use ktime_get_boottime_seconds(), which is slightly slower, but not used in a fastpath here. Signed-off-by:

Arnd Bergmann <arnd@arndb.de> Signed-off-by:

Johannes Berg <johannes.berg@intel.com>

net/wireless/core.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ struct cfg80211_registered_device {
		struct cfg80211_scan_request scan_req; / protected by RTNL */
		struct sk_buff *scan_msg;
		struct list_head sched_scan_req_list;
		unsigned long suspend_at;
		time64_t suspend_at;
		struct work_struct scan_done_wk;

		struct genl_info *cur_cmd_info;

net/wireless/sysfs.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -102,7 +102,7 @@ static int wiphy_suspend(struct device *dev)
		struct cfg80211_registered_device *rdev = dev_to_rdev(dev);
		int ret = 0;

		rdev->suspend_at = get_seconds();
		rdev->suspend_at = ktime_get_boottime_seconds();

		rtnl_lock();
		if (rdev->wiphy.registered) {
		@@ -130,7 +130,7 @@ static int wiphy_resume(struct device *dev)
		int ret = 0;

		/* Age scan results with time spent in suspend */
		cfg80211_bss_age(rdev, get_seconds() - rdev->suspend_at);
		cfg80211_bss_age(rdev, ktime_get_boottime_seconds() - rdev->suspend_at);

		rtnl_lock();
		if (rdev->wiphy.registered && rdev->ops->resume)

Admin message