| Message ID | 20241203-kvm_ptp-eopnotsuppp-v2-1-d1d060f27aa6@weissschuh.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5e7aa97c7acf171275ac02a8bb018c31b8918d13 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v2] ptp: kvm: x86: Return EOPNOTSUPP instead of ENODEV from kvm_arch_ptp_init() | expand |
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Tue, 03 Dec 2024 18:09:55 +0100 you wrote: > The caller, ptp_kvm_init(), emits a warning if kvm_arch_ptp_init() exits > with any error which is not EOPNOTSUPP: > > "fail to initialize ptp_kvm" > > Replace ENODEV with EOPNOTSUPP to avoid this spurious warning, > aligning with the ARM implementation. > > [...] Here is the summary with links: - [net,v2] ptp: kvm: x86: Return EOPNOTSUPP instead of ENODEV from kvm_arch_ptp_init() https://git.kernel.org/netdev/net/c/5e7aa97c7acf You are awesome, thank you!
diff --git a/drivers/ptp/ptp_kvm_x86.c b/drivers/ptp/ptp_kvm_x86.c index 617c8d6706d3d00f7167fbf7e5b624ced29a206d..6cea4fe39bcfe46ba3b54b0815d3a3d034d415ea 100644 --- a/drivers/ptp/ptp_kvm_x86.c +++ b/drivers/ptp/ptp_kvm_x86.c @@ -26,7 +26,7 @@ int kvm_arch_ptp_init(void) long ret; if (!kvm_para_available()) - return -ENODEV; + return -EOPNOTSUPP; if (cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT)) { p = alloc_page(GFP_KERNEL | __GFP_ZERO); @@ -46,14 +46,14 @@ int kvm_arch_ptp_init(void) clock_pair_gpa = slow_virt_to_phys(clock_pair); if (!pvclock_get_pvti_cpu0_va()) { - ret = -ENODEV; + ret = -EOPNOTSUPP; goto err; } ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING, clock_pair_gpa, KVM_CLOCK_PAIRING_WALLCLOCK); if (ret == -KVM_ENOSYS) { - ret = -ENODEV; + ret = -EOPNOTSUPP; goto err; }
The caller, ptp_kvm_init(), emits a warning if kvm_arch_ptp_init() exits with any error which is not EOPNOTSUPP: "fail to initialize ptp_kvm" Replace ENODEV with EOPNOTSUPP to avoid this spurious warning, aligning with the ARM implementation. Fixes: a86ed2cfa13c ("ptp: Don't print an error if ptp_kvm is not supported") Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> --- Changes in v2: - Reword commit message slightly - Retarget for net tree - Add Fixes: tag - Link to v1: https://lore.kernel.org/r/20241127-kvm_ptp-eopnotsuppp-v1-1-dfae48de972c@weissschuh.net --- drivers/ptp/ptp_kvm_x86.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- base-commit: cdd30ebb1b9f36159d66f088b61aee264e649d7a change-id: 20241127-kvm_ptp-eopnotsuppp-d00278d22b01 Best regards,