Message ID | 20230712230202.47929-14-haitao.huang@linux.intel.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1467114vqm; Wed, 12 Jul 2023 16:05:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlEs5jUOtkvAvClAl4130I6mIYXWdRgVOFtlHPiyjhp2zKnDpqeRz/ueG06YR8e2QqrJSOQa X-Received: by 2002:a17:906:1106:b0:98e:419b:4cc6 with SMTP id h6-20020a170906110600b0098e419b4cc6mr17687447eja.70.1689203111572; Wed, 12 Jul 2023 16:05:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689203111; cv=none; d=google.com; s=arc-20160816; b=BceaoIgpyloJjWyjL4dLLxy9ApGUteARfLlEu4slf1IUiUwJzvLBKTHjohtdqWldbQ lQqzBMCUzUgzSyawFvY1q2WF0a0klhszeWERJikLjbxSGEISh9G6XrSAw8gh2fVlpWKk Qqtu6qoHFRBTtPNwHkVln+bg6UOJh7/Q22TkoUZ5p9CoJAAoePEElYVqqnhaveu+pyRM DqaeTVWPFg8T8ZbuBj9thmpoPk/bi0XyvuKqN/Cb8bBMJqRS41jjE9NrlmSmbrlKAQ9u awfV8H4UmGhzlkjEL+e87mZDvOjb1em9OxnryztHsrjCFlWg5SKI0Te/ZfIGZYJnbzHs PSDw== 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=nvw7SKME7U3J1zTPuxM2i8UxoNmGI1pbynTQHx1+llo=; fh=yb4uG0y4asZWHqlPLNfXLnkT1yMR9ApbW5Mi8ElCAYw=; b=lwGJTvQIw0wjh5TuZpz/g/biE0zYB+zwY1/G7XyVqrFE1dOPm4Ap4tQMPzkCVWtsiL BvXqQEH2Rsoz78KtYD72//zU5v2y1/m+HbJd2Cc7v4S9sHi+speoY1+SKYY+6LpjizTw 2jwWczumezfwunruo2LydINUMnfeOZM04Hm2RDxS53597Nr3e7USHhqD/71s5UJGpGEr BUsJwF+bZrSi0znA/a5xVY6FUQWWwHUh2JawkWwkBgjLOtLZYRddHcBAvhySroWWgxeZ eL/W6QbMFDSCYfR+GdmRPKixquBYHKZcd4LnIj/YO0zbvSZXsByrWs4mxF0cKknikzgh IV/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SolF6wHy; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sd26-20020a170906ce3a00b0098dfb10f3a6si6071122ejb.107.2023.07.12.16.04.47; Wed, 12 Jul 2023 16:05:11 -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=SolF6wHy; 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 S232452AbjGLXDA (ORCPT <rfc822;gnulinuxfreebsd@gmail.com> + 99 others); Wed, 12 Jul 2023 19:03:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232599AbjGLXCP (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 12 Jul 2023 19:02:15 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F293910D4; Wed, 12 Jul 2023 16:02:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689202934; x=1720738934; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vWWqi0BRvPwh6dlml1YtBKdZnukhG8cG4DxV7m62/7Y=; b=SolF6wHyv6D0F1JBMZRPHCtIZapOrTJkvLTt945s5n52I9LfEHfgutn5 C+i3Q3vQRmUeQTiGo7sECxvZ7SyKmwnFU313b+bCUfvR6M1lHufrnLaJQ iiQSJgYcjIRFLEJ8LK6eA5bydNPBgXu+xlbXqCVB8+y4UL7z4D4cqJ4/i LeVxTvOhJBp2F4GvLtXOYkYgYcKcBDr3M7qBf7Qyi1yNfejw4aIqLJC40 7ucL8UlELrW5/vhPpHD+n53mGdh9DNAB5geWD3sy7go18HDDFPEfKKg1V ThBcVDtxcAQqZkB6eUrw+rd9nt4H143qg5C/2EkG+BhdWKEGIsoX4uyma g==; X-IronPort-AV: E=McAfee;i="6600,9927,10769"; a="428774122" X-IronPort-AV: E=Sophos;i="6.01,200,1684825200"; d="scan'208";a="428774122" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2023 16:02:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10769"; a="835338631" X-IronPort-AV: E=Sophos;i="6.01,200,1684825200"; d="scan'208";a="835338631" Received: from b4969161e530.jf.intel.com ([10.165.56.46]) by fmsmga002.fm.intel.com with ESMTP; 12 Jul 2023 16:02:11 -0700 From: Haitao Huang <haitao.huang@linux.intel.com> To: jarkko@kernel.org, dave.hansen@linux.intel.com, tj@kernel.org, linux-kernel@vger.kernel.org, linux-sgx@vger.kernel.org, cgroups@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com> Cc: kai.huang@intel.com, reinette.chatre@intel.com, Sean Christopherson <sean.j.christopherson@intel.com>, zhiquan1.li@intel.com, kristen@linux.intel.com, seanjc@google.com Subject: [PATCH v3 13/28] x86/sgx: Prepare for multiple LRUs Date: Wed, 12 Jul 2023 16:01:47 -0700 Message-Id: <20230712230202.47929-14-haitao.huang@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230712230202.47929-1-haitao.huang@linux.intel.com> References: <20230712230202.47929-1-haitao.huang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.3 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,URIBL_BLOCKED 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771257842174012295 X-GMAIL-MSGID: 1771257842174012295 |
Series |
Add Cgroup support for SGX EPC memory
|
|
Commit Message
Haitao Huang
July 12, 2023, 11:01 p.m. UTC
From: Sean Christopherson <sean.j.christopherson@intel.com> Add sgx_can_reclaim() wrapper so that in a subsequent patch, multiple LRUs can be used cleanly. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Kristen Carlson Accardi <kristen@linux.intel.com> Signed-off-by: Haitao Huang <haitao.huang@linux.intel.com> Cc: Sean Christopherson <seanjc@google.com> --- arch/x86/kernel/cpu/sgx/main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c index ea0698db8698..a829555b9675 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -390,10 +390,15 @@ static size_t sgx_reclaim_pages(size_t nr_to_scan, bool ignore_age) return i; } +static bool sgx_can_reclaim(void) +{ + return !list_empty(&sgx_global_lru.reclaimable); +} + static bool sgx_should_reclaim(unsigned long watermark) { return atomic_long_read(&sgx_nr_free_pages) < watermark && - !list_empty(&sgx_global_lru.reclaimable); + sgx_can_reclaim(); } /* @@ -589,7 +594,7 @@ struct sgx_epc_page *sgx_alloc_epc_page(void *owner, bool reclaim) break; } - if (list_empty(&sgx_global_lru.reclaimable)) + if (!sgx_can_reclaim()) return ERR_PTR(-ENOMEM); if (!reclaim) {