From patchwork Thu Aug 31 05:22:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 9931203 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8B362602F0 for ; Thu, 31 Aug 2017 05:25:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B88128847 for ; Thu, 31 Aug 2017 05:25:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 704052884B; Thu, 31 Aug 2017 05:25:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DF80A28847 for ; Thu, 31 Aug 2017 05:25:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnHwH-0007ed-Ux; Thu, 31 Aug 2017 05:22:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnHwE-0007eX-2r for Xen-devel@lists.xensource.com; Thu, 31 Aug 2017 05:22:48 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id B4/B8-02040-52D97A95; Thu, 31 Aug 2017 05:22:45 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRWlGSWpSXmKPExsWSLjbBWVdl7vJ Ig5ZJ6hb3prxnd2D02N63iz2AMYo1My8pvyKBNWNt03zmgil8FZObjzM1MK7k6WLk5BAS6GGS +LpPqYuRi4NFYD6LxNT2m8wgCRYBVYl/m94wgthsAroS/149ZwIpEhF4xSSx4NxedpAEs0Cxx Or1bWBFwgJOEkfuLWMFsXkFzCSe7mhig7AFJU7OfMICUa8l8fDXLShbXmL72znMExi5ZyEpm4 WkbBaSsgWMzKsY1YtTi8pSi3Qt9ZKKMtMzSnITM3N0DQ1M9XJTi4sT01NzEpOK9ZLzczcxAsO EAQh2MK5tdT7EKMnBpCTKG526PFKILyk/pTIjsTgjvqg0J7X4EKMMB4eSBG/MHKCcYFFqempF WmYOMGBh0hIcPEoivHUgad7igsTc4sx0iNQpRkUpcV4HkIQASCKjNA+uDRYllxhlpYR5GYEOE eIpSC3KzSxBlX/FKM7BqCTMawUyhSczrwRu+iugxUxAi2O9loIsLklESEk1MBZ52Cst4vTwMa lLCfJy6LMvU3/1IPSNpHZTnOUsL5k9q26+ebQkR3bu+dlPlryUc9nAuDSa9Z2wUtjBHzdlLE5 sWsn78vHf1Tvvb9swtbHAkneF7QLdDElR/aJpfO92mjl3rarkCLXftP/+828xM6PnpxuucF6i b2fY9rHgzbqy8ljDGcJCdUosxRmJhlrMRcWJAL86Gz6NAgAA X-Env-Sender: sfr@canb.auug.org.au X-Msg-Ref: server-10.tower-206.messagelabs.com!1504156961!81229091!1 X-Originating-IP: [103.22.144.67] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 60598 invoked from network); 31 Aug 2017 05:22:44 -0000 Received: from ozlabs.org (HELO ozlabs.org) (103.22.144.67) by server-10.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 31 Aug 2017 05:22:44 -0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3xjW3N5MtFz9s83; Thu, 31 Aug 2017 15:22:40 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1504156961; bh=rN5PuWirlQ40jAdZXQyW/DC4LE1l8U8x3dWZh75blJs=; h=Date:From:To:Cc:Subject:From; b=HSkqmsEMb4Go2QN6Nq3lPp1RVkzCiJItHGueYZTJ8kyM0DksGa/ILywpS+dJ3djCA Mut1u5x1Mea1O2xlZIv5P2AHLK6Sj4xvffJfI76MYnByEddbqaKF/VwohcLhkFGy4i RuGS1VGlbIl/7kHU8SZ4mh2lBZtdjz5H/9NJ374LtO4PPnoJuV4B1+/IcEW3s9VGK9 022z/XSfvkF4+AZCw7jPT1LR38to1NNHi0WJB0jHl2W8N9xfOj25iRPqPajI+odBp4 JUYhzTn+DI+hPx2AETxPmh32d0izY6obdL/qORMn1Cbz2itsjsEPDxew3l4nHzfKde 5fLPFDMhvm40g== Date: Thu, 31 Aug 2017 15:22:40 +1000 From: Stephen Rothwell To: Juergen Gross , Konrad Rzeszutek Wilk , Stefano Stabellini , Boris Ostrovsky , Xen Devel , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Message-ID: <20170831152240.125004d5@canb.auug.org.au> MIME-Version: 1.0 Cc: Linux-Next Mailing List , Linux Kernel Mailing List Subject: [Xen-devel] linux-next: build failure after merge of the xen-tip tree X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, After merging the xen-tip tree, today's linux-next build (x86_64 allmodconfig) failed like this: arch/x86/xen/xen-asm_64.o: In function `xen_trace_page_fault': (.text+0x174): undefined reference to `trace_page_fault' Caused by commit ad5b8c4ba323 ("xen: get rid of paravirt op adjust_exception_frame") interacting with commit 11a7ffb01703 ("x86/traps: Simplify pagefault tracing logic") from the tip tree. I am not sure how to fix up this, so I have just applied the following patch for today. A better solution would be appreciated. From: Stephen Rothwell Date: Thu, 31 Aug 2017 15:06:10 +1000 Subject: [PATCH] xen: fix for "x86/traps: Simplify pagefault tracing logic" Signed-off-by: Stephen Rothwell --- arch/x86/xen/enlighten_pv.c | 2 +- arch/x86/xen/xen-asm_64.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index b18d9b9f84c2..6ea983a9016d 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -618,7 +618,7 @@ static struct { { alignment_check, xen_alignment_check, false }, { simd_coprocessor_error, xen_simd_coprocessor_error, false }, #ifdef CONFIG_TRACING - { trace_page_fault, xen_trace_page_fault, false }, +// { trace_page_fault, xen_trace_page_fault, false }, #endif }; diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S index 4ebac091a0e8..1c7a3df3e5a5 100644 --- a/arch/x86/xen/xen-asm_64.S +++ b/arch/x86/xen/xen-asm_64.S @@ -52,7 +52,7 @@ xen_pv_trap simd_coprocessor_error xen_pv_trap entry_INT80_compat #endif #ifdef CONFIG_TRACING -xen_pv_trap trace_page_fault +/* xen_pv_trap trace_page_fault */ #endif xen_pv_trap hypervisor_callback