Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp799834pxb; Wed, 15 Sep 2021 13:34:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnHt7sau2pf8YsLl/wHOf8/6CViPWbiK7KpAG3v+Zg1WuKq0g3VUmZu4fr/+wTC21Ye5xw X-Received: by 2002:a17:906:16cd:: with SMTP id t13mr2050034ejd.140.1631738046073; Wed, 15 Sep 2021 13:34:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631738046; cv=none; d=google.com; s=arc-20160816; b=hgkaQi58dsjBl8fldyz9osdLr8NDKRQa29aWbCtBc8Vmf0nISCsWb31r6H6y5t14KR sAjyWBITpLjz81i7r1C/gl97XOqgnk2Nur7QmThLXb8MAE6C89rekIftopPZjiaMNNGK 6UgxR8R7QD7MtkulRTfp/FVkvzw86Uk4TZY7fs5n1xZQFd4TiG7fuLQke13T2Nd97dmT k6Z2p2b+xoQ/ZKF8ekK0ZyP9Ntm2T2a3M5wQ1g8Ka+Ryn8R6PCs6LVIiPVu2ex/UeM1c b8rcvz8bUssJ3/+ynByGBi36wxn6ZzWW2O2sIRVCz2S0Qb3xMuWyc5NKkFFDAQXldq0x vFHw== 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; bh=IAx3vmLeiSHX5y7UrQLcDSodwk7Zw2xC98ml1+GE0tE=; b=HuoYUWTRyukO/VHZ7BsNFxZc4UZ/GvPOTkA6mIYEnLeQ2ligmZgLYfT16v0dmMxDV5 esSTIyMZE+BrvfHdXRTWO4AddTUI9HHm5ZOEsh1D6Ql7+lOaYSa1S8p89u+7ZCkE5tdY 0OqCmqKaZ0VbLLsq+Age8UWf5UtK0GmBJsbO4bet9gIo8KpHCbrLHWQmE+YK0wS6+rjF boemtaoStPLg4wV2qvggDiGMdJaLu4RhrP4/E/NPakdLCBuHh3QlkqAjmqDYdoEwxSeD kaUa6hSeFBMR7pL57rijHe5pYYr+4UtCu7+gXNdkYNuCzRKv18HyPqLmBhfLpPgPgVYm W+7A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r8si1001919edo.210.2021.09.15.13.33.42; Wed, 15 Sep 2021 13:34:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232209AbhIOUdA (ORCPT + 99 others); Wed, 15 Sep 2021 16:33:00 -0400 Received: from mga07.intel.com ([134.134.136.100]:13811 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231998AbhIOUcf (ORCPT ); Wed, 15 Sep 2021 16:32:35 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10108"; a="286109367" X-IronPort-AV: E=Sophos;i="5.85,296,1624345200"; d="scan'208";a="286109367" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2021 13:31:15 -0700 X-IronPort-AV: E=Sophos;i="5.85,296,1624345200"; d="scan'208";a="545092782" Received: from rchatre-ws.ostc.intel.com ([10.54.69.144]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2021 13:31:15 -0700 From: Reinette Chatre To: linux-sgx@vger.kernel.org, jarkko@kernel.org, shuah@kernel.org Cc: seanjc@google.com, bp@alien8.de, dave.hansen@linux.intel.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/14] selftests/sgx: Move setup_test_encl() to each TEST_F() Date: Wed, 15 Sep 2021 13:30:58 -0700 Message-Id: <093e85bac35416d0159bf5ea917f2871c6169e42.1631731214.git.reinette.chatre@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jarkko Sakkinen Create the test enclave inside each TEST_F(), instead of FIXTURE_SETUP(), so that the heap size can be defined per test. Signed-off-by: Jarkko Sakkinen Signed-off-by: Reinette Chatre --- tools/testing/selftests/sgx/main.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/sgx/main.c b/tools/testing/selftests/sgx/main.c index 5b3e49a36344..f41fba919d06 100644 --- a/tools/testing/selftests/sgx/main.c +++ b/tools/testing/selftests/sgx/main.c @@ -191,10 +191,6 @@ static bool setup_test_encl(unsigned long heap_size, struct encl *encl, FIXTURE_SETUP(enclave) { - ASSERT_TRUE(setup_test_encl(ENCL_HEAP_SIZE_DEFAULT, &self->encl, _metadata)); - - memset(&self->run, 0, sizeof(self->run)); - self->run.tcs = self->encl.encl_base; } FIXTURE_TEARDOWN(enclave) @@ -226,6 +222,11 @@ TEST_F(enclave, unclobbered_vdso) { struct encl_op op; + ASSERT_TRUE(setup_test_encl(ENCL_HEAP_SIZE_DEFAULT, &self->encl, _metadata)); + + memset(&self->run, 0, sizeof(self->run)); + self->run.tcs = self->encl.encl_base; + op.type = ENCL_OP_PUT; op.buffer = MAGIC; @@ -248,6 +249,11 @@ TEST_F(enclave, clobbered_vdso) { struct encl_op op; + ASSERT_TRUE(setup_test_encl(ENCL_HEAP_SIZE_DEFAULT, &self->encl, _metadata)); + + memset(&self->run, 0, sizeof(self->run)); + self->run.tcs = self->encl.encl_base; + op.type = ENCL_OP_PUT; op.buffer = MAGIC; @@ -278,6 +284,11 @@ TEST_F(enclave, clobbered_vdso_and_user_function) { struct encl_op op; + ASSERT_TRUE(setup_test_encl(ENCL_HEAP_SIZE_DEFAULT, &self->encl, _metadata)); + + memset(&self->run, 0, sizeof(self->run)); + self->run.tcs = self->encl.encl_base; + self->run.user_handler = (__u64)test_handler; self->run.user_data = 0xdeadbeef; -- 2.25.1