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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79B05EB64D7 for ; Tue, 20 Jun 2023 10:17:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D87058D0002; Tue, 20 Jun 2023 06:17:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D363D8D0001; Tue, 20 Jun 2023 06:17:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C24DE8D0002; Tue, 20 Jun 2023 06:17:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B33BC8D0001 for ; Tue, 20 Jun 2023 06:17:24 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 89B6A1608DB for ; Tue, 20 Jun 2023 10:17:24 +0000 (UTC) X-FDA: 80922724008.21.E0C9CCA Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by imf07.hostedemail.com (Postfix) with ESMTP id AA45740024 for ; Tue, 20 Jun 2023 10:17:22 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=mQJjtR8I; dmarc=pass (policy=quarantine) header.from=collabora.com; spf=pass (imf07.hostedemail.com: domain of usama.anjum@collabora.com designates 46.235.227.172 as permitted sender) smtp.mailfrom=usama.anjum@collabora.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687256242; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=PIFx7jNY3iVIPJkg+ymleq1vafUYZpvKZQEulPZ4l44=; b=pmK+TWpkDKcTh50DAbsJk0ZWHBq3rDiWy5ONd/9ePKglG4zIo0Up9orkQNTuSNdfPWVNoI 5sc3P8FWrYjz39ckiluieG8m/YjLomtGiLTVIdATGsgMx3cCs/OObrmFzhp0aEoEvUVlnj xWpMYTr5x+7bpcTXozqaB+hTg0ox1+Q= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=mQJjtR8I; dmarc=pass (policy=quarantine) header.from=collabora.com; spf=pass (imf07.hostedemail.com: domain of usama.anjum@collabora.com designates 46.235.227.172 as permitted sender) smtp.mailfrom=usama.anjum@collabora.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687256242; a=rsa-sha256; cv=none; b=oRYNo64Govx1pUPLG31TaXPXyNUP7AazE9lU9chzShoScOlkgCueLrpVeZ9w5iFZAzvYNi HTUs/Dkmirnyj6+s8wDjwOVflIGy1BMpetCsn5L4mKZ82y2Gf1XOnDQCR2/z7zrV4gBTxx 0lnGk8J+ciKGJ9UET1KFIG9ujEIuVcw= Received: from [192.168.10.54] (unknown [119.155.63.248]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madras.collabora.co.uk (Postfix) with ESMTPSA id 934E46603219; Tue, 20 Jun 2023 11:17:19 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1687256241; bh=yWkS6pO416E5oq9sw7CdY2vXXy8yufI+SlXkoSBh3TY=; h=Date:Cc:Subject:To:References:From:In-Reply-To:From; b=mQJjtR8IcDbWExW9CfMbofKiPKmgOyXTZWjmobyxBDjDK6DQuFB1SsHjRzZAKabMG CvxLOPZ2n2/Rba+PL7BRfZYjbR+iReSA9GCMf6MKNoAJ+oSqm3Z9ptP03l3k7E7HDi thObNF7YFCWPEv1AbU6PSyLuj2nxR7CDZLhnlrz7tQLgZYtt5D4h3c+ZMUWuKkIYtF 8pK94nfjilWkWscv2iof7cU9prhPpKJc5bStqiQDeDamPHhCCNmloGL8AW1wxMpQ03 SDq5x4u7UvSqBjl8QHVGsGUfkDldHEIA2HSh+m4k+hzBdP13OAzF5OZ5iV9YpxNZFG ySkR95cc5JukA== Message-ID: <575a395c-0608-00da-3aa3-cbe4a5bd157e@collabora.com> Date: Tue, 20 Jun 2023 15:17:15 +0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Cc: Muhammad Usama Anjum , Andrew Morton , LKML , linux-mm@kvack.org, Peter Xu Subject: Re: [PATCH v2 08/11] selftests/mm: fix uffd-unit-tests.c build failure due to missing MADV_COLLAPSE Content-Language: en-US To: John Hubbard , David Hildenbrand , Oscar Salvador References: <20230620011719.155379-1-jhubbard@nvidia.com> <20230620011719.155379-10-jhubbard@nvidia.com> From: Muhammad Usama Anjum In-Reply-To: <20230620011719.155379-10-jhubbard@nvidia.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AA45740024 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: hfq1rx6zfwt5ux16wuf5qexuzg313ids X-HE-Tag: 1687256242-977497 X-HE-Meta: U2FsdGVkX18CE1rP9y9UsaXiAwGi8tr7BjwDY4Vkwo2q+r7YhmeFpwLQ8OHEDySU3uhXL8LfA05uRPce6wvpIjZiopkBQpRRPJSYPQ4P8PRl2rH0JNZDFRcpmFNgfkSbT7kPg0CLQhg41gjbYAnfwRq1RHfIgGyzbO9q5kzZwaIuHN21eaXoTLw/d27BDBKBfrq0YsB1Jq7vbHHIlieGqQYEvXQfgayOwlllLWNC0w1akDteaVDjLkE6vrHhs4mlPXIcgMxMhAtXkg6pH/YyU3va0BVDFekv/+Mm5q+S5CzT7H1VOGLZiBYPWjT+W8kSuqBXNb8QgUs6OUKrGV9YxpcBluOKls6KRAH0bwM9hDJobc4AvGn5+ZxQ4NS8FqMQA+wlIlo9hgvCa8QMwjRHZrgavNVBWIUaUEwuXkbPEYKFlwe0U/JJLpZG2sj+qUvqaVbr6YY+HH3IvzBMy7MjQkpijyM5oRo3AlIbnAJgERHgilQrT4hZS5dxpAMw997xy/M0nHGOxUgOUxmMLDsATiE0jnZaV1AsMBprFIttX/QuTv1e8uNm6RD3NdPJIzpbuA92VzsmGOCTq6xm6OjwUtb0c2F757idh8X7TmVKgkqfiDpEGAKEwwsmpJN3Qnk+5/N3PlCdfIFdRxnTh/XFspNI8i0q4OgvCTDTr4LaIrAqD7ujS6gIr6hMFjgw5o5tIVQfOC51IsLrnfRoNLMfHJy/oIHjgBpI7S4lrqwJtkgar+wCIqoNkwG97lbFD2BKCwbe8nnKHFNZtRqqKszhA+UeS1rhvBAmrFaEi2WQXs7LcW6Tr6N4tjOHEnkZ8I3v6bzA9DVtIVFQ1z4vJR0sMTMb55VYX2eMdvjLtlLn61bYG1KAo0JTeAQxzYTMGowWAVA0w5epI8vySV/GFt1LPyTXzq7b8HzNn+MdG9F5JcNRMr6NfHGlc+Lps3iCpvfOKZf/fmjlbWxg0gRIK2i 8J7LURK0 4A0DoXwMMqErsBpsAkC4ilY4YqcDVNeV7awI1ayvFVFpEC4l1UVuERjb+mM6nMvj6ZMd1ASLflv80XfM0L0z0KuTsnvGziJKey1sMIjZ6h4hjsUKEbPQfGWccUrkNfj8O+LEJZSAZM2j8E062zzVgBwSsD2HBh+a5mJwmNHgbQl9WxIymS8WoZ9U2GxPjFJVqGXWrwq3YxljTQpQanCCsAi5iOjP+IwfcVXEuyFTWmYLjn4td78mvivVS7wWzBV++wAp5E9BJfvdBLD32cl/CEVcZaWwk8qkmQxRXC4caVD3BPhaiGjEhRELZBvArOzCxYVVlsZ9/MrR0Rl7J7Qm6leUsb3cWAKTdgFfM4sI1bynGqb9smVz+uZhWzSHb196YfJG/jU6y2xsECTzAoHp4TCc3n/8747gDnO91 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 6/20/23 6:17 AM, John Hubbard wrote: > MADV_PAGEOUT, MADV_POPULATE_READ, MADV_COLLAPSE are conditionally > defined as necessary. However, that was being done in .c files, and a > new build failure came up that would have been automatically avoided had > these been in a common header file. > > So consolidate and move them all to vm_util.h, which fixes the build > failure. > > An alternative approach from Muhammad Usama Anjum was: rely on "make > headers" being required, and include asm-generic/mman-common.h. This > works in the sense that it builds, but it still generates warnings about > duplicate MADV_* symbols, and the goal here is to get a fully clean (no > warnings) build here. I've not looked in detail. But it seems like your first revision was merged and after that my cleanup has also been merged. My cleanup patch is adding correct header files and removing these duplicate defines: It is in mm-stable now. https://lore.kernel.org/all/20230619232244.81CB3C433C0@smtp.kernel.org > > Reviewed-by: David Hildenbrand > Cc: Peter Xu > Cc: Muhammad Usama Anjum > Signed-off-by: John Hubbard > --- > tools/testing/selftests/mm/cow.c | 7 ------- > tools/testing/selftests/mm/khugepaged.c | 10 ---------- > tools/testing/selftests/mm/vm_util.h | 10 ++++++++++ > 3 files changed, 10 insertions(+), 17 deletions(-) > > diff --git a/tools/testing/selftests/mm/cow.c b/tools/testing/selftests/mm/cow.c > index dc9d6fe86028..8882b05ec9c8 100644 > --- a/tools/testing/selftests/mm/cow.c > +++ b/tools/testing/selftests/mm/cow.c > @@ -30,13 +30,6 @@ > #include "../kselftest.h" > #include "vm_util.h" > > -#ifndef MADV_PAGEOUT > -#define MADV_PAGEOUT 21 > -#endif > -#ifndef MADV_COLLAPSE > -#define MADV_COLLAPSE 25 > -#endif > - > static size_t pagesize; > static int pagemap_fd; > static size_t thpsize; > diff --git a/tools/testing/selftests/mm/khugepaged.c b/tools/testing/selftests/mm/khugepaged.c > index 97adc0f34f9c..e88ee039d0eb 100644 > --- a/tools/testing/selftests/mm/khugepaged.c > +++ b/tools/testing/selftests/mm/khugepaged.c > @@ -22,16 +22,6 @@ > > #include "vm_util.h" > > -#ifndef MADV_PAGEOUT > -#define MADV_PAGEOUT 21 > -#endif > -#ifndef MADV_POPULATE_READ > -#define MADV_POPULATE_READ 22 > -#endif > -#ifndef MADV_COLLAPSE > -#define MADV_COLLAPSE 25 > -#endif > - > #define BASE_ADDR ((void *)(1UL << 30)) > static unsigned long hpage_pmd_size; > static unsigned long page_size; > diff --git a/tools/testing/selftests/mm/vm_util.h b/tools/testing/selftests/mm/vm_util.h > index b950bd16083a..07f39ed2efba 100644 > --- a/tools/testing/selftests/mm/vm_util.h > +++ b/tools/testing/selftests/mm/vm_util.h > @@ -63,3 +63,13 @@ int uffd_register_with_ioctls(int uffd, void *addr, uint64_t len, > > #define PAGEMAP_PRESENT(ent) (((ent) & (1ull << 63)) != 0) > #define PAGEMAP_PFN(ent) ((ent) & ((1ull << 55) - 1)) > + > +#ifndef MADV_PAGEOUT > +#define MADV_PAGEOUT 21 > +#endif > +#ifndef MADV_POPULATE_READ > +#define MADV_POPULATE_READ 22 > +#endif > +#ifndef MADV_COLLAPSE > +#define MADV_COLLAPSE 25 > +#endif -- BR, Muhammad Usama Anjum