From patchwork Sat Sep 23 03:06:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haitao Huang X-Patchwork-Id: 143794 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:910f:0:b0:403:3b70:6f57 with SMTP id r15csp54483vqg; Fri, 22 Sep 2023 20:11:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFYLdpiVHbZfHt/ddubAcMVDlF6sLZCA8dGoYNTIjwWjKVV0pO1oU0wSw2Z45QR1gj3JxUY X-Received: by 2002:a05:6a20:2589:b0:152:be08:b013 with SMTP id k9-20020a056a20258900b00152be08b013mr1128313pzd.42.1695438705410; Fri, 22 Sep 2023 20:11:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695438705; cv=none; d=google.com; s=arc-20160816; b=rE8SMvAnP7XoKat3mGkJi4sG5TK2g6tlDapn86LylSUx9okeIaCgQCxu4QrauackjD 1Iej7T6gpiPh2W8u5kmSzYrQsge3RK4U0ibZQCeTwDYcY0wZgZHvSHAUtWMgYWjHFfJz d/s0Yg3IrjhY4Js+aesI5CMi7vO0a6I2fPi1hiOHYzFHH/3EQWVU/i4MpSTtcvIOlJWK d7JVRvSQo8IzX6L5mrGY6TLD/so03fy8JcdH8TWVnHkyn+9H2NjTk6ka8pHHh/bazCd1 jYnpvvmWxetDdTGg+GFhQZdorixdcf1AcCC/ZKBgZWz+mrKRNacvWIapdu2bdOsY0rpe vZqg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=uBH2wj+FdMrkff9jSQcAMSwVTgJ0ymfYgKif0ih1XPM=; fh=j8PE345l5Ydlo3KwK7JeWnjqRgjiq4AteUoOZeOwa0I=; b=ZcSaGpabBv7LbqvUE2+PFgrl2cCMqu5G9yLAhabJDXQhkDoLt9MNJXBfv/AV8WLEld NOyqiL898NQmMGWDzN0NtWp7SJH8TRLJTOhV0yM3BQ5wZHPKT11+cXA1imtucakK8VSw 6u08e5KQFG2vvChAf2Jdq1WDpN1CIEelFL0ItQSMryNggzexDg8fQnTvQVjUxpAVgZE3 6nA+XvcCOQPWl/VkjHNOn8Y1fSnveEvxJzS/O7vQAfIGZ6fo3PNaFMB4D1YiX8wESOqb d17dhYpy/MhMaewJVWMkCoVv0BdVGgMmzQ1Lt1R9nnSy0kGDNVQyF2dA2gJx5Blywaav +ilg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=aqMQTtLg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id ld5-20020a170902fac500b001bb6d711625si5046304plb.279.2023.09.22.20.11.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 20:11:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=aqMQTtLg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id BD1E482EA171; Fri, 22 Sep 2023 20:08:41 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231143AbjIWDHk (ORCPT + 28 others); Fri, 22 Sep 2023 23:07:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229887AbjIWDHL (ORCPT ); Fri, 22 Sep 2023 23:07:11 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0718B1A7; Fri, 22 Sep 2023 20:07:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695438425; x=1726974425; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mUkcYfLatdROP3kNi+VVBQokEDDPoz07w/WU/sAEnUA=; b=aqMQTtLgGuf15Tse8w9MPy4+p26ouclTOBIzA+hYGIu+gIGEohogC+CP /5q+y3K6kdY/5ZQTc3g/WD02temprhNtd0bdlc7Jq7fQ+fyqtfpuG26JA kbapsrrtre+ISa5PlDVXzWI/k0SS9i+mZaT6DkBL80zrPb6uvla85c2eY BWSfT6iO/qGp6GGC0PyCLW/pUxnVgmZW7lskREAsFzXTJRcsO1BupQOB0 bEUmW88gVGv/APd+sinwJFAik+EwevVFJvDIjtLbfKKkSRmVWHDwtTOLg es3spATI39p3kx3MY+zzjsCfdeW6l/IbqzhPOjKMT7AK3UZLbqYaeWf6d g==; X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="447466778" X-IronPort-AV: E=Sophos;i="6.03,169,1694761200"; d="scan'208";a="447466778" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2023 20:07:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="891048551" X-IronPort-AV: E=Sophos;i="6.03,169,1694761200"; d="scan'208";a="891048551" Received: from b4969161e530.jf.intel.com ([10.165.56.46]) by fmsmga001.fm.intel.com with ESMTP; 22 Sep 2023 20:06:08 -0700 From: Haitao Huang To: jarkko@kernel.org, dave.hansen@linux.intel.com, tj@kernel.org, linux-kernel@vger.kernel.org, linux-sgx@vger.kernel.org, x86@kernel.org, cgroups@vger.kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, sohil.mehta@intel.com Cc: zhiquan1.li@intel.com, kristen@linux.intel.com, seanjc@google.com, zhanb@microsoft.com, anakrish@microsoft.com, mikko.ylinen@linux.intel.com, yangjie@microsoft.com Subject: [PATCH v5 08/18] x86/sgx: Use a list to track to-be-reclaimed pages Date: Fri, 22 Sep 2023 20:06:47 -0700 Message-Id: <20230923030657.16148-9-haitao.huang@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230923030657.16148-1-haitao.huang@linux.intel.com> References: <20230923030657.16148-1-haitao.huang@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=2.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 22 Sep 2023 20:08:42 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777796335810469919 X-GMAIL-MSGID: 1777796335810469919 From: Sean Christopherson Change sgx_reclaim_pages() to use a list rather than an array for storing the epc_pages which will be reclaimed. This change is needed to transition to the LRU implementation for EPC cgroup support. When the EPC cgroup is implemented, the reclaiming process will do a pre-order tree walk for the subtree starting from the limit-violating cgroup. When each node is visited, candidate pages are selected from its "reclaimable" LRU list and moved into this temporary list. Passing a list from node to node for temporary storage in this walk is more straightforward than using an array. Signed-off-by: Sean Christopherson Co-developed-by: Kristen Carlson Accardi Signed-off-by: Kristen Carlson Accardi Co-developed-by: Haitao Huang Signed-off-by: Haitao Huang Cc: Sean Christopherson --- V4: - Changes needed for patch reordering - Revised commit message V3: - Removed list wrappers --- arch/x86/kernel/cpu/sgx/main.c | 40 +++++++++++++++------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c index c1ae19a154d0..fba06dc5abfe 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -293,12 +293,11 @@ static void sgx_reclaimer_write(struct sgx_epc_page *epc_page, */ static void sgx_reclaim_pages(void) { - struct sgx_epc_page *chunk[SGX_NR_TO_SCAN]; struct sgx_backing backing[SGX_NR_TO_SCAN]; + struct sgx_epc_page *epc_page, *tmp; struct sgx_encl_page *encl_page; - struct sgx_epc_page *epc_page; pgoff_t page_index; - int cnt = 0; + LIST_HEAD(iso); int ret; int i; @@ -314,18 +313,22 @@ static void sgx_reclaim_pages(void) if (kref_get_unless_zero(&encl_page->encl->refcount) != 0) { sgx_epc_page_set_state(epc_page, SGX_EPC_PAGE_RECLAIM_IN_PROGRESS); - chunk[cnt++] = epc_page; + list_move_tail(&epc_page->list, &iso); } else { - /* The owner is freeing the page. No need to add the - * page back to the list of reclaimable pages. + /* The owner is freeing the page, remove it from the + * LRU list */ sgx_epc_page_reset_state(epc_page); + list_del_init(&epc_page->list); } } spin_unlock(&sgx_global_lru.lock); - for (i = 0; i < cnt; i++) { - epc_page = chunk[i]; + if (list_empty(&iso)) + return; + + i = 0; + list_for_each_entry_safe(epc_page, tmp, &iso, list) { encl_page = epc_page->owner; if (!sgx_reclaimer_age(epc_page)) @@ -340,6 +343,7 @@ static void sgx_reclaim_pages(void) goto skip; } + i++; encl_page->desc |= SGX_ENCL_PAGE_BEING_RECLAIMED; mutex_unlock(&encl_page->encl->lock); continue; @@ -347,27 +351,19 @@ static void sgx_reclaim_pages(void) skip: spin_lock(&sgx_global_lru.lock); sgx_epc_page_set_state(epc_page, SGX_EPC_PAGE_RECLAIMABLE); - list_add_tail(&epc_page->list, &sgx_global_lru.reclaimable); + list_move_tail(&epc_page->list, &sgx_global_lru.reclaimable); spin_unlock(&sgx_global_lru.lock); kref_put(&encl_page->encl->refcount, sgx_encl_release); - - chunk[i] = NULL; - } - - for (i = 0; i < cnt; i++) { - epc_page = chunk[i]; - if (epc_page) - sgx_reclaimer_block(epc_page); } - for (i = 0; i < cnt; i++) { - epc_page = chunk[i]; - if (!epc_page) - continue; + list_for_each_entry(epc_page, &iso, list) + sgx_reclaimer_block(epc_page); + i = 0; + list_for_each_entry_safe(epc_page, tmp, &iso, list) { encl_page = epc_page->owner; - sgx_reclaimer_write(epc_page, &backing[i]); + sgx_reclaimer_write(epc_page, &backing[i++]); kref_put(&encl_page->encl->refcount, sgx_encl_release); sgx_epc_page_reset_state(epc_page);