Changes in 4.9.183 rapidio: fix a NULL pointer dereference when create_workqueue() fails fs/fat/file.c: issue flush after the writeback of FAT sysctl: return -EINVAL if val violates minmax ipc: prevent lockup on alloc_msg and free_msg ARM: prevent tracing IPI_CPU_BACKTRACE hugetlbfs: on restore reserve error path retain subpool reservation mem-hotplug: fix node spanned pages when we have a node with only ZONE_MOVABLE mm/cma.c: fix crash on CMA allocation if bitmap allocation fails mm/cma_debug.c: fix the break condition in cma_maxchunk_get() mm/slab.c: fix an infinite loop in leaks_show() kernel/sys.c: prctl: fix false positive in validate_prctl_map() drivers: thermal: tsens: Don't print error message on -EPROBE_DEFER mfd: tps65912-spi: Add missing of table registration mfd: intel-lpss: Set the device in reset state when init mfd: twl6040: Fix device init errors for ACCCTL register perf/x86/intel: Allow PEBS multi-entry in watermark mode drm/bridge: adv7511: Fix low refresh rate selection objtool: Don't use ignore flag for fake jumps pwm: meson: Use the spin-lock only to protect register modifications ntp: Allow TAI-UTC offset to be set to zero f2fs: fix to avoid panic in do_recover_data() f2fs: fix to clear dirty inode in error path of f2fs_iget() f2fs: fix to do sanity check on valid block count of segment configfs: fix possible use-after-free in configfs_register_group uml: fix a boot splat wrt use of cpu_all_mask watchdog: imx2_wdt: Fix set_timeout for big timeout values watchdog: fix compile time error of pretimeout governors iommu/vt-d: Set intel_iommu_gfx_mapped correctly ALSA: hda - Register irq handler after the chip initialization nvmem: core: fix read buffer in place fuse: retrieve: cap requested size to negotiated max_write nfsd: allow fh_want_write to be called twice x86/PCI: Fix PCI IRQ routing table memory leak platform/chrome: cros_ec_proto: check for NULL transfer function soc: mediatek: pwrap: Zero initialize rdata in pwrap_init_cipher clk: rockchip: Turn on "aclk_dmac1" for suspend on rk3288 ARM: dts: imx6sx: Specify IMX6SX_CLK_IPG as "ahb" clock to SDMA ARM: dts: imx7d: Specify IMX7D_CLK_IPG as "ipg" clock to SDMA ARM: dts: imx6ul: Specify IMX6UL_CLK_IPG as "ipg" clock to SDMA ARM: dts: imx6sx: Specify IMX6SX_CLK_IPG as "ipg" clock to SDMA ARM: dts: imx6qdl: Specify IMX6QDL_CLK_IPG as "ipg" clock to SDMA PCI: rpadlpar: Fix leaked device_node references in add/remove paths platform/x86: intel_pmc_ipc: adding error handling PCI: rcar: Fix a potential NULL pointer dereference PCI: rcar: Fix 64bit MSI message address handling video: hgafb: fix potential NULL pointer dereference video: imsttfb: fix potential NULL pointer dereferences PCI: xilinx: Check for __get_free_pages() failure gpio: gpio-omap: add check for off wake capable gpios dmaengine: idma64: Use actual device for DMA transfers pwm: tiehrpwm: Update shadow register for disabling PWMs ARM: dts: exynos: Always enable necessary APIO_1V8 and ABB_1V8 regulators on Arndale Octa pwm: Fix deadlock warning when removing PWM device ARM: exynos: Fix undefined instruction during Exynos5422 resume Revert "Bluetooth: Align minimum encryption key size for LE and BR/EDR connections" ALSA: seq: Cover unsubscribe_port() in list_mutex ALSA: oxfw: allow PCM capture for Stanton SCS.1m libata: Extend quirks for the ST1000LM024 drives with NOLPM quirk mm/list_lru.c: fix memory leak in __memcg_init_list_lru_node fs/ocfs2: fix race in ocfs2_dentry_attach_lock() signal/ptrace: Don't leak unitialized kernel memory with PTRACE_PEEK_SIGINFO ptrace: restore smp_rmb() in __ptrace_may_access() media: v4l2-ioctl: clear fields in s_parm i2c: acorn: fix i2c warning bcache: fix stack corruption by PRECEDING_KEY() cgroup: Use css_tryget() instead of css_tryget_online() in task_get_css() ASoC: cs42xx8: Add regcache mask dirty ASoC: fsl_asrc: Fix the issue about unsupported rate x86/uaccess, kcov: Disable stack protector ALSA: seq: Protect in-kernel ioctl calls with mutex ALSA: seq: Fix race of get-subscription call vs port-delete ioctls Revert "ALSA: seq: Protect in-kernel ioctl calls with mutex" Drivers: misc: fix out-of-bounds access in function param_set_kgdbts_var scsi: lpfc: add check for loss of ndlp when sending RRQ arm64/mm: Inhibit huge-vmap with ptdump scsi: bnx2fc: fix incorrect cast to u64 on shift operation selftests/timers: Add missing fflush(stdout) calls usbnet: ipheth: fix racing condition KVM: x86/pmu: do not mask the value that is written to fixed PMUs KVM: s390: fix memory slot handling for KVM_SET_USER_MEMORY_REGION drm/vmwgfx: integer underflow in vmw_cmd_dx_set_shader() leading to an invalid read drm/vmwgfx: NULL pointer dereference from vmw_cmd_dx_view_define() usb: dwc2: Fix DMA cache alignment issues USB: Fix chipmunk-like voice when using Logitech C270 for recording audio. USB: usb-storage: Add new ID to ums-realtek USB: serial: pl2303: add Allied Telesis VT-Kit3 USB: serial: option: add support for Simcom SIM7500/SIM7600 RNDIS mode USB: serial: option: add Telit 0x1260 and 0x1261 compositions rtc: pcf8523: don't return invalid date when battery is low ax25: fix inconsistent lock state in ax25_destroy_timer be2net: Fix number of Rx queues used for flow hashing ipv6: flowlabel: fl6_sock_lookup() must use atomic_inc_not_zero lapb: fixed leak of control-blocks. neigh: fix use-after-free read in pneigh_get_next sunhv: Fix device naming inconsistency between sunhv_console and sunhv_reg Revert "staging: vc04_services: prevent integer overflow in create_pagelist()" perf/x86/intel/ds: Fix EVENT vs. UEVENT PEBS constraints selftests: netfilter: missing error check when setting up veth interface mISDN: make sure device name is NUL terminated x86/CPU/AMD: Don't force the CPB cap when running under a hypervisor perf/ring_buffer: Fix exposing a temporarily decreased data_head perf/ring_buffer: Add ordering to rb->nest increment gpio: fix gpio-adp5588 build errors net: tulip: de4x5: Drop redundant MODULE_DEVICE_TABLE() i2c: dev: fix potential memory leak in i2cdev_ioctl_rdwr configfs: Fix use-after-free when accessing sd->s_dentry perf data: Fix 'strncat may truncate' build failure with recent gcc perf record: Fix s390 missing module symbol and warning for non-root users ia64: fix build errors by exporting paddr_to_nid() KVM: PPC: Book3S: Use new mutex to synchronize access to rtas token list KVM: PPC: Book3S HV: Don't take kvm->lock around kvm_for_each_vcpu net: sh_eth: fix mdio access in sh_eth_close() for R-Car Gen2 and RZ/A1 SoCs scsi: libcxgbi: add a check for NULL pointer in cxgbi_check_route() scsi: smartpqi: properly set both the DMA mask and the coherent DMA mask scsi: libsas: delete sas port if expander discover failed mlxsw: spectrum: Prevent force of 56G Abort file_remove_privs() for non-reg. files Linux 4.9.183 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
223 lines
4.7 KiB
C
223 lines
4.7 KiB
C
/* adjtimex() tick adjustment test
|
|
* by: John Stultz <john.stultz@linaro.org>
|
|
* (C) Copyright Linaro Limited 2015
|
|
* Licensed under the GPLv2
|
|
*
|
|
* To build:
|
|
* $ gcc adjtick.c -o adjtick -lrt
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
#include <stdio.h>
|
|
#include <unistd.h>
|
|
#include <stdlib.h>
|
|
#include <sys/time.h>
|
|
#include <sys/timex.h>
|
|
#include <time.h>
|
|
|
|
#ifdef KTEST
|
|
#include "../kselftest.h"
|
|
#else
|
|
static inline int ksft_exit_pass(void)
|
|
{
|
|
exit(0);
|
|
}
|
|
static inline int ksft_exit_fail(void)
|
|
{
|
|
exit(1);
|
|
}
|
|
#endif
|
|
|
|
#define CLOCK_MONOTONIC_RAW 4
|
|
|
|
#define NSEC_PER_SEC 1000000000LL
|
|
#define USEC_PER_SEC 1000000
|
|
|
|
#define MILLION 1000000
|
|
|
|
long systick;
|
|
|
|
long long llabs(long long val)
|
|
{
|
|
if (val < 0)
|
|
val = -val;
|
|
return val;
|
|
}
|
|
|
|
unsigned long long ts_to_nsec(struct timespec ts)
|
|
{
|
|
return ts.tv_sec * NSEC_PER_SEC + ts.tv_nsec;
|
|
}
|
|
|
|
struct timespec nsec_to_ts(long long ns)
|
|
{
|
|
struct timespec ts;
|
|
|
|
ts.tv_sec = ns/NSEC_PER_SEC;
|
|
ts.tv_nsec = ns%NSEC_PER_SEC;
|
|
|
|
return ts;
|
|
}
|
|
|
|
long long diff_timespec(struct timespec start, struct timespec end)
|
|
{
|
|
long long start_ns, end_ns;
|
|
|
|
start_ns = ts_to_nsec(start);
|
|
end_ns = ts_to_nsec(end);
|
|
|
|
return end_ns - start_ns;
|
|
}
|
|
|
|
void get_monotonic_and_raw(struct timespec *mon, struct timespec *raw)
|
|
{
|
|
struct timespec start, mid, end;
|
|
long long diff = 0, tmp;
|
|
int i;
|
|
|
|
clock_gettime(CLOCK_MONOTONIC, mon);
|
|
clock_gettime(CLOCK_MONOTONIC_RAW, raw);
|
|
|
|
/* Try to get a more tightly bound pairing */
|
|
for (i = 0; i < 3; i++) {
|
|
long long newdiff;
|
|
|
|
clock_gettime(CLOCK_MONOTONIC, &start);
|
|
clock_gettime(CLOCK_MONOTONIC_RAW, &mid);
|
|
clock_gettime(CLOCK_MONOTONIC, &end);
|
|
|
|
newdiff = diff_timespec(start, end);
|
|
if (diff == 0 || newdiff < diff) {
|
|
diff = newdiff;
|
|
*raw = mid;
|
|
tmp = (ts_to_nsec(start) + ts_to_nsec(end))/2;
|
|
*mon = nsec_to_ts(tmp);
|
|
}
|
|
}
|
|
}
|
|
|
|
long long get_ppm_drift(void)
|
|
{
|
|
struct timespec mon_start, raw_start, mon_end, raw_end;
|
|
long long delta1, delta2, eppm;
|
|
|
|
get_monotonic_and_raw(&mon_start, &raw_start);
|
|
|
|
sleep(15);
|
|
|
|
get_monotonic_and_raw(&mon_end, &raw_end);
|
|
|
|
delta1 = diff_timespec(mon_start, mon_end);
|
|
delta2 = diff_timespec(raw_start, raw_end);
|
|
|
|
eppm = (delta1*MILLION)/delta2 - MILLION;
|
|
|
|
return eppm;
|
|
}
|
|
|
|
int check_tick_adj(long tickval)
|
|
{
|
|
long long eppm, ppm;
|
|
struct timex tx1;
|
|
|
|
tx1.modes = ADJ_TICK;
|
|
tx1.modes |= ADJ_OFFSET;
|
|
tx1.modes |= ADJ_FREQUENCY;
|
|
tx1.modes |= ADJ_STATUS;
|
|
|
|
tx1.status = STA_PLL;
|
|
tx1.offset = 0;
|
|
tx1.freq = 0;
|
|
tx1.tick = tickval;
|
|
|
|
adjtimex(&tx1);
|
|
|
|
sleep(1);
|
|
|
|
ppm = ((long long)tickval * MILLION)/systick - MILLION;
|
|
printf("Estimating tick (act: %ld usec, %lld ppm): ", tickval, ppm);
|
|
|
|
eppm = get_ppm_drift();
|
|
printf("%lld usec, %lld ppm", systick + (systick * eppm / MILLION), eppm);
|
|
fflush(stdout);
|
|
|
|
tx1.modes = 0;
|
|
adjtimex(&tx1);
|
|
|
|
if (tx1.offset || tx1.freq || tx1.tick != tickval) {
|
|
printf(" [ERROR]\n");
|
|
printf("\tUnexpected adjtimex return values, make sure ntpd is not running.\n");
|
|
return -1;
|
|
}
|
|
|
|
/*
|
|
* Here we use 100ppm difference as an error bound.
|
|
* We likely should see better, but some coarse clocksources
|
|
* cannot match the HZ tick size accurately, so we have a
|
|
* internal correction factor that doesn't scale exactly
|
|
* with the adjustment, resulting in > 10ppm error during
|
|
* a 10% adjustment. 100ppm also gives us more breathing
|
|
* room for interruptions during the measurement.
|
|
*/
|
|
if (llabs(eppm - ppm) > 100) {
|
|
printf(" [FAILED]\n");
|
|
return -1;
|
|
}
|
|
printf(" [OK]\n");
|
|
|
|
return 0;
|
|
}
|
|
|
|
int main(int argv, char **argc)
|
|
{
|
|
struct timespec raw;
|
|
long tick, max, interval, err;
|
|
struct timex tx1;
|
|
|
|
err = 0;
|
|
setbuf(stdout, NULL);
|
|
|
|
if (clock_gettime(CLOCK_MONOTONIC_RAW, &raw)) {
|
|
printf("ERR: NO CLOCK_MONOTONIC_RAW\n");
|
|
return -1;
|
|
}
|
|
|
|
printf("Each iteration takes about 15 seconds\n");
|
|
|
|
systick = sysconf(_SC_CLK_TCK);
|
|
systick = USEC_PER_SEC/sysconf(_SC_CLK_TCK);
|
|
max = systick/10; /* +/- 10% */
|
|
interval = max/4; /* in 4 steps each side */
|
|
|
|
for (tick = (systick - max); tick < (systick + max); tick += interval) {
|
|
if (check_tick_adj(tick)) {
|
|
err = 1;
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* Reset things to zero */
|
|
tx1.modes = ADJ_TICK;
|
|
tx1.modes |= ADJ_OFFSET;
|
|
tx1.modes |= ADJ_FREQUENCY;
|
|
|
|
tx1.offset = 0;
|
|
tx1.freq = 0;
|
|
tx1.tick = systick;
|
|
|
|
adjtimex(&tx1);
|
|
|
|
if (err)
|
|
return ksft_exit_fail();
|
|
|
|
return ksft_exit_pass();
|
|
}
|