From patchwork Sat Sep 23 03:06:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haitao Huang X-Patchwork-Id: 14441 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp352183vqu; Sat, 23 Sep 2023 13:11:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHunOaFiOQZi5ud7dSTzDQmAzpZx7jtGDHU7ig8tCZ3kiXJ1xiHJxEqgsuXDmk8ch0Ru1Xk X-Received: by 2002:a17:90a:9202:b0:26b:36a4:feeb with SMTP id m2-20020a17090a920200b0026b36a4feebmr8742964pjo.8.1695499884929; Sat, 23 Sep 2023 13:11:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695499884; cv=none; d=google.com; s=arc-20160816; b=u1r9Yx4jRW9m/NajooL4Qra+UGSMkBUsoui5R+keBbK27ElDdHRvinxjtTjMtmSVBE 0pJOXDYZnhh9cBtfgBbCjjfjnsPd2NY5J/pRfwuf7I6hpTugu+/MXSx3z72as1ur+IWz BVk2YcTAYnw2JO4PFzxSBKAoklUoKGN9ev/gQPLaCrYj0vvz+mOJnrHCz+0h8tWEX4oF 5omQtiJ8dD0CCKsMbvrTcuv//cXET+ktSMHpftoemJnbOShczCW2RO4WzdRgCvlOOFW3 aYmrO59CBm2Z1H7ZeorwOuDbEYg5TpvK8m2mkOmFezxkpNJmn29emMRQvxV0WYS2QJrT m6VQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=fertXJe/mtqnlIwsZapWmICPscdF+FYgnK7gQTlDoDA=; fh=j8PE345l5Ydlo3KwK7JeWnjqRgjiq4AteUoOZeOwa0I=; b=Myv5t3Gs9JQ7Uaeb0RtT6a8uGIn2LIIUghuqMAmtt+/g78hxYbg52KSCvvSggwtHbN NeqGQ9k6aN+78bH7lBCWG5NvW4T/eEGdFSWltHxmm37RWXm3jbVuZshH2lDLbfmmVumW J+SttQ4Z7mfNqkUYkOkIC7udaMZC6YmvHS2tr8Hg0nbNCzZ/hUJy54akeZx5hEu0AP+5 eJRKqCyCxTfehZ2tMipbaqLY1cAESEUKlo3svSiJsQmyHwpMRYCXABpRqLepCohYnU8k R99zbryNXMZQuNPjYjT/YIwplhfTJir0pKdZE/0ipKq36YhG4TcnObtRxvvn5a5sUthk IXgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fXjc2t+7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id me15-20020a17090b17cf00b00276b87c8b8esi7542044pjb.59.2023.09.23.13.11.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Sep 2023 13:11:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fXjc2t+7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id 9750D81CDB9E; Fri, 22 Sep 2023 20:07:14 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229663AbjIWDHH (ORCPT + 28 others); Fri, 22 Sep 2023 23:07:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229490AbjIWDHG (ORCPT ); Fri, 22 Sep 2023 23:07:06 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA173180; Fri, 22 Sep 2023 20:06:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695438419; x=1726974419; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=nZVXCwOuydbndY5vcLfGn2MhNmudGolXVrDAy3MEbrI=; b=fXjc2t+7wccNeI76msfPspV3zcXszNHdq5BnDhXZEP/Umb4pl1e4ODP5 YnP20rvMADJSLFBpj9tbJSXTBxa1ooxDVs9UL7T/vzBmP+aSxQCdAbyHP iuAp/00GkXdy2AC7xdcApilsgRXQiOtbvPPiWA0PDs0le5zLcutk2vutR kbpae6PA5hIeqLb7DUgR7t+JKiW2qR1AXXWXmjy54B1W4ERhxEfW7y+13 q3HKQWQJXERfJQUj2JpwlH8qEOiI+T60FWnwefqhK5a4UU1XaQRrJcFMg rDUXGc8+sfeoC6wFxLLrcvOu5Fw8reebDBsyXepES8Fp1RxjeD5yOF9i/ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="447466717" X-IronPort-AV: E=Sophos;i="6.03,169,1694761200"; d="scan'208";a="447466717" 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:06:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="891048514" X-IronPort-AV: E=Sophos;i="6.03,169,1694761200"; d="scan'208";a="891048514" Received: from b4969161e530.jf.intel.com ([10.165.56.46]) by fmsmga001.fm.intel.com with ESMTP; 22 Sep 2023 20:06:02 -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 00/18] Add Cgroup support for SGX EPC memory Date: Fri, 22 Sep 2023 20:06:39 -0700 Message-Id: <20230923030657.16148-1-haitao.huang@linux.intel.com> X-Mailer: git-send-email 2.25.1 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 morse.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 (morse.vger.email [0.0.0.0]); Fri, 22 Sep 2023 20:07:14 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777860487380270980 X-GMAIL-MSGID: 1777860487380270980 SGX EPC memory allocations are separate from normal RAM allocations, and are managed solely by the SGX subsystem. The existing cgroup memory controller cannot be used to limit or account for SGX EPC memory, which is a desirable feature in some environments, e.g., support for pod level control in a Kubernates cluster on a VM or baremetal host [1,2]. This patchset implements the support for sgx_epc memory within the misc cgroup controller. The user can use the misc cgroup controller to set and enforce a max limit on total EPC usage per cgroup. The implementation reports current usage and events of reaching the limit per cgroup as well as the total system capacity. This work was originally authored by Sean Christopherson a few years ago, and previously modified by Kristen C. Accardi to work with more recent kernels, and to utilize the misc cgroup controller rather than a custom controller. Now I have been updating the patches based on review comments since V2 [3, 4], simplified a few aspects of the implementation/design and fixed some stability issues found from testing, while keeping the same user space facing interfaces. The patchset adds support for multiple LRU lists to track both reclaimable EPC pages (i.e., pages the reclaimer knows about), as well as unreclaimable EPC pages (i.e., pages which the reclaimer isn't aware of, such as VA pages). These pages are assigned to an LRU list, as well as an enclave, so that an enclave's full EPC usage can be tracked, and subject to the per-cgroup limit. During OOM events, an enclave can have its memory zapped, and all the EPC pages tracked by the LRU lists can be freed. The EPC pages allocated for KVM guests by the virtual EPC driver are not reclaimable by the host kernel [5]. Therefore they are not tracked by any LRU lists for reclaiming purposes in this implementation, but they are charged toward the cgroup of the user processs (e.g., QEMU) launching the guest. And when the cgroup EPC usage reaches its limit, the virtual EPC driver will stop allocating more EPC for the VM, and return SIGBUS to the user process which would abort the VM launch. To make it easier to follow, I reordered the patches in v4 into following clusters: - Patches 1&2 are prerequisite misc cgroup changes - Patches 3-8 deal with the 'reclaimable' pages - Patches 9-12 deal with the 'unreclaimable' pages, which are freed only for OOM scenarios. - Patches 13-15 re-organize EPC reclaiming code to be reusable by EPC cgroup. - Patch 16 implements EPC cgroup as a misc cgroup. - Patch 17 adds documentation for the EPC cgroup. - Patch 18 adds test scripts. I appreciate your review and providing tags if appropriate. --- v5: - Replace the manual test script with a selftest script. - Restore the "From" tag for some patches to Sean [Kai] - Style fixes (Jarkko) v4: * Collected "Tested-by" from Mikko. I kept it for now as no functional changes in v4. * Rebased on to v6.6_rc1 and reordered patches as described above. * Separated out the bug fixes [7,8,9]. This series depend on those patches. (Dave, Jarkko) * Added comments in commit message to give more preview what's to come next. (Jarkko) * Fixed some documentation error, gap, style (Mikko, Randy) * Fixed some comments, typo, style in code (Mikko, Kai) * Patch format and background for reclaimable vs unreclaimable (Kai, Jarkko) * Fixed typo (Pavel) * Exclude the previous fixes/enhancements for self-tests. Patch 18 now depends on series [6] * Use the same to list for cover and all patches. (Sohil) v3: * Added EPC states to replace flags in sgx_epc_page struct. (Jarkko) * Unrolled wrappers for cond_resched, list (Dave) * Separate patches for adding reclaimable and unreclaimable lists. (Dave) * Other improvments on patch flow, commit messages, styles. (Dave, Jarkko) * Simplified the cgroup tree walking with plain css_for_each_descendant_pre. * Fixed race conditions and crashes. * OOM killer to wait for the victim enclave pages being reclaimed. * Unblock the user by handling misc_max_write callback asynchronously. * Rebased onto 6.4 and no longer base this series on the MCA patchset. * Fix an overflow in misc_try_charge. * Fix a NULL pointer in SGX PF handler. * Updated and included the SGX selftest patches previously reviewed. Those patches fix issues triggered in high EPC pressure required for cgroup testing. * Added test scripts to help setup and test SGX EPC cgroups. [1]https://lore.kernel.org/all/DM6PR21MB11772A6ED915825854B419D6C4989@DM6PR21MB1177.namprd21.prod.outlook.com/ [2]https://lore.kernel.org/all/ZD7Iutppjj+muH4p@himmelriiki/ [3]https://lore.kernel.org/all/20221202183655.3767674-1-kristen@linux.intel.com/ [4]https://lore.kernel.org/linux-sgx/20230712230202.47929-1-haitao.huang@linux.intel.com/ [5]Documentation/arch/x86/sgx.rst, Section "Virtual EPC" [6]https://lore.kernel.org/linux-sgx/20220905020411.17290-1-jarkko@kernel.org/ [7]https://lore.kernel.org/linux-sgx/ZLcXmvDKheCRYOjG@slm.duckdns.org/ [8]https://lore.kernel.org/linux-sgx/20230721120231.13916-1-haitao.huang@linux.intel.com/ [9]https://lore.kernel.org/linux-sgx/20230728051024.33063-1-haitao.huang@linux.intel.com/ Haitao Huang (2): x86/sgx: Introduce EPC page states selftests/sgx: Add scripts for EPC cgroup testing Kristen Carlson Accardi (3): cgroup/misc: Add per resource callbacks for CSS events cgroup/misc: Add SGX EPC resource type and export APIs for SGX driver x86/sgx: Limit process EPC usage with misc cgroup controller Sean Christopherson (13): x86/sgx: Add sgx_epc_lru_lists to encapsulate LRU lists x86/sgx: Use sgx_epc_lru_lists for existing active page list x86/sgx: Store reclaimable EPC pages in sgx_epc_lru_lists x86/sgx: Introduce RECLAIM_IN_PROGRESS state x86/sgx: Use a list to track to-be-reclaimed pages x86/sgx: Store struct sgx_encl when allocating new VA pages x86/sgx: Add EPC page flags to identify owner types x86/sgx: store unreclaimable pages in LRU lists x86/sgx: Add EPC OOM path to forcefully reclaim EPC x86/sgx: Expose sgx_reclaim_pages() for use by EPC cgroup x86/sgx: Add helper to grab pages from an arbitrary EPC LRU x86/sgx: Prepare for multiple LRUs Docs/x86/sgx: Add description for cgroup support Documentation/arch/x86/sgx.rst | 82 ++++ arch/x86/Kconfig | 13 + arch/x86/kernel/cpu/sgx/Makefile | 1 + arch/x86/kernel/cpu/sgx/driver.c | 27 +- arch/x86/kernel/cpu/sgx/encl.c | 72 ++- arch/x86/kernel/cpu/sgx/encl.h | 4 +- arch/x86/kernel/cpu/sgx/epc_cgroup.c | 415 ++++++++++++++++++ arch/x86/kernel/cpu/sgx/epc_cgroup.h | 59 +++ arch/x86/kernel/cpu/sgx/ioctl.c | 25 +- arch/x86/kernel/cpu/sgx/main.c | 399 +++++++++++++---- arch/x86/kernel/cpu/sgx/sgx.h | 117 ++++- include/linux/misc_cgroup.h | 34 ++ kernel/cgroup/misc.c | 57 ++- .../selftests/sgx/run_epc_cg_selftests.sh | 147 +++++++ .../selftests/sgx/watch_misc_for_tests.sh | 13 + 15 files changed, 1314 insertions(+), 151 deletions(-) create mode 100644 arch/x86/kernel/cpu/sgx/epc_cgroup.c create mode 100644 arch/x86/kernel/cpu/sgx/epc_cgroup.h create mode 100755 tools/testing/selftests/sgx/run_epc_cg_selftests.sh create mode 100755 tools/testing/selftests/sgx/watch_misc_for_tests.sh