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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 627F8C433FE for ; Fri, 15 Oct 2021 16:40:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 49D4D61151 for ; Fri, 15 Oct 2021 16:40:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241501AbhJOQm6 (ORCPT ); Fri, 15 Oct 2021 12:42:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237414AbhJOQm4 (ORCPT ); Fri, 15 Oct 2021 12:42:56 -0400 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28836C061570 for ; Fri, 15 Oct 2021 09:40:50 -0700 (PDT) Received: by mail-io1-xd34.google.com with SMTP id p68so8426395iof.6 for ; Fri, 15 Oct 2021 09:40:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=cFEKbkBBlIdUSgVG3FwLcDv8PzuIGABWNDauFv2pvdg=; b=gC43o2HrD3XrGmKErNwpeqF8FYGF/UIjAVzLj3D/nIZtui8HRTA3+o1ZVdp0Dxn2ow 4zKIFHFoYnmoXbyWkhlQSE06AS9dAT5kmx8VAt3fBqyZ1/oIGiz8lEeXTQL1NKFFwnTj RhLUPEGyDOC3LOnHXzkzZVcEk7nED0dzfIGEk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=cFEKbkBBlIdUSgVG3FwLcDv8PzuIGABWNDauFv2pvdg=; b=CSkV5V6BM/shrrKXKBI2TGM3yAxHTjJHtJvmZHOFf0UIK/loPkumdnUFqJeSESdJkw 3GV4S2SZ+hAtlPFE54vPXo6VsA4JntJTVUQDxL71VIfEww7H2U0dz0S64OcleG7zKOdT yOopD6C1oKiaF5UGa7s2pDKj1tFR5dHK26Gk3AwXBeIIcpLH346FI50cEJkaEaKIQ0ki DEAggjwuc9AlZHVIvusR4SZW2hJpUKeld7zs3nZuW/zYdp0NUfjIWPR0G88BKlbyoQWR Nxc37n5B/sFVl8K3lRA1whqn+ANteC0Q+yxcFjc6Rd33n2JhgFrDsMTsXMzgetdJEOEm oDHg== X-Gm-Message-State: AOAM530mtLBM2Y/j9YsdQThkn+K0EoTf5lqWwqYRolmCfB7+JixtgbEO y/cga/ixXgrwA5BpuhNCinbkug== X-Google-Smtp-Source: ABdhPJxne7L25Mp3x6JTXRZTZKakJy/4NqCH4XO/jExNuoi1l++DGLhaG9fE67PS+8pNb2qxJIAepA== X-Received: by 2002:a02:a996:: with SMTP id q22mr9124800jam.88.1634316049315; Fri, 15 Oct 2021 09:40:49 -0700 (PDT) Received: from [192.168.1.112] (c-24-9-64-241.hsd1.co.comcast.net. [24.9.64.241]) by smtp.gmail.com with ESMTPSA id 188sm2840185ioa.22.2021.10.15.09.40.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 Oct 2021 09:40:48 -0700 (PDT) Subject: Re: selftests/vm madv_populate.c test To: David Hildenbrand Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Shuah Khan References: <0a20f6b6-5985-8b3e-a577-7495dcf7d2b8@redhat.com> <3a06d58e-7301-6fbc-a305-d9f7c7220843@linuxfoundation.org> <77f4c6a9-141d-e103-7339-0055cc00f752@redhat.com> <78de0991-8e9a-693c-c020-472daa9ce916@redhat.com> <54baa765-9ad6-233a-dc60-25073c1625f4@redhat.com> <7ac3c6da-a781-91d5-7ee2-ec05ac167611@redhat.com> From: Shuah Khan Message-ID: <4341bedc-81b9-b8ed-fcaa-b282c976d203@linuxfoundation.org> Date: Fri, 15 Oct 2021 10:40:48 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <7ac3c6da-a781-91d5-7ee2-ec05ac167611@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/15/21 10:34 AM, David Hildenbrand wrote: > On 15.10.21 18:28, David Hildenbrand wrote: >> On 15.10.21 18:25, Shuah Khan wrote: >>> On 10/15/21 10:19 AM, David Hildenbrand wrote: >>>> On 15.10.21 18:15, David Hildenbrand wrote: >>>>> On 15.10.21 18:06, David Hildenbrand wrote: >>>>>> On 15.10.21 17:47, David Hildenbrand wrote: >>>>>>> On 15.10.21 17:45, Shuah Khan wrote: >>>>>>>> On 9/18/21 1:41 AM, David Hildenbrand wrote: >>>>>>>>> On 18.09.21 00:45, Shuah Khan wrote: >>>>>>>>>> Hi David, >>>>>>>>>> >>>>>>>>>> I am running into the following warning when try to build this test: >>>>>>>>>> >>>>>>>>>> madv_populate.c:334:2: warning: #warning "missing MADV_POPULATE_READ or MADV_POPULATE_WRITE definition" [-Wcpp] >>>>>>>>>>     334 | #warning "missing MADV_POPULATE_READ or MADV_POPULATE_WRITE definition" >>>>>>>>>>         |  ^~~~~~~ >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> I see that the following handling is in place. However there is no >>>>>>>>>> other information to explain why the check is necessary. >>>>>>>>>> >>>>>>>>>> #if defined(MADV_POPULATE_READ) && defined(MADV_POPULATE_WRITE) >>>>>>>>>> >>>>>>>>>> #else /* defined(MADV_POPULATE_READ) && defined(MADV_POPULATE_WRITE) */ >>>>>>>>>> >>>>>>>>>> #warning "missing MADV_POPULATE_READ or MADV_POPULATE_WRITE definition" >>>>>>>>>> >>>>>>>>>> I do see these defined in: >>>>>>>>>> >>>>>>>>>> include/uapi/asm-generic/mman-common.h:#define MADV_POPULATE_READ       22 >>>>>>>>>> include/uapi/asm-generic/mman-common.h:#define MADV_POPULATE_WRITE      23 >>>>>>>>>> >>>>>>>>>> Is this the case of missing include from madv_populate.c? >>>>>>>>> >>>>>>>>> Hi Shuan, >>>>>>>>> >>>>>>>>> note that we're including "#include ", which in my >>>>>>>>> understanding maps to the version installed on your system instead >>>>>>>>> of the one in our build environment.ing. >>>>>>>>> >>>>>>>>> So as soon as you have a proper kernel + the proper headers installed >>>>>>>>> and try to build, it would pick up MADV_POPULATE_READ and >>>>>>>>> MADV_POPULATE_WRITE from the updated headers. That makes sense: you >>>>>>>>> annot run any MADV_POPULATE_READ/MADV_POPULATE_WRITE tests on a kernel >>>>>>>>> that doesn't support it. >>>>>>>>> >>>>>>>>> See vm/userfaultfd.c where we do something similar. >>>>>>>>> >>>>>>>> >>>>>>>> Kselftest is for testing the kernel with kernel headers. That is the >>>>>>>> reason why there is the dependency on header install. >>>>>>>> >>>>>>>>> >>>>>>>>> As soon as we have a proper environment, it seems to work just fine: >>>>>>>>> >>>>>>>>> Linux vm-0 5.15.0-0.rc1.20210915git3ca706c189db.13.fc36.x86_64 #1 SMP Thu Sep 16 11:32:54 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux >>>>>>>>> [root@vm-0 linux]# cat /etc/redhat-release >>>>>>>>> Fedora release 36 (Rawhide) >>>>>>>> >>>>>>>> This is a distro release. We don't want to have dependency on headers >>>>>>>> from the distro to run selftests. Hope this makes sense. >>>>>>>> >>>>>>>> I still see this on my test system running Linux 5.15-rc5. >>>>>>> >>>>>>> Did you also install Linux headers? I assume no, correct? >>>>>>> >>>>>> >>>>>> What happens in your environment when compiling and running the >>>>>> memfd_secret test? >>>>>> >>>>>> If assume you'll see a "skip" when executing, because it might also >>>>>> refer to the local version of linux headers and although it builds, it >>>>>> really cannot build something "functional". It just doesn't add a >>>>>> "#warning" to make that obvious. >>>>>> >>>>> >>>>> The following works but looks extremely hackish. >>>>> >>>>> diff --git a/tools/testing/selftests/vm/madv_populate.c >>>>> b/tools/testing/selftests/vm/madv_populate.c >>>>> index b959e4ebdad4..ab26163db540 100644 >>>>> --- a/tools/testing/selftests/vm/madv_populate.c >>>>> +++ b/tools/testing/selftests/vm/madv_populate.c >>>>> @@ -14,12 +14,11 @@ >>>>> #include >>>>> #include >>>>> #include >>>>> +#include "../../../../usr/include/linux/mman.h" >>>>> #include >>>>> >>>>> #include "../kselftest.h" >>>>> >>>>> -#if defined(MADV_POPULATE_READ) && defined(MADV_POPULATE_WRITE) >>>>> - >>>>> /* >>>>> * For now, we're using 2 MiB of private anonymous memory for all tests. >>>>> */ >>>>> @@ -328,15 +327,3 @@ int main(int argc, char **argv) >>>>> err, ksft_test_num()); >>>>> return ksft_exit_pass(); >>>>> } >>>>> - >>>>> -#else /* defined(MADV_POPULATE_READ) && defined(MADV_POPULATE_WRITE) */ >>>>> - >>>>> -#warning "missing MADV_POPULATE_READ or MADV_POPULATE_WRITE definition" >>>>> - >>>>> -int main(int argc, char **argv) >>>>> -{ >>>>> - ksft_print_header(); >>>>> - ksft_exit_skip("MADV_POPULATE_READ or MADV_POPULATE_WRITE not >>>>> defined\n"); >>>>> -} >>>>> - >>>>> -#endif /* defined(MADV_POPULATE_READ) && defined(MADV_POPULATE_WRITE) */ >>>>> >>>>> >>>>> There has to be some clean way to achieve the same. >>>>> >>>> >>>> Sorry for the spam, >>>> >>>> diff --git a/tools/testing/selftests/vm/Makefile >>>> b/tools/testing/selftests/vm/Makefile >>>> index d9605bd10f2d..ce198b329ff5 100644 >>>> --- a/tools/testing/selftests/vm/Makefile >>>> +++ b/tools/testing/selftests/vm/Makefile >>>> @@ -23,7 +23,7 @@ MACHINE ?= $(shell echo $(uname_M) | sed -e >>>> 's/aarch64.*/arm64/' -e 's/ppc64.*/p >>>> # LDLIBS. >>>> MAKEFLAGS += --no-builtin-rules >>>> >>>> -CFLAGS = -Wall -I ../../../../usr/include $(EXTRA_CFLAGS) >>>> +CFLAGS = -Wall -idirafter ../../../../usr/include $(EXTRA_CFLAGS) >>>> LDLIBS = -lrt -lpthread >>>> TEST_GEN_FILES = compaction_test >>>> TEST_GEN_FILES += gup_test >>>> >>>> >>>> Seems to set the right include path priority. >>>> >>>> >>> >>> Yes. It works on linux-next-20211012 >>> >>> Do you mind sending a me patch for this? >> >> I just double-checked (after make clean) and there is still something >> wrong :( the only think that seems to work is the >> >> +#include "../../../../usr/include/linux/mman.h" >> #include >> >> hack. >> >> Using "-nostdinc" won't work because we need other headers :( >> > > And ... I think I know the problem. > > In ../../../../usr/include, there is no "sys" directory. It's called > "linux". > > But including instead of doesn't work > either. The only thing that seems to work is > > > diff --git a/tools/testing/selftests/vm/madv_populate.c > b/tools/testing/selftests/vm/madv_populate.c > index b959e4ebdad4..3ee0e8275600 100644 > --- a/tools/testing/selftests/vm/madv_populate.c > +++ b/tools/testing/selftests/vm/madv_populate.c > @@ -14,12 +14,11 @@ > #include > #include > #include > +#include > #include > > #include "../kselftest.h" > > -#if defined(MADV_POPULATE_READ) && defined(MADV_POPULATE_WRITE) > - > /* > * For now, we're using 2 MiB of private anonymous memory for all tests. > */ > @@ -328,15 +327,3 @@ int main(int argc, char **argv) > err, ksft_test_num()); > return ksft_exit_pass(); > } > - > -#else /* defined(MADV_POPULATE_READ) && defined(MADV_POPULATE_WRITE) */ > - > -#warning "missing MADV_POPULATE_READ or MADV_POPULATE_WRITE definition" > - > -int main(int argc, char **argv) > -{ > - ksft_print_header(); > - ksft_exit_skip("MADV_POPULATE_READ or MADV_POPULATE_WRITE not > defined\n"); > -} > - > -#endif /* defined(MADV_POPULATE_READ) && defined(MADV_POPULATE_WRITE) */ > > I tried with just the following and it worked after kselftest-clean as well. diff --git a/tools/testing/selftests/vm/madv_populate.c b/tools/testing/selftests/vm/madv_populate.c index b959e4ebdad4..f9e4b8e1b28c 100644 --- a/tools/testing/selftests/vm/madv_populate.c +++ b/tools/testing/selftests/vm/madv_populate.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include "../kselftest.h" thanks, -- Shuah