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 79C7AC4167B for ; Wed, 29 Nov 2023 21:53:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 169636B0391; Wed, 29 Nov 2023 16:53:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 11A2B6B0396; Wed, 29 Nov 2023 16:53:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F24786B0397; Wed, 29 Nov 2023 16:53:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E2BE26B0391 for ; Wed, 29 Nov 2023 16:53:47 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id BC520C061F for ; Wed, 29 Nov 2023 21:53:47 +0000 (UTC) X-FDA: 81512344494.06.17A24D9 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf14.hostedemail.com (Postfix) with ESMTP id E52CE10001E for ; Wed, 29 Nov 2023 21:53:45 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=iXcX3qVm; dmarc=none; spf=pass (imf14.hostedemail.com: domain of akpm@linux-foundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701294826; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=zUZ0viRVAHc11j+4BgvivTlqYnsz3l0qW4des7HIkRw=; b=fpR4nUMsqGK+iYDBSMcKug5N+8ZcEICVyykPJYlv5YmfS+iFSSS+97fyUXzT6ZpRaUeuLF juBUJU3vDC5lUCyuAh47pvLY+o7NqSuX/Lx9hIQwvdLNgb2pYvNLXtS/cKNlmLrSLczVCr S0kjq0RkWFNdg3OGO/yac3MTuFKamyY= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=iXcX3qVm; dmarc=none; spf=pass (imf14.hostedemail.com: domain of akpm@linux-foundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701294826; a=rsa-sha256; cv=none; b=wvgzzPCVE58So6MFHRPtZ3m/MAtt6uh2VvCrDbRgOFyYcmfO3+uwSwSluEwR9QNe218t3E 034CujySK6RXdllVBPxG8Bv1XX8y2tVDSea1SyqydbbxPvzsBRac9NrfyLGf2GAR4tXfKB cDCXqx2QmLsHJKIdd5ACgzH3rksG/qw= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 2AAA8B840FA; Wed, 29 Nov 2023 21:53:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 589CDC433C7; Wed, 29 Nov 2023 21:53:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1701294823; bh=iakV+cijkspHV/4vv/1mV70eQzSquBPbs8fsfcbwtlU=; h=Date:From:To:Subject:In-Reply-To:References:From; b=iXcX3qVmP08Zr2gs6N3kKOXcjzfb8xaTdb2lyHCO267rmojWcPz2edjnNBm0tjKwv GaKW1YfnYFcAKmQIPV0mbWsMd/W7KQ6WXGZaLN9lsEvTkyivT2ERIBvfqlhA2oNvw6 VztIrEHqHTOoyz+j2lzS/I7kGjrFhoQSfXkVCDe4= Date: Wed, 29 Nov 2023 13:53:42 -0800 From: Andrew Morton To: kernel test robot , Domenico Cerasuolo , oe-kbuild-all@lists.linux.dev, Linux Memory Management List , Nhat Pham Subject: Re: [akpm-mm:mm-unstable 179/192] mm/zswap.c:825:17: error: dereferencing pointer to incomplete type 'struct mem_cgroup' Message-Id: <20231129135342.5697165df1adfff04c749082@linux-foundation.org> In-Reply-To: <20231129134313.656e76c2e3fec1361007633b@linux-foundation.org> References: <202311292250.RUfWGNgx-lkp@intel.com> <20231129134313.656e76c2e3fec1361007633b@linux-foundation.org> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: E52CE10001E X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: t7ar3s3eybbxobzfd1r4qc5ko6njnftn X-HE-Tag: 1701294825-68996 X-HE-Meta: U2FsdGVkX18LgH3O7K0zkt1e996Rd+AlqtIouBI7tire26f30pzRtinMXADAmkLMTr9duO/EWrQhG4LaoEQMZoTL3jFbkXsrULwA44VokYWwnR5JsujFiCemmP7L++6ASYx/F88UpN5qSo5EcM1IjiLVzttc/w2yFaTk9wiye/ymKFRgMkwzdIPZXcaLg7SNHAm71V7VGxAR09GZjrY0iqilHT5VpJpdrtcic5pXiH9ep316UB5daKnrj5SX7AUzqUFuBZBsgHNdwCxruW5n0vSFgEZ+PrdSMkR5kd/ft4zJb7EJoKoo9z7sNbBa5Mn4ZSBM9W4JpW9jtLSWx7uWRBsbotdPzGgGgWv35PJxH0CwxEZd427CJHEcvu9RcskQcE5DzmvL1tqDA+mghR9g8jGE/DkWckdnbP6BvHmxs9EC9pBA5C3WcZ88daxJW82v20GjK8ZOBaXYL0609/MWXk/ioH77ygQAj6bPaQ+ForXsLb18FsoGXFurRy5E0GUa4GizuheK51+Fw3mowWm2b9HVxWehokiu/Fz9rs0RuYb6xx0CAAbsHfr4qv0hOPOQoaeig9uTxB8trdR28D7OpElFkkqRKLMjRhPG83MXS+9kW22ONqvEXXEKpsHpfgjy1yxz7TQWr/+yk0PtZm3FSdKErBIby7TGff6+F0KzzzWslowPKiQsbmC3sXdylPt6Xclh82pDJFXNxMPLX4OY7nDDiiZX4sXUzvE2PurSi9Vd5SvrIvx0dBIDWZ1G21owctlx+yhQr8jVoGAnQ4FKUNHOcFnNTHoYBm5wYM4gjmUIsm4cCClrKTjM0NCoEAz8eAgtLwhY2Pn7NADXwSMNnB7jL04vqnFwB0m1NjKH2vG5H0Q2mr90D0841skLxO3ZWkd2yPBMKH/zAShh1ZihKYcwx4ixUhg8uXtTFmmFyBhl2jgVy4g3i8cO0SOdCUOCeNLk8PQuDqPAEjUzR7f o8hBLmxz tFEqLkTKkY9cm0YB7e1eb+ZUq16sCiBmIyjb6/ZXyoCXNhYEo68y2hPxOrSB3eCDdyM/3q6t5dzHHAHywnedvKCa8TCaBv1EhN1cYsbHeHj6bGTlAHOulk3ffG2BiTEbRdgPLeXsf97cLXffumJqgTpFVzQ3QznaweJYSV/7EDTXKbVc8J0ssoekhFUj1Ug7ByKpJuK4VGzbrtmvhFy/B+RMxbDuCpOaNIgU906E1WJfn+6gwxroSD97M7JPL/F+MYXnGdpIbeyA8dYVPGCKdQbZ9uksqXRZq87z8kbTt+2trvU2EUkcgq2YV5yOT3K3MyTiPBA23MrcGawbQFvlEZoDxtzk+JVMElcFe 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: On Wed, 29 Nov 2023 13:43:13 -0800 Andrew Morton wrote: > On Wed, 29 Nov 2023 23:42:11 +0800 kernel test robot wrote: > > > >> mm/zswap.c:825:17: error: dereferencing pointer to incomplete type 'struct mem_cgroup' > > css_get(&memcg->css); > > ^~ > > OK, thanks, patchset needs work for CONFIG_MEMCG=n. I'll drop this version. Well that's annoying - the "mm: memcg: subtree stats flushing and thresholds" series had lots of dependencies on this series. So I'll restore this series with this hack: include/linux/memcontrol.h | 5 +++++ mm/zswap.c | 3 +++ 2 files changed, 8 insertions(+) --- a/include/linux/memcontrol.h~zswap-make-shrinking-memcg-aware-fix +++ a/include/linux/memcontrol.h @@ -1165,6 +1165,11 @@ unsigned long mem_cgroup_soft_limit_recl #define MEM_CGROUP_ID_SHIFT 0 +static inline struct mem_cgroup *obj_cgroup_memcg(struct obj_cgroup *objcg) +{ + return NULL; +} + static inline struct mem_cgroup *folio_memcg(struct folio *folio) { return NULL; --- a/mm/zswap.c~zswap-make-shrinking-memcg-aware-fix +++ a/mm/zswap.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -822,7 +823,9 @@ static void shrink_worker(struct work_st * Acquire an extra reference to the iterated memcg in case the * original reference is dropped by the zswap offlining callback. */ +#ifdef CONFIG_MEMCG css_get(&memcg->css); +#endif spin_unlock(&zswap_pools_lock); ret = shrink_memcg(memcg); _