From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 159D4C43387 for ; Mon, 7 Jan 2019 11:07:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E48B82147C for ; Mon, 7 Jan 2019 11:07:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727023AbfAGLH2 (ORCPT ); Mon, 7 Jan 2019 06:07:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43302 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726676AbfAGLH2 (ORCPT ); Mon, 7 Jan 2019 06:07:28 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 494DDC057F38; Mon, 7 Jan 2019 11:07:28 +0000 (UTC) Received: from gondolin (ovpn-117-50.ams2.redhat.com [10.36.117.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3FAA55D9CD; Mon, 7 Jan 2019 11:07:20 +0000 (UTC) Date: Mon, 7 Jan 2019 12:07:16 +0100 From: Cornelia Huck To: Masahiro Yamada Cc: Michael Ellerman , Laura Abbott , Alexey Kardashevskiy , Alex Williamson , kvm@vger.kernel.org, Linux Kernel Mailing List Subject: Re: [PATCH] vfio_pci: Add local source directory as include Message-ID: <20190107120716.51d95854.cohuck@redhat.com> In-Reply-To: References: <20190104195714.30045-1-labbott@redhat.com> <874lakc09x.fsf@concordia.ellerman.id.au> Organization: Red Hat GmbH MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 07 Jan 2019 11:07:28 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 7 Jan 2019 19:12:10 +0900 Masahiro Yamada wrote: > On Mon, Jan 7, 2019 at 6:18 PM Michael Ellerman wrote: > > > > Laura Abbott writes: > > > Commit 7f92891778df ("vfio_pci: Add NVIDIA GV100GL [Tesla V100 SXM2] > > > subdriver") introduced a trace.h file in the local directory but > > > missed adding the local include path, resulting in compilation > > > failures with tracepoints: > > > > > > In file included from drivers/vfio/pci/trace.h:102, > > > from drivers/vfio/pci/vfio_pci_nvlink2.c:29: > > > ./include/trace/define_trace.h:89:42: fatal error: ./trace.h: No such file or directory > > > #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) > > > > > > Fix this by adjusting the include path. > > > > > > Fixes: 7f92891778df ("vfio_pci: Add NVIDIA GV100GL [Tesla V100 SXM2] subdriver") > > > Signed-off-by: Laura Abbott (...) > > Alex I assume you'll merge this fix via the vfio tree? > > > > cheers > > > > > diff --git a/drivers/vfio/pci/Makefile b/drivers/vfio/pci/Makefile > > > index 9662c063a6b1..08d4676a8495 100644 > > > --- a/drivers/vfio/pci/Makefile > > > +++ b/drivers/vfio/pci/Makefile > > > @@ -1,3 +1,4 @@ > > > +ccflags-y += -I$(src) > > > > > > vfio-pci-y := vfio_pci.o vfio_pci_intrs.o vfio_pci_rdwr.o vfio_pci_config.o > > > vfio-pci-$(CONFIG_VFIO_PCI_IGD) += vfio_pci_igd.o > > > -- > > > 2.20.1 > > > Hi. > > If I correctly understand the usage of TRACE_INCLUDE_PATH, > the correct fix should be like follows: > > > diff --git a/drivers/vfio/pci/trace.h b/drivers/vfio/pci/trace.h > index 228ccdb..4d13e51 100644 > --- a/drivers/vfio/pci/trace.h > +++ b/drivers/vfio/pci/trace.h > @@ -94,7 +94,7 @@ TRACE_EVENT(vfio_pci_npu2_mmap, > #endif /* _TRACE_VFIO_PCI_H */ > > #undef TRACE_INCLUDE_PATH > -#define TRACE_INCLUDE_PATH . > +#define TRACE_INCLUDE_PATH ../../drivers/vfio/pci > #undef TRACE_INCLUDE_FILE > #define TRACE_INCLUDE_FILE trace Going from the comments in samples/trace_events/trace-events-sample.h, I think both approaches are possible, and I see both used in various places. Personally, I'd prefer Laura's patch, as it doesn't involve hardcoding a path.