Message ID | 20250314133617.138071-5-willy@infradead.org (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 A2D1CC35FF1 for <linux-mm@archiver.kernel.org>; Fri, 14 Mar 2025 13:36:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 20CA6280004; Fri, 14 Mar 2025 09:36:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1961C280001; Fri, 14 Mar 2025 09:36:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 05D65280004; Fri, 14 Mar 2025 09:36:27 -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 DE286280001 for <linux-mm@kvack.org>; Fri, 14 Mar 2025 09:36:27 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 6C3CC1CB465 for <linux-mm@kvack.org>; Fri, 14 Mar 2025 13:36:29 +0000 (UTC) X-FDA: 83220256098.28.1EE5493 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf09.hostedemail.com (Postfix) with ESMTP id C3723140007 for <linux-mm@kvack.org>; Fri, 14 Mar 2025 13:36:27 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=p0mAc+lF; spf=none (imf09.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741959387; 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=6tl9PTBObfMUzEWfIB674sO/Z5/alQwKMnmfDcqOHoQ=; b=5l+f2rz7Qkqeo37lB5JLAF8ufMrwTz5Vz0aKAfCd6e57BgVr93f+aFkOpLyAozCinO/1n7 au85R220r6dV4n1E0viqDYuKNuinvXYUzJG/l5J39KcJfFi2VUOXtb5vdllFjZNIcyepPH w7QyRcmVYJKNU8z8m55WEFNbzGSvzHU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741959387; a=rsa-sha256; cv=none; b=aXn0k//GnuPslpyaGqvyu9nzR9iiEBejG5mgOo3ztBge8LobWIEr4Olecf79vJlwZQdKF7 w7gm1mbSXACYzUz1YkYhBkIr5HzOu9yidZ1bpG403GEYVVrvDy8LGPm22kQtTmvh4tWlg5 3I8O3xxyCVmxcf/9xOdvChc6kjz8nFo= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=p0mAc+lF; spf=none (imf09.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=6tl9PTBObfMUzEWfIB674sO/Z5/alQwKMnmfDcqOHoQ=; b=p0mAc+lF/I4jK+DByBJ9PldLmP x7no93K5JiPgY/XliqPW/H882mFG6sNCsj8IHf9AHU8tiyHBolPZ1ZDqyXGzMhVWIYY51ddjiii+P JTjd/wvoW8PnHe0zUZg/MUZGktqt3SygIunqst8HLFkq8pS8b1E5XBQPuHIJ/pzf78LEf1SwYsrUJ qUdHQoChV78/V3wiB3cvAM7hx+F89FNR1ie3TFhLSbWyxuMgHCZPpuXBl842LL7C1E6ETSV1MlzU0 uDR+FjZJsyZ3Z34ipsnpvq5B82pXut4wuMDYDTKCKQqPkWoT6sSFxXyObeHx8uMRO9R6UrkSLcdXr kp/9gQaw==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tt5D7-00000000ZyW-0Gr0; Fri, 14 Mar 2025 13:36:25 +0000 From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-mm@kvack.org, Johannes Weiner <hannes@cmpxchg.org>, Michal Hocko <mhocko@kernel.org>, Roman Gushchin <roman.gushchin@linux.dev>, Shakeel Butt <shakeel.butt@linux.dev>, Muchun Song <muchun.song@linux.dev>, Zi Yan <ziy@nvidia.com>, David Hildenbrand <david@redhat.com> Subject: [PATCH v2 4/5] mm: Simplify folio_memcg_charged() Date: Fri, 14 Mar 2025 13:36:14 +0000 Message-ID: <20250314133617.138071-5-willy@infradead.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250314133617.138071-1-willy@infradead.org> References: <20250314133617.138071-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: C3723140007 X-Stat-Signature: 8z8zo4tsh7zf4khdfi7i49haa3hkt8tg X-HE-Tag: 1741959387-141091 X-HE-Meta: U2FsdGVkX19uIyOUCbiMAG0ETxfTOoMTJCIzDBDvqTFfKjAJpduDl+9eYVw/aRxr2MHoTPC2SWHWcuDpGGwzcHCj2NF5Vro9W+wLRVgShg25kruEVrpWFovXv/qcGrQXrAqU+aHSE1/dr8UItsgm7993TUK/lhodAe/ALeMa7IVOizgbgqgokOgEX+QhqfBdrpxDtm7XJpknuGUnOfCQC0zS8VU7RJbg3X4BjNYs2xQv2sSnudw4sj8WAiVaN6dx4yHYe0/RJWebK299gCbxUqblRirb+irCkbqmpL9saFN2KfLtYwLVLcBxfldaw3QpZtDvxGsr0iayuPt6owiUyDq/3lvsVZ7ulZpvkfjHcFhZxaMKP4jZnAnV3tQ6uPkjHxTJ52QyT2C9QChCVqJL5OBk+fV3BRadQwhVBBUvOkGq7SqM65wmXX0jIPwBWYePbEWUgwKn/Fv+kfA6E971fN84zFmekw3LZDLLRtD3Dl6fkNyhelRjckubA+OfP0zTtMAEWKmHIc3zE3jlwGRoDP5SOOdtKdJ776bhxJ7WOcfSrYEPwece61UaGjDe6qmLuwKbz6HAKB6nC4pcFRvVcx0hA8G9uwK7Q5PvdwHisAOWRWEMufXeMF7rxpsDvAL/6FxVNnKzFY/eVe8+1DKGyMLningR+O8IXhhFsiUFk7WA71zMHPnLMqnr9aEl5kU3Ab7vB48IK4LJRkR0ocrkNRkg2QF54sy9NRPqRpf4+t2mQoa2WePHhnp+KccmwBqMN0DK4Dy9pyxyvdxvjcnY/Elj3aTzorDXqOrkJuFwsH2vgx3Fm3YXqXt9G2iVqeNSy+rC7fHYiXoX1kQ0EpjjU599PQwrTl1rPu67n5PBMMZU2AdSo53irR3wMZjbcf87Z2MAIQ5MOpCLNCEozreo+DOxr0Y4BINk/eNlh9BkaqpAfZ+IbXFdUQjUCWXleEwJDPhZImQtXyScjXnkn1g uxMFxHAB qBOxYJOIU+v/iTF0b1GiPz9a+Izrj8AJVA7ltB/SeFnnH1ph+QlKD8tZRKrSeKQdIYbNaXLqzrf8yrut1r0SeLqLLhyP9k2Xl2HyxzOikkmqeRdO8NZeqb2JUs8hme7VshXLNXBmVPuPMqrioYGpFFNJILyHNYbXUC7tq8kJY60KKfwYRE7hCAVCDn/CKiP18qZid6RmF7J/6I9y8jhiIwHyDz7f3q4uFLOZ+1yXZiVjtOPiP4MaVMuZstG5un9ilndTTZFcaAEPxvBRu9jR0KXAkWdzVhP31P99lKuCtcc+eJtn2VN8NCFGRKY868+F/D3BbO2q7rnEjUu3SC7u/udZZXL2F1O7sFZwh 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: <linux-mm.kvack.org> List-Subscribe: <mailto:majordomo@kvack.org> List-Unsubscribe: <mailto:majordomo@kvack.org> |
Series |
Minor memcg cleanups & prep for memdescs
|
expand
|
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index ea28cacfb0d2..53364526d877 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -438,9 +438,7 @@ static inline struct mem_cgroup *folio_memcg(struct folio *folio) */ static inline bool folio_memcg_charged(struct folio *folio) { - if (folio_memcg_kmem(folio)) - return __folio_objcg(folio) != NULL; - return __folio_memcg(folio) != NULL; + return folio->memcg_data != 0; } /*