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 6FA50C02185 for ; Tue, 21 Jan 2025 04:36:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C29926B007B; Mon, 20 Jan 2025 23:36:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BD9926B0082; Mon, 20 Jan 2025 23:36:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A53106B0083; Mon, 20 Jan 2025 23:36:06 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 7F40C6B007B for ; Mon, 20 Jan 2025 23:36:06 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id EFB0E1A05F9 for ; Tue, 21 Jan 2025 04:36:05 +0000 (UTC) X-FDA: 83030196690.08.D28C10C Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2076.outbound.protection.outlook.com [40.107.243.76]) by imf03.hostedemail.com (Postfix) with ESMTP id D5ACF20004 for ; Tue, 21 Jan 2025 04:36:02 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b=JUE5ZZNj; spf=pass (imf03.hostedemail.com: domain of bharata@amd.com designates 40.107.243.76 as permitted sender) smtp.mailfrom=bharata@amd.com; dmarc=pass (policy=quarantine) header.from=amd.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1737434163; 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=9zvt8P/s6c5RL6tM9XyWKFuYW0Sw/6k0aw8zXoRLIrM=; b=mtjlz2CtIfSxBlzuIUcDrd8vUHkVFeJRct7+WYNx0W0rowuNuL4TKZfVb3LyZBK8mqj94x 4dNgMwteDqbxkRs8xouiYz5oWitzzMaCmplP9iwxXtiPXGW6youtywh1FZ03TWHBVB1Ar9 6ZPhesFZcPdj3zlHHVuDYqhljwTWqc8= ARC-Authentication-Results: i=2; imf03.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b=JUE5ZZNj; spf=pass (imf03.hostedemail.com: domain of bharata@amd.com designates 40.107.243.76 as permitted sender) smtp.mailfrom=bharata@amd.com; dmarc=pass (policy=quarantine) header.from=amd.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1737434163; a=rsa-sha256; cv=pass; b=Hojgj92Z3A2vU8PZgBjALKdf4sibmAY0/RhU+c7nnwP+tF3HZzpbMirP7ReabTAY9IBnDt Q/P7GxvdHfXDiSeIDVTycRoigeLaEylyYeu7Me5Mptxc8GqMYOS6GKEpAKh4vuf6+XSPrz ktBS3/nekCgLjDPaLJqYZuUCLMghV8Y= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Na9ddimGPYa3P9Azjdrsz7PuyY//gIj58l2VUN8350Rs69TQ4f4hXaL7ZDCCzCL45ibvM1GIylqZ5Cp5qLze+KwA2sp08wPinp1kBGCv/Gy5dc3YiNYju69sMl36gEytz83woabMMcWMBStON+h6Jot8RnpWE62w4iiOOlh2/zdPzB/U2XWAQ8nb1/aFg58pbtw0jTwKoFlA4r6ovxkHrbfZ1q3iMevZIyHUi/vbXoMh5YjvYGJCHXc4cgnLsLsMhKy8MZ3LHhdbJmdF1kwqE1Zo+U38va40VtYMnBCj+aZWPcu6h0tDe8IdI4s3mafcusQzdw5myuCPr/yiItOFcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9zvt8P/s6c5RL6tM9XyWKFuYW0Sw/6k0aw8zXoRLIrM=; b=dx/s9E64L63wKPkS6Kn11O5yLQdyihA+D5AKLODiDxzCHuFVhB5q74JZG+h+QmmjIQxuOO3aUWjcfNoPSEkIZE6cxoJukUS1uzs4rEu8KFMnlmOlNMJiPb8jQhw9cfLOKkxuUZRq5hXG+RowOeSflPa/eYW9kNkN6AyGxLWR9CZF6+0ymNtpraPXyPJ9NkAVwo7lkaxY+kmzFseGaE9AoXcXlSBZO2aauQ0zYUPSSV+/llaAZLf+EvbH0cApBA1zZu4kGv/lxQYfRVfcV1J7A+7Br1MMlcRx3e6t0LK2ur7NQDB3L7H7Z59i0rWXT59Ci5UEG0Vwx2bZ9+royfJGWQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=gourry.net smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9zvt8P/s6c5RL6tM9XyWKFuYW0Sw/6k0aw8zXoRLIrM=; b=JUE5ZZNjmlfmKVMjT0LR4By3Wi7b0FIge1Bprs8ijYVkX7uLktkIAwL4rUBZuplTFrQUdMOOuidbbrMLObQO7s1Ho4BrX2WDQfq3TcYpT21AnXrFdM8VPzBbmCCV5Q6E48yNByYXUhbnOZoV28pltsSnXuStQthTm1Pd8eLIINI= Received: from CH0P220CA0011.NAMP220.PROD.OUTLOOK.COM (2603:10b6:610:ef::13) by SA3PR12MB8801.namprd12.prod.outlook.com (2603:10b6:806:312::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8356.22; Tue, 21 Jan 2025 04:35:58 +0000 Received: from CH1PEPF0000A347.namprd04.prod.outlook.com (2603:10b6:610:ef:cafe::f2) by CH0P220CA0011.outlook.office365.com (2603:10b6:610:ef::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8356.22 via Frontend Transport; Tue, 21 Jan 2025 04:35:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CH1PEPF0000A347.mail.protection.outlook.com (10.167.244.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8377.8 via Frontend Transport; Tue, 21 Jan 2025 04:35:57 +0000 Received: from BLR-L-BHARARAO.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 20 Jan 2025 22:34:54 -0600 From: Bharata B Rao To: CC: , , , , , , , , , , , , , Subject: Re: [PATCH v3 2/6] memory: move conditionally defined enums use inside ifdef tags Date: Tue, 21 Jan 2025 10:03:55 +0530 Message-ID: <20250121043355.177611-1-bharata@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250107000346.1338481-3-gourry@gourry.net> References: <20250107000346.1338481-3-gourry@gourry.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A347:EE_|SA3PR12MB8801:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ea96d06-036d-4875-6fba-08dd39d519cb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|1800799024|376014|7416014|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?15ABvpKe+4v6j81k5Yfa0puWdo/0G+vTS+ntyBYFUdaedL8EYg6/EXawsbxS?= =?us-ascii?Q?NtpMXoPB0CqLVxOazO7euiA3WbLktkblG8SX9UZktEjqVdWQKaTqn0zjzSgg?= =?us-ascii?Q?aLhetYCPgLf4L/jopWNCO+McLhUbgYjpjLFtNyYU6qQfcmLKWDss8KQO3RFX?= =?us-ascii?Q?Ux4g5mjPHfgyU22Eaf169Wf3GtvvJ+IUAjoq/FvdCd23g1MLAGNSK1kAArYL?= =?us-ascii?Q?Y2mGtKazNiY13eKuNbGzOL57hViwStZkMGiGI5l2NNDoz46Ql9c1IuApsTrt?= =?us-ascii?Q?I/aRSz0rqq2hiiDg+yPkHGXqAlJfFZ3/8jS7ZM/H62ObtOt7/d8PnAJAHxL7?= =?us-ascii?Q?t8s5xDt1cGwb3K0QTgmkSrTE1DUkceEvd9XjRba0BaqhQFH/bG9LE5BfPoYT?= =?us-ascii?Q?EMkML/ax8gKExZAOSLzcPIQAz6iMkYc9xbCYwJIoCUdd5BG9g4z0EtBj/wRG?= =?us-ascii?Q?4QuUT1p81w+JSOnNZ3vc9GXlIQECL2XrNbff/26B1XVeBDFMCr7BXp7edL0w?= =?us-ascii?Q?Vf1q2HOcBLmSKWEt6AzFus04sFR4fTsgNmpoGeVXfHu053X0NpPsBQyzkCkE?= =?us-ascii?Q?K8x0w2rh3/TP2nz6djPRcP8jaBAl2jFH+KEziWvurvDL1dnnAMJKdGYefEIZ?= =?us-ascii?Q?SBm+YWkbHo2ded+tPgf+WTHqqrE1fhCgfqMBKlKNelY1WX57B0G5CFgw3z95?= =?us-ascii?Q?5DbLGV3FxfupcJZM9u6EYkODSN/3RXrpvFwYdlrE5ru6oJFbD4AEntxPLKsO?= =?us-ascii?Q?2vc4fyPXWnVb2uWXfmwlVNosQJJX+qqReb7uTpxO0xY7uEJrn35d11kuuN3T?= =?us-ascii?Q?jJgPU659jlYRFqfv4lx6VwmTRuzEP9Fx3EjpNiJtaqr82lom6yKseXv5ItJ4?= =?us-ascii?Q?TDGjghExgSHIQvOp+2c+sNJIbvKIv11CIGykl3XehGKIgOlPFrBhYbtRH2Jk?= =?us-ascii?Q?a8mazeOe9+I2oelFgng4LvmHQoDA+h7ZlT4XmVtgbrgQFv+pqEtEgCEj0vJ+?= =?us-ascii?Q?UHqikCblv4Dc2ykL4vu++BlfBvjoX8FqEstXLatXKnqwBjkje99yuUnBiQcM?= =?us-ascii?Q?ZMnVz8nfdR0xx5tRX4MU6NkxE/XZLhiVQBXivsdS4VoXbYL9dXIDjw2nAXVE?= =?us-ascii?Q?jlfbbIJOdHn/NU2X1uio5ekhsmM2dTHgCuijkevIKZ9tddppW675eB4Lc7xH?= =?us-ascii?Q?reA+ROjXUr6UZ9D5diBeBIxOpQGawsr9qP6Yxujy8OkWC4KkMaEbmHrRg5wZ?= =?us-ascii?Q?oKiL8A7ZN0RkwYrGNXWGSBYkdxPCzKr58UTqgkXMh3+vg7CzVNF6EL8Ytkzt?= =?us-ascii?Q?ktEjjSpdNQo/rJ1NfbsmwvfabhCGEptFvwlTgRQOk0ycbLISa163zY9xCAct?= =?us-ascii?Q?eCqylkH7xOtO5VHwAen93HSC5fQNkXcOw2hF2MNkcBxTlM13bQyfT7HYvEGq?= =?us-ascii?Q?zwDBQjBB+RNcYgIx5hZDcAoJxYdoj5+GiTbX0L4ooOwMqebztX/H9ba+3H02?= =?us-ascii?Q?kkrSmex9oHV0zOw=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(36860700013)(1800799024)(376014)(7416014)(7053199007);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2025 04:35:57.9121 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2ea96d06-036d-4875-6fba-08dd39d519cb X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000A347.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB8801 X-Rspamd-Queue-Id: D5ACF20004 X-Stat-Signature: a18m66iqtqe4bpsgi6ewdnro8s7s5deb X-Rspamd-Server: rspam08 X-Rspam-User: X-HE-Tag: 1737434162-228535 X-HE-Meta: U2FsdGVkX1//FwfgiyR/HyFRgrbjSMenFxr6vwBqazpqveA0YnQNxN5+HaCr6/cZVDsxIwk27XAphp8fjEmz9YCMQYLJI/jP0DzLqGtbU1UTOptaw76/khSt/rwJ6L7pZcUaZ068OHRDRC/zguUSzMLjRuiKHI0xFPW7OuOTyXjUjujr3HR7BFK7jlvYUaLprJtx6+UOSksDiy+KUQz/Ty7XyprrSq0f0Cgz1Nv8s0OfhyVs4Pfd8/uJIlrcGjOAOB3vvYSeCbL/G706csJDVr3n9uglts4WopzFihh8LJQVjCLkhVgRMM8dtwFVNXJSOTiu0CZelblhnMukAecy+VTukPgnKtnGVNbkr5jm69nrPU01UwVhnQ1XoQtcxVrsP4laINec6w/nr/f6ITG+pfNLUsvIt1oLq3KAffCQnNPzAXe0+ep6RnAl/Rr3Oxu73mnYj0AprFTo3KFJMEYPerIQBGk7GRA4zlAI/ZCT97tekAFRi/UF+pZDX5+7SZdnkPfGPrz5TqDMmoxXWHliDgvz+pM8VonIKk1B/+68A+Zy3Zw2VAO9zeBtICBTCRIa8nO/m7JluER4jZ9IXfT5hFXi8aJbZZ52wP4m8AU3rsyxJBN428poKTriFRFx+Vs4LewM7QLTd1wWGfMEg+MQAzpHvb9cYYzq4mPmYjbYCE4VQI9UN6QazmPM4QXp1HhkAhuLz9vXVCfz0gBRBJFXte4fUEJm48aef5RvxXwzLTPk+fftsjdpgn3oZwrvCGP2gE5w5G6uT9dvKckpqXSkBy7cfsTbNAj6OiA7jVXTlIxV7o52QFLE/YPLBKkJUBga/RDKbDBCIMkEtL/CemlFUb2E7hNP2TCHeYHPGD51GIHi5eTkVuq21V6JQXf3wcWbs+38V0GfqI8YmYzR5PBLsu6OugqXoEWt1I9EoVwGywkbSnV3tPbe6TaeVSmOSjpVoT+7SDSox6gnf9TpxCv jqFbXKTY NRpQtAbvz3lExL3AnIWdOCKKGme6+j/EbRV2cvqWthBX4Irrq7jIm21SWyW+EmgzTAYHyn6fCpz3P0LK02CA3OVie4BQPkwXTGuHe7+VN/fxuX2fSIgzNp8JzdKOFNExSU3oexMYAE5sVxrCn8vRLBe/Oh18TSI3FuzVZWJFJMNUzOxxCU2UBIa+q9PwGwOmNdIknywmia71vly5UG0EObY/6u6VNgRj0szymaoZk16GfHl+SlasjYo89qStAYSG4afYFICGcJYCAWMnLPL4NGutIybqiW3n7X8yHQ1LiU8DEuvu/9X3wB3fsoHmFrXp7sD+t8X4GpcJ3x+UpLCHR6mivuI9E8DbiWL4rweAKo+12Rw27ayGqJHxm5aQ5rKH+vL5y+2eeSHZcmCDiYk64yaB89FGTIQrMVrPEl/YEC8cXpCTuEEsP6VquV46U+8Ark1fxngXjXiAGvyNqYub5EphUxbdrAxJxCD5/Z5tkaYLVxD0QT2ZRBwV7+LyJXmqZaUOKaJBqsoEW+NBbb4rYf0u862YMnT0n9yQMvH240f9mOKBAsEG9hoF0i4le/ETJmLHF 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: List-Subscribe: List-Unsubscribe: > NUMA_HINT_FAULTS and NUMA_HINT_FAULTS_LOCAL are only defined if > CONFIG_NUMA_BALANCING is defined, but are used outside the tags in > numa_migrate_check(). Fix this. > > TNF_SHARED is only used if CONFIG_NUMA_BALANCING is enabled, so > moving this line inside the ifdef is also safe - despite use of TNF_* > elsewhere in the function. TNF_* are not conditionally defined. > > Signed-off-by: Gregory Price > --- > mm/memory.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/mm/memory.c b/mm/memory.c > index 9cc93c2f79f3..8d254e97840d 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -5571,14 +5571,14 @@ int numa_migrate_check(struct folio *folio, struct vm_fault *vmf, > /* Record the current PID acceesing VMA */ > vma_set_access_pid_bit(vma); > > - count_vm_numa_event(NUMA_HINT_FAULTS); > #ifdef CONFIG_NUMA_BALANCING > + count_vm_numa_event(NUMA_HINT_FAULTS); > count_memcg_folio_events(folio, NUMA_HINT_FAULTS, 1); > -#endif > if (folio_nid(folio) == numa_node_id()) { > count_vm_numa_event(NUMA_HINT_FAULTS_LOCAL); > *flags |= TNF_FAULT_LOCAL; > } > +#endif I don't think moving count_vm_numa_event() to within CONFIG_NUMA_BALANCING is necessary as it is defined separately as NOP for !CONFIG_NUMA_BALANCING. In fact numa_migrate_check() should be within CONFIG_NUMA_BALANCING as it should ideally be called only if NUMA balancing is enabled. The same could be said for the callers of numa_migrate_check() which are do_numa_page() and do_huge_pmd_numa_page(). Regards, Bharata.