From patchwork Fri Sep 30 06:35:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Gongyi X-Patchwork-Id: 12994955 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 E4301C43219 for ; Fri, 30 Sep 2022 06:39:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D63C38D0003; Fri, 30 Sep 2022 02:39:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D149C6B0074; Fri, 30 Sep 2022 02:39:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BDB688D0003; Fri, 30 Sep 2022 02:39:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id AE4C16B0073 for ; Fri, 30 Sep 2022 02:39:46 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 62F8DC0209 for ; Fri, 30 Sep 2022 06:39:46 +0000 (UTC) X-FDA: 79967801172.16.A646DC8 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf25.hostedemail.com (Postfix) with ESMTP id 1AFC8A0009 for ; Fri, 30 Sep 2022 06:39:43 +0000 (UTC) Received: from canpemm500005.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Mf0rw5VVvzHqMN; Fri, 30 Sep 2022 14:37:20 +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; Fri, 30 Sep 2022 14:39:39 +0800 From: Zhao Gongyi To: , , , CC: , , , , , Subject: [PATCH -next v5 2/4] selftests/memory-hotplug: Restore memory before exit Date: Fri, 30 Sep 2022 14:35:25 +0800 Message-ID: <20220930063527.108389-3-zhaogongyi@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220930063527.108389-1-zhaogongyi@huawei.com> References: <20220930063527.108389-1-zhaogongyi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.63] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To canpemm500005.china.huawei.com (7.192.104.229) X-CFilter-Loop: Reflected ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664519985; a=rsa-sha256; cv=none; b=Ghg7y4yfxE4eT9t0gC25CPDVX1tYOJMTYHnC7ygPfQ4oMUpc4LIzZK2O+96oZ77uEoDNXF wtg9s79206Oe+6Jn7gHfDyn81opXZ81XO/N3syr/N4BC36P9KBKGYGxXu2M4Bpb6SWQ5H4 jmznURXmEHO5PZrXmq87UwVal+U8l+g= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=none; spf=pass (imf25.hostedemail.com: domain of zhaogongyi@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=zhaogongyi@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664519985; 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=+DfEmh0PutoNkD56lBwHXsWUSeC0EnJJkVTdXFcnoic=; b=e5rinPkRiYZt5eMt8DYWZMpgPBM2a5DIZ5nCjq8u+BPBju+SaW8orMPcxAqq9QqadMTUFX s2sbQrQefsDG09BRCuBswvlf7H/gV8Ju7uWsZYWGLN/C7JU4lNCL25AKwS2y5DtGLKm1ZF SXe5u0AVFFsz+Ho+2ZmQZCzL5WCs9vY= X-Stat-Signature: 1uubsc6bqndrx5k5ojp97bmwk5w8jmwh X-Rspamd-Queue-Id: 1AFC8A0009 Authentication-Results: imf25.hostedemail.com; dkim=none; spf=pass (imf25.hostedemail.com: domain of zhaogongyi@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=zhaogongyi@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1664519983-876434 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 | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 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 1d87611a7d52..91a7457616bb 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 + if ! online_memory_expect_success $memory; then + echo "$FUNCNAME $memory: unexpected fail" >&2 + retval=1 + fi + done +} + error=-12 priority=0 # Run with default of ratio=2 for Kselftest run @@ -275,11 +285,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 - if ! online_memory_expect_success $memory; then - retval=1 - fi -done +online_all_offline_memory # # Test memory hot-remove error handling (online => offline) @@ -296,4 +302,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