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 1D679C27C53 for ; Fri, 7 Jun 2024 10:02:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6C6156B00A4; Fri, 7 Jun 2024 06:02:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 676D96B00A5; Fri, 7 Jun 2024 06:02:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 53DE36B00A7; Fri, 7 Jun 2024 06:02:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 36C216B00A4 for ; Fri, 7 Jun 2024 06:02:58 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C00FF1C1C6E for ; Fri, 7 Jun 2024 10:02:57 +0000 (UTC) X-FDA: 82203653994.16.75537CD Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) by imf17.hostedemail.com (Postfix) with ESMTP id F355A4001D for ; Fri, 7 Jun 2024 10:02:54 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=ajVnsIr8; spf=pass (imf17.hostedemail.com: domain of usama.anjum@collabora.com designates 46.235.227.194 as permitted sender) smtp.mailfrom=usama.anjum@collabora.com; dmarc=pass (policy=quarantine) header.from=collabora.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717754575; 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=Jff3q2+WHD8BbQybBJPEaR6CoOxHK9VuMwsE+7JX0S0=; b=GM+OfYUNLizZ1Ly2DllPIB/8T1gVNsxHlGTiLhqSyIQ3hIqyAq7AqzRanU0Kh3WguLtNl/ +uOCioos0/EOfN79IHfRnE9AUibJjrwdGWcHhJQBonPnWXcBPh95le56BeV+N8Od0eqH5j vZ4prBF3Z8xCIgZTwq8jtRH+h9gA1+w= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717754575; a=rsa-sha256; cv=none; b=Ey5nPNFtDaDzSJfrYFYsA0aEzRVaHh/Px7COjOQejJQpusCQieDKNwGOPKy3ekJVJeZ5V3 ivX3c6DLwQbvSqOUfNuf2UslVP72lnE+f7Iis94Bd2hrj4Sc604U1OHXOkfzg1TzJLG5qE WjCspy1xh3jkp9h0I91lnubMVZ9F9u8= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=ajVnsIr8; spf=pass (imf17.hostedemail.com: domain of usama.anjum@collabora.com designates 46.235.227.194 as permitted sender) smtp.mailfrom=usama.anjum@collabora.com; dmarc=pass (policy=quarantine) header.from=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1717754573; bh=bQZfRikp0XaQ/p3RakIToc8GJdOFn84FFCuIKg/+PCA=; h=Date:Cc:Subject:To:References:From:In-Reply-To:From; b=ajVnsIr8i7bbAzgO6uA7fVnMDe+6SYpx92/ThQ+tiItDTrLFGzqOTohjG/hOnNnb4 aBRZyEO9TZjpGzGJqC8J72AFms4HKjVGv7XJc/bdQbMLO/b4HEgcKhcqYwdCDoeRM2 1+D5Njj2ew3LG+3H+WVYrieod8zsS5N0coVQX7VxsrxwD1G4ibTda/WqffDKgoBR+u GWjmXIYpP2k3vC4bT4iSCWYXZRto3qcG5jldjRQBup5COciitA5wGdik8tNEVfWLAL VGn7xLFn/AsSJX6KfoRPvaEMeLz7s/Hi33Nb0ko7RaNS6mCvqFZqonwk/dusLSjRSU /PZa5LHIWdcaA== Received: from [100.113.15.66] (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 madrid.collaboradmins.com (Postfix) with ESMTPSA id CF78037811D1; Fri, 7 Jun 2024 10:02:49 +0000 (UTC) Message-ID: <407efa7a-79b8-43ec-8466-8b2222f4dee9@collabora.com> Date: Fri, 7 Jun 2024 15:03:23 +0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Cc: Muhammad Usama Anjum , cmllamas@google.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kernel-team@android.com, llvm@lists.linux.dev, linux-mm@kvack.org Subject: Re: [PATCH v1 2/2] selftests/mm: Guard defines from shm To: Edward Liaw , shuah@kernel.org, Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Andrew Morton References: <20240605223637.1374969-1-edliaw@google.com> <20240605223637.1374969-3-edliaw@google.com> Content-Language: en-US From: Muhammad Usama Anjum In-Reply-To: <20240605223637.1374969-3-edliaw@google.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: F355A4001D X-Rspam-User: X-Stat-Signature: 5tskqsm7m1y6fm8o83jxnfetnaz6yf33 X-HE-Tag: 1717754574-627876 X-HE-Meta: U2FsdGVkX1+1PLgRZPdeLKjvTPA41KGMJgQyXoKjgzgBIVseDP8MklBT7H2wdGmEovITEsiz3uV3iYenpVuXBwjksMqs4l2YKmRB+YmDkvP35nX8/klti/JTg27ib3I+sHNRmE0+kopaKBPUR5QHQmFQyUPcm+Sc7y3JrkUN7GFm6rMDl+hK/I6Enjpu+bA0BB8hMTxUZB6V/O/zIjnSIGKCBJRf6FGNaLxPiI0V43cngrzRPns7VMBL5I9ICULGcWgLdhiipLD/9+m1MUMzFvIxnb4ovxnrOzWBSbc3HLcDUL5zF6LPlkBviHz1ar0ruP+1yvDU9Z9Otd3rc7snNrt/uh8W3sa/o8JHXDcrqAS925gE2gjng0lXhrarerG15V1fpKc+DLJ98TXa6jjhYexb8LzsxJJNnnlR1eCYcpNk86A+7fjZZQaGdkto+U6JOUn1IpTze21YTqMS8bHLkLnOr6CzsHg7wD3TyRf9jqVCviLnt9706tVSMzoaECeWAqoj8ZKUAYy1LWN1CBV6/vaes8SxDWjgTk+iGgTirr7UvmjtWTmzagdzONjks7HPj5flaaMiQu28Qq+mLofXZuTfLyY0N6OTkABUEo7pbhqLn9L4aq/0x+p9yBnROt4MXp5JeA9Py/CkXH/Mqs6Hmv9xl63kx05D1h49WIJshXHOECV2yKVmLi1UjW18+6B/0fC39voMLjRuS6VXJN+li64AwB6kc3zfYquN0NHQRidCOO6QsV0ze+PCIOpMDWGWMWaeZ74gy6kwXjQaCcLzz0/sOC0ifHxMfIg4us27I3nxStn712ZNzG7HzrptScX5eIM7Ln4GtygwQc3ZbQpwpLreyUUlcdZvOeoXYu7GlRaIUAwYA7+eF8HYRF6XWBFARMtPP/HkydVI29fxQ0ByOjmhFuqu8CTqq91tRz42PItZy+n10ZI9JGFGQGrXP1e4VMXYIghnX8ho4ofC5uJ qulK537t jF9ILd8Sv458IKFwJFvBYT7hC9tBeEeoClJ6a8IGNlRgcMTeHyEtHDbtDvGu2EwL4PG0Bh7IW074uPQTYIfHHXVHOXEf5MNCM926FIdqImCvsY2MaA704K7ekYCP12e7fj/NbRp046v3Pn7qqhmFftcstZ3rn6dWayIvyqrVDJDPI9as0WXPKZXk+lYrA0c54ub6J8MsgS7gq9Q8lGNcSoq97hjG67xjySae8kOZzbUFmWNj40lYjpSBVWw1302kEMIcxqoNvrzFWIftzOvZq/fp0nTeItAcmk6ESrCgXp5BKMMuLnM7OTlCApYWnSYMxNrylCfQ553Edx2lJcr29rjBWvNqBgadCDMWYx6m57N13ejSfHLOMrs5KohYe1w7edueMIYUcsc0HmVMGxxSAbRWhZ9z9ZPPYaMls242/gvuYsE1FAlg8Ss35OQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000055, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 6/6/24 3:36 AM, Edward Liaw wrote: > thuge-gen.c defines SHM_HUGE_* macros that are provided by the uapi > since 4.14. These macros get redefined when compiling with Android's > bionic because its sys/shm.h will import the uapi definitions. > > However if linux/shm.h is included, with glibc, sys/shm.h will clash on > some struct definitions: > > /usr/include/linux/shm.h:26:8: error: redefinition of ‘struct shmid_ds’ > 26 | struct shmid_ds { > | ^~~~~~~~ > In file included from /usr/include/x86_64-linux-gnu/bits/shm.h:45, > from /usr/include/x86_64-linux-gnu/sys/shm.h:30: > /usr/include/x86_64-linux-gnu/bits/types/struct_shmid_ds.h:24:8: note: originally defined here > 24 | struct shmid_ds > | ^~~~~~~~ > > For now, guard the SHM_HUGE_* defines with ifndef to prevent > redefinition warnings on Android bionic. LGTM Reviewed-by: Muhammad Usama Anjum > > Signed-off-by: Edward Liaw > --- > tools/testing/selftests/mm/thuge-gen.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/tools/testing/selftests/mm/thuge-gen.c b/tools/testing/selftests/mm/thuge-gen.c > index 034635317935..d50dc71cac32 100644 > --- a/tools/testing/selftests/mm/thuge-gen.c > +++ b/tools/testing/selftests/mm/thuge-gen.c > @@ -34,10 +34,18 @@ > #endif > > #define SHM_HUGETLB 04000 /* segment will use huge TLB pages */ > +#ifndef SHM_HUGE_SHIFT > #define SHM_HUGE_SHIFT 26 > +#endif > +#ifndef SHM_HUGE_MASK > #define SHM_HUGE_MASK 0x3f > +#endif > +#ifndef SHM_HUGE_2MB > #define SHM_HUGE_2MB (21 << SHM_HUGE_SHIFT) > +#endif > +#ifndef SHM_HUGE_1GB > #define SHM_HUGE_1GB (30 << SHM_HUGE_SHIFT) > +#endif > > #define NUM_PAGESIZES 5 > #define NUM_PAGES 4 -- BR, Muhammad Usama Anjum