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 E506DC3DA7F for ; Mon, 12 Aug 2024 08:07:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 74EFD6B00B7; Mon, 12 Aug 2024 04:07:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6FF056B00B8; Mon, 12 Aug 2024 04:07:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 578246B00B9; Mon, 12 Aug 2024 04:07:29 -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 38BCB6B00B7 for ; Mon, 12 Aug 2024 04:07:29 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E83B3C0369 for ; Mon, 12 Aug 2024 08:07:28 +0000 (UTC) X-FDA: 82442863776.20.7891AB7 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by imf07.hostedemail.com (Postfix) with ESMTP id DA20440012 for ; Mon, 12 Aug 2024 08:07:26 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=suse.com header.s=google header.b=IH2eT8FK; spf=pass (imf07.hostedemail.com: domain of mhocko@suse.com designates 209.85.208.51 as permitted sender) smtp.mailfrom=mhocko@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723450012; a=rsa-sha256; cv=none; b=I8BXHXbe90BG21fWuHeXMYJCF4kl92W5DS0bjCGLLJUqt7c96HYvczz5IE3MwLwvJb97S8 BqblYnP4qqklmYOWyzsY66yR0l0BCxT7/hBa71ggCyv1ZEUjh0Tv8mbn1GSi3mKLrFgkO7 Vr8vsBG3XOB5tmcXW4/JR1cFp2wYdw0= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=suse.com header.s=google header.b=IH2eT8FK; spf=pass (imf07.hostedemail.com: domain of mhocko@suse.com designates 209.85.208.51 as permitted sender) smtp.mailfrom=mhocko@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723450012; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5YFgRF8LFfOau3/MGIyoZIgJMI33380v6d+GDkrcvOw=; b=XraqgayFat4bUs6lRCmPoa3Irw+Du3I6v86DDRXvofl5xqtvz1S6rEhlK0RpFYcmSbpmpg MLD03Z+AUb0Q2mLj9FlEXfCT644hLybwecDfbtyzjYcK+eZa6BIxtTJOcKnxHxMTUPoCd1 wAFJ6R8danqTU4V3vjs+jEWv9B5io8g= Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-5a10bb7bcd0so4997326a12.3 for ; Mon, 12 Aug 2024 01:07:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1723450045; x=1724054845; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=5YFgRF8LFfOau3/MGIyoZIgJMI33380v6d+GDkrcvOw=; b=IH2eT8FKKbqKYVWU/6Xv6aTtV6hXIqt+9pHahmeym6CmmW9J8Ed4V2d3cBtyUQ2FN5 C82ZmJudrKZOi39Dgx1VRCBkak2Q63UM2wDlJi3PKeCyApN1zBYj2Pvhl2a0fBAgYbzG 0lWFw6lobrGavDB97yxOnjQi0tmg+hC2IDVY7rGZuXGtduayEixrq0iDnwGSpIvbtiH3 6pJCraYRgVYEJIaz6QHMbjMSHV0897uykHLUuenjA1s1bo9qHCWA89rkLvOhj9NXnBbS vzyldZ4nLtEe8wK3An5W9k+L+VYICSTn1ZLPNOwYNYXihwr0qqKS6xcQE5NwBh6Thror PBKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723450045; x=1724054845; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=5YFgRF8LFfOau3/MGIyoZIgJMI33380v6d+GDkrcvOw=; b=ZUQup42dR99Zh2pCwN/QfX5a1fRvmOEgzKLTns1ATPr9jGBVcYcP3bxxL0GHrVHvDr YQzKcwRgrV+FXky2DihnRWLxrW2ExT4SAjq49Qkm32rMdt8nRvoUajiwEQTryjP/kTUi nO6b+1NsIWmE1pL1DpO+7arVz5ECPUfQCiEQkAaNxQdNi/IaW15ox/MmfZ68IhNve69u eoZrohx6o6FUGrwQwh48IaVhktUciE5c8IQoBsaf4d+SAJoLfQsWVWAsIvPuvIXQl+Lt tgRFZzw8wKqrhaORmv88U/cgpNST31Xwd11vsJIZvKjQ4bNFS5ubAfoG4HDBgxFpcBAr /31w== X-Forwarded-Encrypted: i=1; AJvYcCV/f2MijNJRBocXD1w42xTJCv+VD8PTSQgiBEJMp+xBYdNkq2eTKRHyoBmnvDpSWqrtQelajq+QAB4FiOtpb9vcx7A= X-Gm-Message-State: AOJu0YzIMkaB6q5BdRFSie/f9jddiyUZHZO9EC75wAkI+ySsy7HmqK2x h5GC1DA5AEx0oqR7XbWpN2pX76gvfPMEXoZgU3/hmSa3b3zIVhh9+GVI7+oAQlU= X-Google-Smtp-Source: AGHT+IGrIoJZ2UjhjzCuoPlILeJ6ErUrFE2kwTpCS1owp14Bcwlj6/O6oJalpWVnT5vj0VKGM+laZA== X-Received: by 2002:a05:6402:274c:b0:5b8:d362:3f46 with SMTP id 4fb4d7f45d1cf-5bd0a6e32b8mr5603488a12.35.1723450045156; Mon, 12 Aug 2024 01:07:25 -0700 (PDT) Received: from localhost (109-81-83-166.rct.o2.cz. [109.81.83.166]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5bd187f4fedsm1924275a12.6.2024.08.12.01.07.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 01:07:24 -0700 (PDT) Date: Mon, 12 Aug 2024 10:07:19 +0200 From: Michal Hocko To: Shakeel Butt Cc: Andrew Morton , Johannes Weiner , Roman Gushchin , Muchun Song , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Meta kernel team , cgroups@vger.kernel.org, Matthew Wilcox Subject: Re: [PATCH] memcg: replace memcg ID idr with xarray Message-ID: References: <20240809172618.2946790-1-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240809172618.2946790-1-shakeel.butt@linux.dev> X-Stat-Signature: isnksnph4un3wrmbbxmdfqfgnf6cx4ci X-Rspamd-Queue-Id: DA20440012 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1723450046-977332 X-HE-Meta: U2FsdGVkX1/INz0NqK8Mk6BVAIAFgg/N0opEJ9+XYfoV8D0uDdnKZXLJqtKEwNshiXt3t4vWtxmyquK1bdMk2MtRCHMvv6qJaqP+LVyHGj0+aBig2KYidesvOLh6qxYkfgb9YZ4eE8L+lONAfmXVEc9txkp8qGb2/Y+Vk7bquTuKwN3saGUD1yUr+ZrxlmITcbQbPrE7o/1QZ9nD2t0jETThS2WfMtmz++gN8HuP5pWOr4hdKLd1omfLtdf3C7INt9o4rRb0r2E5USeiICa27CKIaa13H7q22fXkrwoxcYNFkpQ2cDPFCMweq0Paf0JLZsLDFxfye2c9SNHSLOEY6SDnQbmDgIZdAbui/OiLWX4pq6fqQ6/oc9OGrsmT7Nv9tzScaR8qNJwRSItShRSakOeE7r5GVXK/Hh7XBogw+avHl5BPZNHMk6KT6Ec8Ar761qovael5yXuWONuqlDtRr9SbwQQdNfIVEGZyjLENDlUBWx+kJU3DUqm8vywBqs4pQcJaNobk0r4azfqR9db5gxMYXSfZ/bfGvtCP1H0hu8etEu6UrmAPus3UX8ZbYjEMllTs8dtAhVH7T8AVYB950lNcOkHQdYi2UAAe4qEvBsyAv1yXdgB1iKB+PfZJ0Aish7JlWNKUx5sRGWyEQz5XViD1C5+RdHgNc8Md/tCKBXVALqQ7VKpI/IelV982YoLoqdOjVei4PgGJYRr4msRFIvqNTe7MCe5Hsebkynuw2RjAeWEuItfYjen6rM2sy+YNjMn2weQS2ZCjNfvf2R2RH3p7U0OanBsZS9xvt8wT4SWL3e0Q1/ue8xuPNCUhhowHb0PeEHQIyT8ECt9pYRQCyc+ehrcLJveKgguxs/Dr3e8h2L/w8qSdnaSX7Nj1nHxZDidcO3zN2vX4skOtNoBlKXu3i3g6/aQbjAue9NTE3hLDEh1WeWGpJcDq9KRphgd8YpQtHSE5e4ZW9MggE73 WMlz35HB EzGya/AxgUBjsgtmuCHnep7QDzuP4OboXiLLHBxJEzEfGZMla9Y6pgjeZsY5FWMOw1obMA7684/0Cfs3VaNpGK3ChipsbjW81ZwfeHGeen0q39ojPIk8KvREppI4TdSixnjRNST47cvad4y2vtSyzuMjsS4bPA2m0vLOmR8AOOYBw9YY115No0CvnEaK7Ok5YkbAHn1yzep19Tl4JbHL8kCI0aMRXvcH5zSnbFLVG/0qIvYL6Bq9h/xoQTF42/m5gjpfemlxrD+1wAhFalQ+G6xypIlGm26+ntMBFQ3LHz7r1HnAiuqxY973Gcq/9zRCZaSEx6UGf/7jzYwylVHaxxSRzEKma1ThFeDxDIOXQcSQkB7n5z4NRzfekA/nhFtRKHnisWJTzVqDwJAkRXWzXIeQhZQ== 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 Fri 09-08-24 10:26:18, Shakeel Butt wrote: > At the moment memcg IDs are managed through IDR which requires external > synchronization mechanisms and makes the allocation code a bit awkward. > Let's switch to xarray and make the code simpler. > > Suggested-by: Matthew Wilcox > Signed-off-by: Shakeel Butt Neat! I was not aware of this feature of XArray. Is there any actual reason for idr to have its own implementation with XArray offering a better interface? Acked-by: Michal Hocko Thanks! > --- > mm/memcontrol.c | 34 +++++++--------------------------- > 1 file changed, 7 insertions(+), 27 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index e1ffd2950393..b8e6b98485c6 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -3363,29 +3363,12 @@ static void memcg_wb_domain_size_changed(struct mem_cgroup *memcg) > */ > > #define MEM_CGROUP_ID_MAX ((1UL << MEM_CGROUP_ID_SHIFT) - 1) > -static DEFINE_IDR(mem_cgroup_idr); > -static DEFINE_SPINLOCK(memcg_idr_lock); > - > -static int mem_cgroup_alloc_id(void) > -{ > - int ret; > - > - idr_preload(GFP_KERNEL); > - spin_lock(&memcg_idr_lock); > - ret = idr_alloc(&mem_cgroup_idr, NULL, 1, MEM_CGROUP_ID_MAX + 1, > - GFP_NOWAIT); > - spin_unlock(&memcg_idr_lock); > - idr_preload_end(); > - return ret; > -} > +static DEFINE_XARRAY_ALLOC1(mem_cgroup_ids); > > static void mem_cgroup_id_remove(struct mem_cgroup *memcg) > { > if (memcg->id.id > 0) { > - spin_lock(&memcg_idr_lock); > - idr_remove(&mem_cgroup_idr, memcg->id.id); > - spin_unlock(&memcg_idr_lock); > - > + xa_erase(&mem_cgroup_ids, memcg->id.id); > memcg->id.id = 0; > } > } > @@ -3420,7 +3403,7 @@ static inline void mem_cgroup_id_put(struct mem_cgroup *memcg) > struct mem_cgroup *mem_cgroup_from_id(unsigned short id) > { > WARN_ON_ONCE(!rcu_read_lock_held()); > - return idr_find(&mem_cgroup_idr, id); > + return xa_load(&mem_cgroup_ids, id); > } > > #ifdef CONFIG_SHRINKER_DEBUG > @@ -3519,11 +3502,10 @@ static struct mem_cgroup *mem_cgroup_alloc(struct mem_cgroup *parent) > if (!memcg) > return ERR_PTR(error); > > - memcg->id.id = mem_cgroup_alloc_id(); > - if (memcg->id.id < 0) { > - error = memcg->id.id; > + error = xa_alloc(&mem_cgroup_ids, &memcg->id.id, NULL, > + XA_LIMIT(1, MEM_CGROUP_ID_MAX), GFP_KERNEL); > + if (error) > goto fail; > - } > > memcg->vmstats = kzalloc(sizeof(struct memcg_vmstats), > GFP_KERNEL_ACCOUNT); > @@ -3664,9 +3646,7 @@ static int mem_cgroup_css_online(struct cgroup_subsys_state *css) > * publish it here at the end of onlining. This matches the > * regular ID destruction during offlining. > */ > - spin_lock(&memcg_idr_lock); > - idr_replace(&mem_cgroup_idr, memcg, memcg->id.id); > - spin_unlock(&memcg_idr_lock); > + xa_store(&mem_cgroup_ids, memcg->id.id, memcg, GFP_KERNEL); > > return 0; > offline_kmem: > -- > 2.43.5 > -- Michal Hocko SUSE Labs