| Message ID | 20211014031952.1573640-1-huangkele@bytedance.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c2402d43d183b11445aed921e7bebcd47ef222f1 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ptp: fix error print of ptp_kvm on X86_64 platform | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Thu, 14 Oct 2021 11:19:52 +0800 you wrote: > Commit a86ed2cfa13c5 ("ptp: Don't print an error if ptp_kvm is not supported") > fixes the error message print on ARM platform by only concerning about > the case that the error returned from kvm_arch_ptp_init() is not -EOPNOTSUPP. > Although the ARM platform returns -EOPNOTSUPP if ptp_kvm is not supported > while X86_64 platform returns -KVM_EOPNOTSUPP, both error codes share the > same value 95. > > [...] Here is the summary with links: - ptp: fix error print of ptp_kvm on X86_64 platform https://git.kernel.org/netdev/net/c/c2402d43d183 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/ptp/ptp_kvm_x86.c b/drivers/ptp/ptp_kvm_x86.c index d0096cd7096a..4991054a2135 100644 --- a/drivers/ptp/ptp_kvm_x86.c +++ b/drivers/ptp/ptp_kvm_x86.c @@ -31,10 +31,10 @@ int kvm_arch_ptp_init(void) ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING, clock_pair_gpa, KVM_CLOCK_PAIRING_WALLCLOCK); - if (ret == -KVM_ENOSYS || ret == -KVM_EOPNOTSUPP) + if (ret == -KVM_ENOSYS) return -ENODEV; - return 0; + return ret; } int kvm_arch_ptp_get_clock(struct timespec64 *ts)
Commit a86ed2cfa13c5 ("ptp: Don't print an error if ptp_kvm is not supported") fixes the error message print on ARM platform by only concerning about the case that the error returned from kvm_arch_ptp_init() is not -EOPNOTSUPP. Although the ARM platform returns -EOPNOTSUPP if ptp_kvm is not supported while X86_64 platform returns -KVM_EOPNOTSUPP, both error codes share the same value 95. Actually kvm_arch_ptp_init() on X86_64 platform can return three kinds of errors (-KVM_ENOSYS, -KVM_EOPNOTSUPP and -KVM_EFAULT). The problem is that -KVM_EOPNOTSUPP is masked out and -KVM_EFAULT is ignored among them. This patch fixes this by returning them to ptp_kvm_init() respectively. Signed-off-by: Kele Huang <huangkele@bytedance.com> --- drivers/ptp/ptp_kvm_x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)