Received: by 2002:ac2:464d:0:0:0:0:0 with SMTP id s13csp2062015lfo; Fri, 20 May 2022 11:57:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQ7UjVATXCDCnwXMFHNoHAol3/Ms3NtFirMe36aBIvMELytXqcMAf1Hnf2CF+qd4UOoIXM X-Received: by 2002:a17:906:6a11:b0:6fa:5752:9b2d with SMTP id qw17-20020a1709066a1100b006fa57529b2dmr10313278ejc.703.1653073059113; Fri, 20 May 2022 11:57:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653073059; cv=none; d=google.com; s=arc-20160816; b=q32AMTS/iFyZUWFktOOd3O9u+D1xOoIJYpOMVtVNawTMb6I+No6BOrCnhprE4NuZbz zdxWC6zbt9qlrlfFVgYdvhpScg6pzThX3kITiYT8hRi2AIWZFCmN0SBSRO2rovlhcg4E y6wyKVw40rna3gIQ1DLhpoxAjM8OmOtkZAEasvFLBPsRS7uCfQFs95Whh7qG5IdlJr1B 40O6pVYKDqvf9PysOqxAofrYy7+1LVU8cagHhzN0swh9zf2KtAP1b+5njVSoZySrSXIB Swp8Vu9+tRBOJUMGkPRx++VSRhuqJBCkrPN8bDNIXes2WaHoo074IVscDr+LKOcfaoHX K4vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:date:cc:to:from:subject :message-id:dkim-signature; bh=5BSKZxKWq8f9F2dgJuQmO+drb3AKQIIQrJakH+TJmK0=; b=LOivgwJCQkKQ5jomRDGkzt8Wkh0FVJA3gnjkbj84uXL+s5vCrnKkeMXkhngMw5zopk 4PS7SuyhaBvP9yqZMjQIzE7/pt+CM89awt8RukTn1rm1gdSyK/KwNJ/xK3vdVRXCamQE YkElkPv9lj+0Bs9hFjQDMTkv92grp6jSj+nTYbD4rEO6oIRcqF0I7uHhjsLM1AhKLzsA tV7dAzXqldz2hMgtTBLOYxDAhBAKsMr68sfWo2OBNUTLkEoqi4G3mkF1eKjFmO8H4U1I JbRQ1CfEXCAhzb9EhMcyxPI0kBKvM8oR72Fbm9SWCAJHbwv573YcajGpAKF/I0eCB47e nC6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=VJWN7I6q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jg3-20020a170907970300b006fe8d330d6esi879668ejc.374.2022.05.20.11.57.13; Fri, 20 May 2022 11:57:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=VJWN7I6q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345047AbiETPn1 (ORCPT + 99 others); Fri, 20 May 2022 11:43:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238648AbiETPnZ (ORCPT ); Fri, 20 May 2022 11:43:25 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C13C157100; Fri, 20 May 2022 08:43:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1653061403; x=1684597403; h=message-id:subject:from:to:cc:date:in-reply-to: references:mime-version:content-transfer-encoding; bh=0TikEPkVG9kba/8xU52ZkOqg7idNa/0U/s9VmxW73Lg=; b=VJWN7I6qtDyM4Xe5iJIbPnaTdLt0MkRHhvoITRzZj2f6pcDRcFaaWPLY CHCBxnH77ZD51lEe16ZGY1cqns+OZDrfMepJ8+6BkP9ZXazefZ/7aEvuR 09IJCd18Tumj/bqfQ/oX6ID5HWrpXu25MaNDLPDgTmzMnkIzINjvzbel5 hw2MonMq8Hl9h7b/XbgeUKdZWXC/cRgkxh13ZA/PgUZcSLkLirwYh05Uh jWubZHdxMo3PBgCPh0k4TrFdke7QZO531XQfo+5n/cJ4D96AFmMoV3H5K aBad8LxHMR2VG7c7j+D4lFh7dWE2wiQ4u3PxgKVNXLPwK3/NdT/gFXXpA Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10353"; a="333267105" X-IronPort-AV: E=Sophos;i="5.91,239,1647327600"; d="scan'208";a="333267105" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2022 08:43:23 -0700 X-IronPort-AV: E=Sophos;i="5.91,239,1647327600"; d="scan'208";a="674663978" Received: from kcaccard-mobl.amr.corp.intel.com (HELO kcaccard-mobl1.jf.intel.com) ([10.209.83.65]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2022 08:43:21 -0700 Message-ID: Subject: Re: [PATCH v2] x86/sgx: Set active memcg prior to shmem allocation From: Kristen Carlson Accardi To: Jarkko Sakkinen Cc: linux-sgx@vger.kernel.org, Dave Hansen , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, mhocko@suse.com, roman.gushchin@linux.dev, hannes@cmpxchg.org, shakeelb@google.com Date: Fri, 20 May 2022 08:43:19 -0700 In-Reply-To: References: <20220519210445.5310-1-kristen@linux.intel.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.30.5 (3.30.5-1.fc29) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2022-05-20 at 01:31 +0300, Jarkko Sakkinen wrote: > On Thu, May 19, 2022 at 02:04:45PM -0700, Kristen Carlson Accardi > wrote: > > When the system runs out of enclave memory, SGX can reclaim EPC > > pages > > by swapping to normal RAM. These backing pages are allocated via a > > per-enclave shared memory area. Since SGX allows unlimited over > > commit on EPC memory, the reclaimer thread can allocate a large > > number of backing RAM pages in response to EPC memory pressure. > > > > When the shared memory backing RAM allocation occurs during > > the reclaimer thread context, the shared memory is charged to > > the root memory control group, and the shmem usage of the enclave > > is not properly accounted for, making cgroups ineffective at > > limiting the amount of RAM an enclave can consume. > > > > For example, when using a cgroup to launch a set of test > > enclaves, the kernel does not properly account for 50% - 75% of > > shmem page allocations on average. In the worst case, when > > nearly all allocations occur during the reclaimer thread, the > > kernel accounts less than a percent of the amount of shmem used > > by the enclave's cgroup to the correct cgroup. > > > > SGX stores a list of mm_structs that are associated with > > an enclave. Pick one of them during reclaim and charge that > > mm's memcg with the shmem allocation. The one that gets picked > > is arbitrary, but this list almost always only has one mm. The > > cases where there is more than one mm with different memcg's > > are not worth considering. > > > > Create a new function - sgx_encl_alloc_backing(). This function > > is used whenever a new backing storage page needs to be > > allocated. Previously the same function was used for page > > allocation as well as retrieving a previously allocated page. > > Prior to backing page allocation, if there is a mm_struct > > associated > > with the enclave that is requesting the allocation, it is set > > as the active memory control group. > > > > Signed-off-by: Kristen Carlson Accardi > > --- > > V1 -> V2: > > Changed sgx_encl_set_active_memcg() to simply return the correct > > memcg for the enclave and renamed to sgx_encl_get_mem_cgroup(). > > > > Created helper function current_is_ksgxd() to improve readability. > > > > Use mmget_not_zero()/mmput_async() when searching mm_list. > > > > Move call to set_active_memcg() to sgx_encl_alloc_backing() and > > use mem_cgroup_put() to avoid leaking a memcg reference. > > > > Address review feedback regarding comments and commit log. > > > > arch/x86/kernel/cpu/sgx/encl.c | 109 > > ++++++++++++++++++++++++++++++++- > > arch/x86/kernel/cpu/sgx/encl.h | 11 +++- > > arch/x86/kernel/cpu/sgx/main.c | 4 +- > > 3 files changed, 118 insertions(+), 6 deletions(-) > > > > diff --git a/arch/x86/kernel/cpu/sgx/encl.c > > b/arch/x86/kernel/cpu/sgx/encl.c > > index 001808e3901c..6d10202612d6 100644 > > --- a/arch/x86/kernel/cpu/sgx/encl.c > > +++ b/arch/x86/kernel/cpu/sgx/encl.c > > @@ -32,7 +32,7 @@ static int __sgx_encl_eldu(struct sgx_encl_page > > *encl_page, > > else > > page_index = PFN_DOWN(encl->size); > > > > - ret = sgx_encl_get_backing(encl, page_index, &b); > > + ret = sgx_encl_lookup_backing(encl, page_index, &b); > > if (ret) > > return ret; > > > > @@ -574,7 +574,7 @@ static struct page > > *sgx_encl_get_backing_page(struct sgx_encl *encl, > > * 0 on success, > > * -errno otherwise. > > */ > > -int sgx_encl_get_backing(struct sgx_encl *encl, unsigned long > > page_index, > > +static int sgx_encl_get_backing(struct sgx_encl *encl, unsigned > > long page_index, > > struct sgx_backing *backing) > > { > > pgoff_t pcmd_index = PFN_DOWN(encl->size) + 1 + (page_index >> > > 5); > > @@ -601,6 +601,111 @@ int sgx_encl_get_backing(struct sgx_encl > > *encl, unsigned long page_index, > > return 0; > > } > > > > +/* > > + * When called from ksgxd, returns the mem_cgroup of a struct mm > > stored > > + * in the enclave's mm_list. When not called from ksgxd, just > > returns > > + * the mem_cgroup of the current task. > > + */ > > +static struct mem_cgroup *sgx_encl_get_mem_cgroup(struct sgx_encl > > *encl) > > +{ > > + struct mem_cgroup *memcg = NULL; > > + struct sgx_encl_mm *encl_mm; > > + int idx; > > + > > + /* > > + * If called from normal task context, return the mem_cgroup > > + * of the current task's mm. The remainder of the handling is > > for > > + * ksgxd. > > + */ > > + if (!current_is_ksgxd()) > > + return get_mem_cgroup_from_mm(current->mm); > > + > > + /* > > + * Search the enclave's mm_list to find an mm associated with > > + * this enclave to charge the allocation to. > > + */ > > + idx = srcu_read_lock(&encl->srcu); > > + > > + list_for_each_entry_rcu(encl_mm, &encl->mm_list, list) { > > + if (!mmget_not_zero(encl_mm->mm)) > > + continue; > > + > > + memcg = get_mem_cgroup_from_mm(encl_mm->mm); > > + > > + mmput_async(encl_mm->mm); > > + > > + break; > > + } > > + > > + srcu_read_unlock(&encl->srcu, idx); > > + > > + /* > > + * In the rare case that there isn't an mm associated with > > + * the enclave, set memcg to the current active mem_cgroup. > > + * This will be the root mem_cgroup if there is no active > > + * mem_cgroup. > > + */ > > + if (!memcg) > > + return get_mem_cgroup_from_mm(NULL); > > + > > + return memcg; > > +} > > + > > +/** > > + * sgx_encl_alloc_backing() - allocate a new backing storage page > > + * @encl: an enclave pointer > > + * @page_index: enclave page index > > + * @backing: data for accessing backing storage for the page > > + * > > + * When called from ksgxd, sets the active memcg from one of the > > + * mms in the enclave's mm_list prior to any backing page > > allocation, > > + * in order to ensure that shmem page allocations are charged to > > the > > + * enclave. > > + * > > + * Return: > > + * 0 on success, > > + * -errno otherwise. > > + */ > > +int sgx_encl_alloc_backing(struct sgx_encl *encl, unsigned long > > page_index, > > + struct sgx_backing *backing) > > +{ > > + struct mem_cgroup *memcg, *old_memcg; > > + int ret; > > + > > + memcg = sgx_encl_get_mem_cgroup(encl); > > + > > + old_memcg = set_active_memcg(memcg); > > + > > + ret = sgx_encl_get_backing(encl, page_index, backing); > > + > > + set_active_memcg(old_memcg); > > + > > + mem_cgroup_put(memcg); > > This is too sparse IMHO. > > I would rewrite it as: > > struct mem_cgroup *encl_memcg = sgx_encl_get_mem_cgroup(encl); > struct mem_cgroup *memcg = set_active_memcg(encl_memcg); > int ret; > > ret = sgx_encl_get_backing(encl, page_index, backing); > > set_active_memcg(memcg); > mem_cgroup_put(encl_memcg); > > I think old_memcg is not very documentative, whereas this also > dclearly > tells what is going on: enclave's memcg is temporarily swapped in > order to > perform page allocation, so that the allocations gets accounted from > them > correct cgroup. Thanks for your feedback, I will incorporate it into v3. --Kristen > > > + > > + return ret; > > +} > > + > > +/** > > + * sgx_encl_lookup_backing() - retrieve an existing backing > > storage page > > + * @encl: an enclave pointer > > + * @page_index: enclave page index > > + * @backing: data for accessing backing storage for the page > > + * > > + * Retrieve a backing page for loading data back into an EPC page > > with ELDU. > > + * It is the caller's responsibility to ensure that it is > > appropriate to use > > + * sgx_encl_lookup_backing() rather than sgx_encl_alloc_backing(). > > If lookup is > > + * not used correctly, this will cause an allocation which is not > > accounted for. > > + * > > + * Return: > > + * 0 on success, > > + * -errno otherwise. > > + */ > > +int sgx_encl_lookup_backing(struct sgx_encl *encl, unsigned long > > page_index, > > + struct sgx_backing *backing) > > +{ > > + return sgx_encl_get_backing(encl, page_index, backing); > > +} > > + > > /** > > * sgx_encl_put_backing() - Unpin the backing storage > > * @backing: data for accessing backing storage for the page > > diff --git a/arch/x86/kernel/cpu/sgx/encl.h > > b/arch/x86/kernel/cpu/sgx/encl.h > > index fec43ca65065..2de3b150ab00 100644 > > --- a/arch/x86/kernel/cpu/sgx/encl.h > > +++ b/arch/x86/kernel/cpu/sgx/encl.h > > @@ -100,13 +100,20 @@ static inline int sgx_encl_find(struct > > mm_struct *mm, unsigned long addr, > > return 0; > > } > > > > +static inline bool current_is_ksgxd(void) > > +{ > > + return current->mm ? false : true; > > +} > > + > > int sgx_encl_may_map(struct sgx_encl *encl, unsigned long start, > > unsigned long end, unsigned long vm_flags); > > > > void sgx_encl_release(struct kref *ref); > > int sgx_encl_mm_add(struct sgx_encl *encl, struct mm_struct *mm); > > -int sgx_encl_get_backing(struct sgx_encl *encl, unsigned long > > page_index, > > - struct sgx_backing *backing); > > +int sgx_encl_lookup_backing(struct sgx_encl *encl, unsigned long > > page_index, > > + struct sgx_backing *backing); > > +int sgx_encl_alloc_backing(struct sgx_encl *encl, unsigned long > > page_index, > > + struct sgx_backing *backing); > > void sgx_encl_put_backing(struct sgx_backing *backing, bool > > do_write); > > int sgx_encl_test_and_clear_young(struct mm_struct *mm, > > struct sgx_encl_page *page); > > diff --git a/arch/x86/kernel/cpu/sgx/main.c > > b/arch/x86/kernel/cpu/sgx/main.c > > index 4b41efc9e367..7d41c8538795 100644 > > --- a/arch/x86/kernel/cpu/sgx/main.c > > +++ b/arch/x86/kernel/cpu/sgx/main.c > > @@ -310,7 +310,7 @@ static void sgx_reclaimer_write(struct > > sgx_epc_page *epc_page, > > encl->secs_child_cnt--; > > > > if (!encl->secs_child_cnt && test_bit(SGX_ENCL_INITIALIZED, > > &encl->flags)) { > > - ret = sgx_encl_get_backing(encl, PFN_DOWN(encl->size), > > + ret = sgx_encl_alloc_backing(encl, PFN_DOWN(encl- > > >size), > > &secs_backing); > > if (ret) > > goto out; > > @@ -381,7 +381,7 @@ static void sgx_reclaim_pages(void) > > goto skip; > > > > page_index = PFN_DOWN(encl_page->desc - encl_page- > > >encl->base); > > - ret = sgx_encl_get_backing(encl_page->encl, page_index, > > &backing[i]); > > + ret = sgx_encl_alloc_backing(encl_page->encl, > > page_index, &backing[i]); > > if (ret) > > goto skip; > > > > -- > > 2.20.1 > > > > BR, Jarkko