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 5E09EC3A59D for ; Sun, 7 Apr 2024 04:23:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 960586B0082; Sun, 7 Apr 2024 00:23:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 910AB6B0083; Sun, 7 Apr 2024 00:23:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B0AD6B0085; Sun, 7 Apr 2024 00:23:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 588356B0082 for ; Sun, 7 Apr 2024 00:23:10 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id D12E11C0C5C for ; Sun, 7 Apr 2024 04:23:09 +0000 (UTC) X-FDA: 81981440898.11.DF37446 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by imf17.hostedemail.com (Postfix) with ESMTP id F19D940009 for ; Sun, 7 Apr 2024 04:23:07 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=IX69ss9W; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712463788; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=vP7muBwu7UMyYBfJQ5J0w7sTIiEnaLoePixNkhv1wIo=; b=AI7Eyogj7EioAZZm4GAW8FH7ISCG5slzq2uEghnYgrpCW+cctdKoJz3n33QRmLNw1tUILt AIDiPKOgCTk1YQbQapqpv0BXVT4lDT27PKruwl6SoWoEsimfej1YLpeA3nSSkXxvZq55po PlT9kBlEgu7rk0PMmJ63JLI7AXI4OBk= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=IX69ss9W; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712463788; a=rsa-sha256; cv=none; b=fa/kyjszlqzVRvl3VNiAPQzJHXuBQQKIxSL6uPDQeJJzqAz2aKFgCxifNPUJE6eylw72DJ jhAZA1cj8EuUUm1qDyj5RwUzFWGbl5IifV1Evpi9ls+s/t/yBQaGvZOvZnlh5t8+w71Ow4 00HpmE0rzpy1NZsfmtDY+qG5FgFhrAI= Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6ed267f2936so43808b3a.3 for ; Sat, 06 Apr 2024 21:23:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712463787; x=1713068587; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vP7muBwu7UMyYBfJQ5J0w7sTIiEnaLoePixNkhv1wIo=; b=IX69ss9WW+3+rtSkEFNDLTaMJu1a3hn2ih8kS2eY6hY68f0k/JoGx02jprjaOuXQWf lyIkLQDGISA9cmm2ExD0gCfUIHuV9qAYk2LSGBM4hhx0y3lQfBEdMcku79Wc7afihah+ rLuAl989Z+w0yahqIYgPnj8jhnX+UKaIcSheEqmUFx6akqkj908RbylJjX6rF0Xw3Pps NLL5rb0EWbCZsXrd53eZvUHj5H/rBuQaQLKAhBo7L1SilKLN1Zh6UuoTFtYRc9SvC9D+ G1EiOi44+edGo4ijnWZXvPMbd0ayueYlsb7UIUGn5F2Ir4Ast9owWvGr1HNZ+kK/NHpP ayKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712463787; x=1713068587; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vP7muBwu7UMyYBfJQ5J0w7sTIiEnaLoePixNkhv1wIo=; b=dGA+l7lNDSr0Qe1VfwGKtt6BLlUT41Wp22J+H+1daHROjEMnWxliji+SiHDNyfEWJb DxKPHv1jQBnO/gNpZbYinrbc+Yad6V722GZukzaq+e54G7B9OCAt1fgINdVwCSyBvAlg DZKx5kNnK7BF4w6yVN9fxMPS9+gGaecg2i5KDWcptKjJuDBBTCjAfhMwEMXKFFgXrI+S 7M7tDWUI6Ezz7WiCm+DaQ9TONMegFbgBJdqnW3LPIT5XTmOaZrhO2yBWdLAFj/0AKWFb 0OVti3oDvkisFhv2XZFS/EsiESO3dlYtn77Wv4bVnDY7doUO9BVrPW5RD2jL9oorU2DQ T/xA== X-Forwarded-Encrypted: i=1; AJvYcCXe6twbs/WZGj2hWDr8xh1puEXkI8UEy6jEm2jhC90E8tTs6KylqpUdWGs725JAslrfr4crZ2A3D7btTQ++9YsAzys= X-Gm-Message-State: AOJu0YwY2yoFGBekM+7lMGKzWW6629DbPnkfBbgGHjlzhKK6ImriBYZF uimaO8QMncnrA9l/mwkrOSdQW7cDtx3qpq3cwu8xI2ZuzExYc81W8SX4qZTvD4o= X-Google-Smtp-Source: AGHT+IGmuvtObmu4KbfeZjaXsW6wuJ3de38S6C6us1oFoI+NaDlXBWzlpUhxFroh54S4/BrLVST7dw== X-Received: by 2002:a05:6a20:9186:b0:1a7:4ab0:714c with SMTP id v6-20020a056a20918600b001a74ab0714cmr3270703pzd.43.1712463786498; Sat, 06 Apr 2024 21:23:06 -0700 (PDT) Received: from localhost.localdomain ([2407:7000:8942:5500:aaa1:59ff:fe57:eb97]) by smtp.gmail.com with ESMTPSA id j8-20020a170903024800b001e28a5b48c7sm4182067plh.77.2024.04.06.21.23.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Apr 2024 21:23:06 -0700 (PDT) From: Barry Song <21cnbao@gmail.com> To: 21cnbao@gmail.com, lkp@intel.com Cc: akpm@linux-foundation.org, linux-mm@kvack.org, llvm@lists.linux.dev, oe-kbuild-all@lists.linux.dev, v-songbaohua@oppo.com Subject: Re: [akpm-mm:mm-unstable 313/322] include/linux/huge_mm.h:274:16: error: fields must have a constant size: 'variable length array in structure' extension will never be supported Date: Sun, 7 Apr 2024 16:22:47 +1200 Message-Id: <20240407042247.201412-1-21cnbao@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240406224038.5412-1-21cnbao@gmail.com> References: <20240406224038.5412-1-21cnbao@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: F19D940009 X-Stat-Signature: mj8wu7r6fphnm1rhbu1ses989npk8m96 X-HE-Tag: 1712463787-571482 X-HE-Meta: U2FsdGVkX19nKC7nfHu5kWHvNTYLi1tJMog2FUvM1TIWlkEAgq5O6kfAc+fATfmc5cqz1ZifrjYL2CEcDbzpUpJF2TG9MalrAutQWUy78cOCFKp40uxV0UqXNyXAEnSOrQhthFa5AmQ/Ls3Z0A0WzQ/sFZ61ebwQCvs7twpBaup2Kj/vCtJGDYOPqwwuRxqkU9W23Q9/uW2HfJjrhkLiEtIYn/7FxDzBQ43kdvCi0WDSQV0BA6v67uCdnAYHt4xOokliWa32EtnZoK0X4jAS1KELhqZpDedlUSLnE7618/+KO1+10cvSHg19o6f1vGyDXs+V+ht7piZk/cou0rPWSRVQk3Sw+RE3Q9wYO+oOLM9/oT2iBvE+1GqX14d5fqkmhboL4ymqgo+ReTGARrVNqTnJgPZJHqq8abxFZsinLsNP6xB0pkg+EOgepVyNHt4BvTJANe5EyH9naBINzTE35Xi/kq7kA6McI8Y2iJE8HL1AuheKIidJwKc1BEM1Y+wYeOQZDG8dYNQXFOCGFquHKWZp4QaKjN4MGCqZH2Nh+cEYXiEkpYMHwXC90C0+6opw8WsmJjn7QzXLSDrzWOeWDUwaSb3X4WdmGK4aoWuo6+QJwxvO9ExyRUMFOJEVx+3xY6X7mLSXRJu2s2x/unglsgmrf243gT/m0XxJGxEMVpOEC4UFBVLLt2tAW02Ezm1xjf1eJZ6bfq9FVE0dOC2QHSoX90IfUfdd4npEjxIgWKJoX1Yr2J9+/N2n5LhiNYZdTALYb/DZOUEcuAwWGAXq87RzE6EZzLJR04Mk/CGZyWMcqBDy50ajVnm1lT+/kVXOzieBtcLyjUPnRN9keBcKTYPY7UxMaqBfqn3UzZz1t5K5kCGfw/CHg1F85cWolthXOeEg5OPf0UnYj3OuPBNXihyXW/JeODkCAJUoHraWsWmdRY01X/QOoXVbe+AcjpC6xtrmanwQQdGwIZs6VtD 9C8+GHTh Rhdiin0ZcFbsvalNu6S8uOBVcAMLika0ziGuSGqUqSNME5n81bVIY2VsgRH35R1BEJG4rk6HnjqG8hVnjj4mqY5HFrf7qbxMLH7SsyIhkPway7UViUYIBKQ5o/CIV+DqAelm63O8Y7awyMW04DzqkysSkJt6ATYuspCJWCUPt8DNYqb79Ke7zBAAyifVeQzJYCr3THewRtBURwx77HyRAZ7CgY8qyMJvYtpxMyshfwI0aLajY2sDeoEj5q5/lc6z/N/7+Y+2Y2+Z6xyhkZfVC9M04hL530A/MP4IjFOpLgiAntniS30BZmUZdBjU3PioBArznsHON8qHsR+tYTVjR38DFBCBlIFtdzK4Z9eSl3PsRFvxDzxH3/LkSQSQ9kqv/CNGTchYhQb25PpDkoZ4x6/0riRP+4kP+gwl10aGxUa/3Ze+KdJQcUAEH7///trl4ABpKIH67NURN2Hq7tqUj2JipHlcBmq2rX6TQIZeCZFoXl85p74L4rKqODDVkT9AXwCQzhzjL04HrGSmtAQr9uiqy3pq+z+nY911nr1/iIlSbAN7w61kQhOu1JpgUyQkR6yjsQFzdc+Kbuxj3XyeJ4TUfUaGQyY8mFr9XxVSCOHGzWLCGdCM1xVtzvcEVzXD+B32o4KP8HNGX1uirQU02LYV9shMdu01HQwAD+kJz1f/uUQQn7l26epTIo0Zw68GTz4C7X+JXod+xkVoyuXBi9WXfhwI/Pjnl8yZ+ 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: >> tree: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-unstable >> head: f43b3aae94511d62174c3b29239da0dd22d0eeb3 >> commit: d4358ee0a075e232114dfec0cd162860cfa2771b [313/322] mm: add per-order mTHP anon_alloc and anon_alloc_fallback counters >> config: powerpc-allyesconfig (https://download.01.org/0day-ci/archive/20240406/202404061754.n8jmZ6s3-lkp@intel.com/config) >> compiler: clang version 19.0.0git (https://github.com/llvm/llvm-project 546dc2245ffc4cccd0b05b58b7a5955e355a3b27) >> reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240406/202404061754.n8jmZ6s3-lkp@intel.com/reproduce) >> >> If you fix the issue in a separate patch/commit (i.e. not just a new version of >> the same patch/commit), kindly add following tags >> | Reported-by: kernel test robot >> | Closes: https://lore.kernel.org/oe-kbuild-all/202404061754.n8jmZ6s3-lkp@intel.com/ >> >> All error/warnings (new ones prefixed by >>): >> >> In file included from arch/powerpc/kernel/asm-offsets.c:19: >> In file included from include/linux/mman.h:5: >> In file included from include/linux/mm.h:1115: >>>> include/linux/huge_mm.h:274:22: warning: variable length array used [-Wvla] >> 274 | unsigned long stats[PMD_ORDER + 1][__MTHP_STAT_COUNT]; > | ^~~~~~~~~~~~~ > > This is amazing. powerpc's PMD_ORDER isn't const. I will > move to alloc_percpu instead of using a static array. As replied in another thread, can you please test the below patch? this is v2 combining the fix and the fix of the fix. >From 6f8604a51ff3333be467e2a681a1f1e8a5d41c48 Mon Sep 17 00:00:00 2001 From: Barry Song Date: Sun, 7 Apr 2024 12:23:35 +1200 Subject: [PATCH v2] mm: fix powerpc build issue On powerpc, PMD_ORDER is not a constant variable. We should transition to using alloc_percpu instead of a static percpu array. Signed-off-by: Barry Song --- include/linux/huge_mm.h | 9 ++++----- mm/huge_memory.c | 12 ++++++++++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index c5d33017a4dd..0717063dc5e7 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -271,16 +271,15 @@ enum mthp_stat_item { }; struct mthp_stat { - unsigned long stats[PMD_ORDER + 1][__MTHP_STAT_COUNT]; + unsigned long stats[0][__MTHP_STAT_COUNT]; }; -DECLARE_PER_CPU(struct mthp_stat, mthp_stats); +extern struct mthp_stat __percpu *mthp_stats; static inline void count_mthp_stat(int order, enum mthp_stat_item item) { - if (unlikely(order > PMD_ORDER)) - return; - this_cpu_inc(mthp_stats.stats[order][item]); + if (likely(order <= PMD_ORDER)) + raw_cpu_ptr(mthp_stats)->stats[order][item]++; } #define transparent_hugepage_use_zero_page() \ diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 5b875f0fc923..7a72760dc1ce 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -526,7 +526,7 @@ static const struct kobj_type thpsize_ktype = { .sysfs_ops = &kobj_sysfs_ops, }; -DEFINE_PER_CPU(struct mthp_stat, mthp_stats) = {{{0}}}; +struct mthp_stat __percpu *mthp_stats; static unsigned long sum_mthp_stat(int order, enum mthp_stat_item item) { @@ -534,7 +534,7 @@ static unsigned long sum_mthp_stat(int order, enum mthp_stat_item item) int cpu; for_each_online_cpu(cpu) { - struct mthp_stat *this = &per_cpu(mthp_stats, cpu); + struct mthp_stat *this = per_cpu_ptr(mthp_stats, cpu); sum += this->stats[order][item]; } @@ -636,6 +636,13 @@ static int __init hugepage_init_sysfs(struct kobject **hugepage_kobj) goto remove_hp_group; } + mthp_stats = __alloc_percpu((PMD_ORDER + 1) * sizeof(mthp_stats->stats[0]), + sizeof(unsigned long)); + if (!mthp_stats) { + err = -ENOMEM; + goto remove_hp_group; + } + orders = THP_ORDERS_ALL_ANON; order = highest_order(orders); while (orders) { @@ -673,6 +680,7 @@ static void __init hugepage_exit_sysfs(struct kobject *hugepage_kobj) sysfs_remove_group(hugepage_kobj, &khugepaged_attr_group); sysfs_remove_group(hugepage_kobj, &hugepage_attr_group); kobject_put(hugepage_kobj); + free_percpu(mthp_stats); } #else static inline int hugepage_init_sysfs(struct kobject **hugepage_kobj) -- 2.34.1