From patchwork Mon Sep 26 13:03:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Gongyi X-Patchwork-Id: 12988687 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0A98C07E9D for ; Mon, 26 Sep 2022 13:07:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4F2F08E0049; Mon, 26 Sep 2022 09:07:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 44C768E0047; Mon, 26 Sep 2022 09:07:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 22A0F8E0049; Mon, 26 Sep 2022 09:07:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 0B6F68E0047 for ; Mon, 26 Sep 2022 09:07:40 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D7F1740B4D for ; Mon, 26 Sep 2022 13:07:39 +0000 (UTC) X-FDA: 79954263438.13.769D650 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf25.hostedemail.com (Postfix) with ESMTP id E32A2A0018 for ; Mon, 26 Sep 2022 13:07:38 +0000 (UTC) Received: from canpemm500005.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MbjbW6HnnzHtjp; Mon, 26 Sep 2022 21:02:47 +0800 (CST) Received: from ubuntu1804.huawei.com (10.67.174.63) by canpemm500005.china.huawei.com (7.192.104.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 26 Sep 2022 21:07:33 +0800 From: Zhao Gongyi To: , , , CC: , , , , , Zhao Gongyi Subject: [PATCH -next v3 2/3] selftests/memory-hotplug: Restore memory before exit Date: Mon, 26 Sep 2022 21:03:40 +0800 Message-ID: <20220926130341.253039-3-zhaogongyi@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220926130341.253039-1-zhaogongyi@huawei.com> References: <20220926130341.253039-1-zhaogongyi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.63] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500005.china.huawei.com (7.192.104.229) X-CFilter-Loop: Reflected ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf25.hostedemail.com: domain of zhaogongyi@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=zhaogongyi@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664197659; a=rsa-sha256; cv=none; b=3DsBNXgzgY/Z6JOyf0vbVGUIiqOtO4/w8//LWafKWymYNx3Xu+dRZO7cDGWLBnh04SBpNI 0loV9TRR8dNpMExxKGTaRxALwsQZlqf+M7hM8QFqCX2VN9FzVN2TDyPDzE7TpsxdQyIlSr RmJXG+y8vE9w7nqw9266iXMaU51cBFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664197659; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+ucIlu97PPyASTCqO5HqLLIqCdRTf4rBblueIrLXunY=; b=YM+FGmXSthhxRUcJAVdrnJJdczNUDYnR8Zg391XkT/SRXq0Oupi3rBQ0UP7ZMgaRA48Uop QMeeWICRGZajPjFS58ssEdTMBC5U0+mxe3m3nA1NNKdQcULVjbGnqh7kCZDe+4ZzvIu2rM gMwu6Sowyu76/76+H5U2SWg3xYXz138= X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: E32A2A0018 X-Stat-Signature: kamxdxgwrb16gbhai3duabhm4awfomg4 Authentication-Results: imf25.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf25.hostedemail.com: domain of zhaogongyi@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=zhaogongyi@huawei.com X-HE-Tag: 1664197658-76368 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Some momory will be left in offline state when calling offline_memory_expect_fail() failed. Restore it before exit. Signed-off-by: Zhao Gongyi --- .../memory-hotplug/mem-on-off-test.sh | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh b/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh index 3edda1f13f7b..6173859d3379 100755 --- a/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh +++ b/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh @@ -134,6 +134,16 @@ offline_memory_expect_fail() return 0 } +online_all_offline_memory() +{ + for memory in `hotpluggable_offline_memory`; do + online_memory_expect_success $memory || { + echo "online memory $memory: unexpected fail" + retval=1 + } + done +} + error=-12 priority=0 # Run with default of ratio=2 for Kselftest run @@ -276,12 +286,7 @@ done # Online all hot-pluggable memory # echo 0 > $NOTIFIER_ERR_INJECT_DIR/actions/MEM_GOING_ONLINE/error -for memory in `hotpluggable_offline_memory`; do - online_memory_expect_success $memory || { - echo "online memory $memory: unexpected fail" - retval=1 - } -done +online_all_offline_memory # # Test memory hot-remove error handling (online => offline) @@ -299,4 +304,9 @@ done echo 0 > $NOTIFIER_ERR_INJECT_DIR/actions/MEM_GOING_OFFLINE/error /sbin/modprobe -q -r memory-notifier-error-inject +# +# Restore memory before exit +# +online_all_offline_memory + exit $retval