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 1519ECD1292 for ; Sun, 7 Apr 2024 00:52:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 652196B0082; Sat, 6 Apr 2024 20:52:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 603096B0083; Sat, 6 Apr 2024 20:52:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4C9BD6B0085; Sat, 6 Apr 2024 20:52:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 2E13D6B0082 for ; Sat, 6 Apr 2024 20:52:49 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 961D21A0216 for ; Sun, 7 Apr 2024 00:52:48 +0000 (UTC) X-FDA: 81980910816.05.014C5D7 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf29.hostedemail.com (Postfix) with ESMTP id C090B120008 for ; Sun, 7 Apr 2024 00:52:46 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Fd9R4CKS; spf=pass (imf29.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712451166; a=rsa-sha256; cv=none; b=CYWaVvaRE9Jl22w0umDpdpkvKqqxqSJCAd0twO12Q57UPW36abifiXTOhrxp3AZmCFz4PX Rm9qjxzEfxMYcrucU+jVcrvjRS/DuujBMOZHvo+XejYdczlk3UPv9JI2iNOzCciDjLuhlK sE7pmTbKO5NHhMHRqd05PI2v2KA71po= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Fd9R4CKS; spf=pass (imf29.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712451166; 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=0EJ/0uocE3NjJlEUwaV88zvEZDGX2H4plltlBSFIU1E=; b=HfM9x1ecLmsJ2nNuVa5Wz0fBFGveig9DJW5rTzWYJWgXBKRil8yYZYLg0RuOuzkGlv2ajx 8j30kTfVnZfg5R2K954EHY7qIym4B90xKI7FHB+5JE+9OEZC8MfHbblAu8oglG5QDbS01V tN5gP/giM94iDf241LNI19+VGvzks2E= Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6ecc9f0bdaaso2536269b3a.1 for ; Sat, 06 Apr 2024 17:52:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712451165; x=1713055965; 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=0EJ/0uocE3NjJlEUwaV88zvEZDGX2H4plltlBSFIU1E=; b=Fd9R4CKSVRjyJDC+LEEOsI+j+TiT+yCnGJ8sB1GmACkfQT6jZz9YTFuXUbp52Ng3u8 njg8tO5cth1/RruWX0E8t3wL7jmf3CbEuucoBkW08hkpS9fPLuE7wNM9DZhVPajdgkDG H5HzKqrIEXZkSQ7frweSDbjJceb3nJrF/txFbqyzYuEB0zBnOegBUteK9zBVLnGAxPry FJyZHxaaBZkOTgQQFHmISBW0nF2P0zq8Mipv+bFH1qWpIFv5KYDKi4yPp2M4Q7TGcKZ+ xoALYVhCR/UGglSzHnRQDP+LwGi+9ob54Ei+focAMg1CRXnk/EXOE7ui01NVhBYeFpUl ks+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712451165; x=1713055965; 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=0EJ/0uocE3NjJlEUwaV88zvEZDGX2H4plltlBSFIU1E=; b=o3WkUf3VSmI8igBqtr7690EOmIE+GKbCHsVHbF24a7x68sueoFOx1MRdyTIm7fR9tu DCOhYctWvJ9B6AD+b7pZHB6UBZnPy4tWV8SrMHCs4rcckq+WG57a7GjZsAvKOhJP4e5G shXbQ8/UJBE2b2kC6ke7xBWIUlei5YIddDjva8gijUYIx2XPg6mrm/BxrgC/QQE9e8sU MX2JK6JOkRXxBaX2Wuy0hCC65MKQyPAAoC8rK8CAEsLD2qzKROkTsQp5OwsIWSw2/sKY IHD1sdIUCsQ7A+kJhBtY1N2DLHvfCYqBaDrIewkcqI6c50/wjPAqx1DeRI+BMjJNffri bO1g== X-Forwarded-Encrypted: i=1; AJvYcCWySrEqSauER70gBILM9fDMJq7KgMDqHooCTJR5Y38x4g183vzvxQfBxs8i+a/PPViYLBbjehPZybZquUQ+ouzNVSw= X-Gm-Message-State: AOJu0Yz4dbPv10A1fqzPHXoBsg/zJhzNHiU0Dpzchfsl3r5gD2wywx+b 6vicy2a1oqcsEqhQ8Xz5Tu6Vqvn8E+Wgj6+j9z8sgGS7BlhuRhAB X-Google-Smtp-Source: AGHT+IEpZR5Nut9YDUAeNvAv8rbRkOsBkbnSWPVlNGZbQQ+xp4/ItDOMMSENgbN3RBp/ISa40JS3tQ== X-Received: by 2002:a05:6a21:3d94:b0:1a7:3095:b3b9 with SMTP id bj20-20020a056a213d9400b001a73095b3b9mr5493293pzc.22.1712451165546; Sat, 06 Apr 2024 17:52:45 -0700 (PDT) Received: from localhost.localdomain ([2407:7000:8942:5500:aaa1:59ff:fe57:eb97]) by smtp.gmail.com with ESMTPSA id on15-20020a17090b1d0f00b0029ffcf1df72sm5483118pjb.38.2024.04.06.17.52.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Apr 2024 17:52:45 -0700 (PDT) From: Barry Song <21cnbao@gmail.com> To: lkp@intel.com Cc: akpm@linux-foundation.org, linux-mm@kvack.org, oe-kbuild-all@lists.linux.dev, v-songbaohua@oppo.com Subject: Re: [akpm-mm:mm-unstable 313/322] include/linux/huge_mm.h:274:23: error: variably modified 'stats' at file scope Date: Sun, 7 Apr 2024 12:52:29 +1200 Message-Id: <20240407005229.103923-1-21cnbao@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <202404061627.ungVloow-lkp@intel.com> References: <202404061627.ungVloow-lkp@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: C090B120008 X-Stat-Signature: srg3pyowh674uosdfz8qjihe1w6ohj9n X-Rspam-User: X-HE-Tag: 1712451166-324600 X-HE-Meta: U2FsdGVkX1+O5T/4p0SGnEaFnbxQkt/YAa9nc0pEmHpGwoUN9YI9Su3Q/6hhHIEkV3yveGJyw8dgFYjlllWb1ShaIG/EqM3+qW6JYEGTTaiFfw9g/Pe5MGD2WKFwkcPGqK2vrDeALpnk+6bSgpt9fc9q4F/5sYvix3oL/FkXeZsHHIzU+r1x7Skb7qFSDwcOg8bdllRmO4qRo5ML2GLre1LVL6gGYgp4nx1JxAzMyV6Ml0IerC+i4EgRjNIDfBOEdHekk2kBSTxQEn1zuPb7fRvH2zGwijDecIVrmSBhjUKiI+4GTJ9PYWNRFtLNaqi4H07RZ3oIQWg2UUxlaEL/PnHsEk11+8MEr7V5e+++qtWaD0Rs3ONp71gJaXtuoFnpCiGZ4oUsthYSo122oKW8MXeS9CwtKHIA5So607/ByGyBNlq4Uu7WZpoBnwd58+gicr5O6bvuuvrisq616dwpQtybTdEk2lVelqfQa5hYTh0POBszQs/N48nQV6p7lTqJjDtH8Y/wiyvws2x+ma+nBA+k/4dl+1fVm2Eu1CGUumf/MVMMhyVKfeRrUYYaXHJQnDSm4oMuOGYm6x0GboZGx3e8qjcLZq+3SBl0F5eIJu3PSvKQb4K5IO14H0t//s2mypcuNGkOykXqfuPfjNz88WEvSOJy0NT1s0sel1bXMIE/3pokVTXTn0GSufrsG0ANkZh3iAHeSHkPS68A4qAEx26gg39ny7Q3TbLqcrEAaOEZDcBBQEF7gNjFtcUdfJn14EIsbioReKSl687EhgoCEKR0HhDkK3dISAGOo+IVsz+ryVjZx6dri1TazDDOvf4uBavcQdu8TK9vpJ8jeWzc/aIBC0JCiBV+0PnWDe6cffYuGJLkdU8DtFtumQHFNspaiNejNbiXmLf3HENm3eZr/m2PbdQf4d1r2XvCNqJrQzzjfYmmu8+vXe0tpxHa1zvcUwgLSqXdjgbYks0TIJ7 uIqaHhFU JPoC1KWdGgCkjMM8oA/39iFlG9uuGOEpFtxzHgf7XnuKn9XS0WgHxQIY88qFNSE51d0bXGNAVI+oHhpQt9nR0Y27ikmSBfjvDbzKLOrBSC2qFxRxZ08uDjSwFqTOoq0LldDYqqUd4R3+Kt1qpn0xaVuonFDCHzaXK8awHJU50XF0ZT+o0KmFoppGwSOvp63ek6MgjD3WsgNoFN8JMsvzbzIQzwLrReGmA/k6fDP9l+13aFqRdxkbFFTVPAvPN0PmAccc52Sh+/hcdynx3PXpwGcQvm0TLveVXBZK9cU/dIoKYZNPUn/AzUc1zzhUkPt+bmoqksOanFYva7W/yWlE/z6RufPNGBCEa1ZwJ8i8E2eK+fpEyJuL4gDiIFQR1+N7HPHsjy8jo+wy1WT67TnBnXMZ2mQKPEI42BmIyzguUpEBzVJZ8MAcwX1bh/u3KNWLiurPj/Iz3s0G6r/ehrF94OHfldhiPW+Gk1Y/s0Y5XNQuDg5NGdRjO38tMlnb+jMFR0tsJO+jO4VTakmjGvCHP4tKtSyUZk6hCm1Wa95PLn1gUYO5QJczCNo7l5dmwYqJT+yXwKPGw33jUaRMKPcf7fBD/6b1rKGr+3opm9OcFiHrvOllC6Sxs8yu0RR+hc3UQN9zZWVdKYbvqFxfD9dUaZrlyUhvrWz5BTXVhtsMJ8X0lTL6e3xEWuqlXf23YaNZnicFv/8OS1jz8Dnc= 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-allmodconfig (https://download.01.org/0day-ci/archive/20240406/202404061627.ungVloow-lkp@intel.com/config) > compiler: powerpc64-linux-gcc (GCC) 13.2.0 > reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240406/202404061627.ungVloow-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/202404061627.ungVloow-lkp@intel.com/ > All errors (new ones prefixed by >>): > > In file included from include/linux/mm.h:1115, > from include/linux/mman.h:5, > from arch/powerpc/kernel/asm-offsets.c:19: >>> include/linux/huge_mm.h:274:23: error: variably modified 'stats' at file scope > 274 | unsigned long stats[PMD_ORDER + 1][__MTHP_STAT_COUNT]; > | ^~~~~ > make[3]: *** [scripts/Makefile.build:117: arch/powerpc/kernel/asm-offsets.s] Error 1 Should have been fixed by: >From 573aa50dbebcd4b2650d477374b28aa53c21b968 Mon Sep 17 00:00:00 2001 From: Barry Song Date: Sun, 7 Apr 2024 12:23:35 +1200 Subject: [PATCH] mm: fix powerpc build issue Signed-off-by: Barry Song --- include/linux/huge_mm.h | 9 ++++----- mm/huge_memory.c | 13 +++++++++++-- 2 files changed, 15 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..10bc3f54cb81 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]; } @@ -602,6 +602,7 @@ static struct thpsize *thpsize_create(int order, struct kobject *parent) static void thpsize_release(struct kobject *kobj) { kfree(to_thpsize(kobj)); + free_percpu(mthp_stats); } static int __init hugepage_init_sysfs(struct kobject **hugepage_kobj) @@ -636,6 +637,13 @@ static int __init hugepage_init_sysfs(struct kobject **hugepage_kobj) goto remove_hp_group; } + mthp_stats = (struct mthp_stat __percpu *)alloc_percpu((PMD_ORDER + 1) * + sizeof(sizeof(mthp_stats->stats[0]))); + if (!mthp_stats) { + err = -ENOMEM; + goto remove_hp_group; + } + orders = THP_ORDERS_ALL_ANON; order = highest_order(orders); while (orders) { @@ -673,6 +681,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