From patchwork Sat Nov 12 19:03:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 19225 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1396645wru; Sat, 12 Nov 2022 11:14:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf5yxcl1Z5n8FBq1syM9g8ztSb15odC+Fl3z2IYiaILgWd+26czaEyQaAe4ZpHucte1qAmxt X-Received: by 2002:a05:6402:43c7:b0:460:19c3:2992 with SMTP id p7-20020a05640243c700b0046019c32992mr6048424edc.1.1668280459459; Sat, 12 Nov 2022 11:14:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668280459; cv=none; d=google.com; s=arc-20160816; b=ln49IltLX5L/vuRBPRjOlqrB005lt7DyagRATfh7qXGjOHj1LM6a1fq0r6sJPt317r dAhBa+TEaKxklW127l0fpsoGZycUxCnQjhqG8HWZMeW2ZMZm8ulkPfIv669hmGJnJ5of czTXSRqs3oG45Vz+yY1c8WxSEHYwkGotl37uAz+iS5vwSyPQxIqn0/1K9ZF05qAmP/68 DaA6DBBATqpBkOQhB3u1flO2xC66Zvv32k2AwUGYLNRQL46Fb33hC5ZMOeHMIJQs1Weo QjBtBcX/O1TYnUPlwkB0zPGeWwBKH2c1GIC8QKIwAvPxul9ahtgY7Fn2LJz7UKStY3XG B2Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to :dkim-signature:dkim-signature:from; bh=UlPHg7oN9UJeMU3FvPvwIBheN+dHkzkfX0GVcGqmqwI=; b=Ttdi4tzc2Dc8g5EYjLbFfI2ZY4P2TT1xx6SvzulVDrh3kn2dVPMYI40mFlth5QbU2o yKmYEVx1Cn4Jeduac+wAiMYVy5Uca3kMB6YuIvRj4aiCjYGoU+SAtr/gYPLAcRMhXmmJ KI1e88uJJlKNVyoQhSdUA8+RElwgLR+G8JamlGHhYPFUU162DnVe3eDqLvG7yat9wjCc QD5r0VmpNZy1Jmdo4mXpaX81lIXLH+cnZGKwmDUXzo6fDxD5E+F2q4Pvj4NfFPA8ctSU 1JMzvvEpMyOaMT/3kNjpdL8YclWciWoiRLvfltdZISQ2iBQy5UzQBZh1axy2XgX4JrhH KgZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linutronix.de header.s=2020 header.b=UWKjKP7A; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d6-20020aa7d5c6000000b004596db363c4si4704325eds.264.2022.11.12.11.13.56; Sat, 12 Nov 2022 11:14:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@linutronix.de header.s=2020 header.b=UWKjKP7A; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235078AbiKLTDJ (ORCPT + 99 others); Sat, 12 Nov 2022 14:03:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230257AbiKLTDH (ORCPT ); Sat, 12 Nov 2022 14:03:07 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 690F32706; Sat, 12 Nov 2022 11:03:06 -0800 (PST) From: Thomas Gleixner DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1668279784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=UlPHg7oN9UJeMU3FvPvwIBheN+dHkzkfX0GVcGqmqwI=; b=UWKjKP7Aw9LNViF8bq4SlSEZGztBoENYR3B+xt2fLeqdlkYYzKlyMSXQ9IA5SOddDh9fSP Zq0FBB9wCsaZxoaq/6nPJNEoFOOAJ+bIA4Gm4f8xeptwYYZ7ydl7Wywpb97LCs0FxwQqTk biatQUQrZmuwResgDPFP1aS+Zg/OTi0AAtCqjUACSf0MhDHQ0DGJeHzrXe49x4CKjRL2ur ZwBU3NtCDu6hZpg4kSs8L5SP4ziAUwxNDc7Xowr8BHqfLajLFXTbEdrS8HmEhLM1owakfh zon+UbZenOssKE3dbYK3Cd6MdHXiXi0h4sRF5DN8twxaoSvnp6nNHGG7ySJY3w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1668279784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=UlPHg7oN9UJeMU3FvPvwIBheN+dHkzkfX0GVcGqmqwI=; b=UhlvPMsdlaHdxfKyllnCqK/WOiyDUNsoQc0Mj8Xb0nn9NW2ve9BmOBQpHKgCMMFkR6btNT 1q13Fd+Djka/OdCg== To: LKML Cc: linux-hyperv@vger.kernel.org, Haiyang Zhang , Wei Liu , Dexuan Cui , Michael Kelley , Andy Lutomirski , Vincenzo Frascino , Daniel Lezcano Subject: [PATCH] clocksource/drivers/hyper-v: Include asm/hyperv-tlfs.h not asm/mshyperv.h Date: Sat, 12 Nov 2022 20:03:03 +0100 Message-ID: <87zgcwt2qg.ffs@tglx> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749318851125877705?= X-GMAIL-MSGID: =?utf-8?q?1749318851125877705?= clocksource/hyperv_timer.h is included into the VDSO build. It includes asm/mshyperv.h which in turn includes the world and some more. This worked so far by chance, but any subtle change in the include chain results in a build breakage because VDSO builds are building user space libraries. Include asm/hyperv-tlfs.h instead which contains everything what the VDSO build needs and move the hv_get_raw_timer() define into the header file. Fixup drivers/hv/vmbus_drv.c which relies on the indirect include of asm/mshyperv.h. Signed-off-by: Thomas Gleixner Signed-off-by: Thomas Gleixner Signed-off-by: Thomas Gleixner Signed-off-by: Thomas Gleixner Reviewed-by: Michael Kelley --- arch/x86/include/asm/mshyperv.h | 2 -- drivers/hv/vmbus_drv.c | 1 + include/clocksource/hyperv_timer.h | 4 +++- 3 files changed, 4 insertions(+), 3 deletions(-) --- a/arch/x86/include/asm/mshyperv.h +++ b/arch/x86/include/asm/mshyperv.h @@ -19,8 +19,6 @@ typedef int (*hyperv_fill_flush_list_fun struct hv_guest_mapping_flush_list *flush, void *data); -#define hv_get_raw_timer() rdtsc_ordered() - void hyperv_vector_handler(struct pt_regs *regs); #if IS_ENABLED(CONFIG_HYPERV) --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "hyperv_vmbus.h" struct vmbus_dynid { --- a/include/clocksource/hyperv_timer.h +++ b/include/clocksource/hyperv_timer.h @@ -15,7 +15,7 @@ #include #include -#include +#include #define HV_MAX_MAX_DELTA_TICKS 0xffffffff #define HV_MIN_DELTA_TICKS 1 @@ -34,6 +34,8 @@ extern void hv_init_clocksource(void); extern struct ms_hyperv_tsc_page *hv_get_tsc_page(void); +#define hv_get_raw_timer() rdtsc_ordered() + static inline notrace u64 hv_read_tsc_page_tsc(const struct ms_hyperv_tsc_page *tsc_pg, u64 *cur_tsc) {