Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp1972036pxb; Thu, 28 Oct 2021 13:39:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXk14DERtcT36J1THRhgo6scj6xr2uXk200zemPMCUx/LWDJD/BBatKkqtWwMpGV2qVQyd X-Received: by 2002:a17:90a:8b01:: with SMTP id y1mr6794127pjn.225.1635453572442; Thu, 28 Oct 2021 13:39:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635453572; cv=none; d=google.com; s=arc-20160816; b=R3JSFR4U9YhWJrY6fZGAA5msLLkc9wS5nAuTjatJUUmqcXTDVUeCXBn3u88eYMBSsy hrP0MZXHqfm5+2VE6lE954Vn65YVtZNBGLz7ngyKyMyaIX32M6ZW4myae05cTT7aVGWo QgRh/k/PQBre+rvrauzUXZP2hCcQa5PivNzt6P00FTyG/0nrR6QDeo+QKC9wgAn5OMsT t6Xcj0NnOLBy+j5y/QTjahzu06NIqiYp2mgrTtldC1A2+EMFrGu+KZRzHaCIZK2Z/ZLG K0VoK174rDtDncW1Bg15Ul4JWN4hYbOcQDIHUfGtkyDLJBXIH4WlIAwcUsFHo3YmlRYt C0rg== 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=rcNhOzlImS5ssunFMMcry3iB+40t6QWqCM4MRtmizac=; b=g76uMAsXWaTOmTx2oEBAmgTs5iUTIumYzhGOogn9ya8/lUBp3DiZCziAalerVnKjz1 gn/qQgTYUqtaWmgeyKYYsRSaHlQUhg6vyFOo2botWkWHtzXTnX+lYZUbQbQnItMWAbh4 wJuflaeJX/ykuQ4TW0B3cdVwN8GyyAeCdiQdCpPx4du8nCGEUD3thahPIwEk5FmzbshR fS8oV6DFCNOlgAmsaap7dV6FPEWtpclUPLwZFAR83eY2M5Bj/ipgXUnRkC2Vt+aTiu+h D09EidbpYPGPoQldBrLnf1si3BpnU0ezvlHkb1+ys+uXRKLO4418rSmx18qRWoQr2THo jbcA== 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 z12si5975100pgu.293.2021.10.28.13.39.19; Thu, 28 Oct 2021 13:39:32 -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 S231434AbhJ1UkV (ORCPT + 99 others); Thu, 28 Oct 2021 16:40:21 -0400 Received: from mga02.intel.com ([134.134.136.20]:2692 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231321AbhJ1UkC (ORCPT ); Thu, 28 Oct 2021 16:40:02 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10151"; a="217692549" X-IronPort-AV: E=Sophos;i="5.87,190,1631602800"; d="scan'208";a="217692549" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Oct 2021 13:37:31 -0700 X-IronPort-AV: E=Sophos;i="5.87,190,1631602800"; d="scan'208";a="498562999" Received: from rchatre-ws.ostc.intel.com ([10.54.69.144]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Oct 2021 13:37:29 -0700 From: Reinette Chatre To: jarkko@kernel.org, linux-sgx@vger.kernel.org, shuah@kernel.org, dave.hansen@linux.intel.com Cc: seanjc@google.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V2 09/15] selftests/sgx: Move setup_test_encl() to each TEST_F() Date: Thu, 28 Oct 2021 13:37:34 -0700 Message-Id: <81aac96029004a5aa0ee59681d659ac0a3b40e4f.1635447301.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 Acked-by: Dave Hansen Signed-off-by: Reinette Chatre --- Changes since V1: - Add signature from Dave. 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