From patchwork Tue Sep 27 03:28:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Gongyi X-Patchwork-Id: 12989835 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 64EC4C6FA93 for ; Tue, 27 Sep 2022 03:32:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2F9CF8E00A7; Mon, 26 Sep 2022 23:32:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2A8E48E0090; Mon, 26 Sep 2022 23:32:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0FBB38E00A8; Mon, 26 Sep 2022 23:32:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 0057A8E00A7 for ; Mon, 26 Sep 2022 23:32:51 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id BDB4DC0710 for ; Tue, 27 Sep 2022 03:32:51 +0000 (UTC) X-FDA: 79956443742.18.3CF82F0 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf01.hostedemail.com (Postfix) with ESMTP id 36C5940008 for ; Tue, 27 Sep 2022 03:32:50 +0000 (UTC) Received: from canpemm500005.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Mc4pS1L6ZzlXMF; Tue, 27 Sep 2022 11:28:32 +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; Tue, 27 Sep 2022 11:32:46 +0800 From: Zhao Gongyi To: , , , CC: , , , , , Subject: [PATCH -next v4 2/3] selftests/memory-hotplug: Restore memory before exit Date: Tue, 27 Sep 2022 11:28:50 +0800 Message-ID: <20220927032851.128174-3-zhaogongyi@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220927032851.128174-1-zhaogongyi@huawei.com> References: <20220927032851.128174-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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664249571; a=rsa-sha256; cv=none; b=k+Q7wMzCZIAI+Qucnk/YOvRJLzNhBkreQ08rlF4yxTN3GyQt/c2TMTaenv6WYZiOtNVp+8 YGxQh36CjN+rsKWAk0mMmCyIxBZW5i+GbJBfRU97xcgwMbyDpZLztRRHQlv6vlaVk5yin8 cVvdsrDdEOyT+9AjKao6ggR/H4lvwwc= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; spf=pass (imf01.hostedemail.com: domain of zhaogongyi@huawei.com designates 45.249.212.187 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=1664249571; 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=htl+oJWzdSJ1hhqpuExis768+kQwTRjiy56YAr8ul5NNgI+sPjG8Dtx6PDEMigy3xTAv9n 8c3Z0UJOKmAcGAFHEudEtpx0ZSUOOFRPW7bSbtm6A7oNgiC6Vm4dAUKnixrANm+jfC6qBE 9KDK9QaJRWBG2m9r1a/ZxAU98tN3XOk= Authentication-Results: imf01.hostedemail.com; dkim=none; spf=pass (imf01.hostedemail.com: domain of zhaogongyi@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=zhaogongyi@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com X-Stat-Signature: iau4qnzch9p97p5qedthjetuepdkytaj X-Rspamd-Queue-Id: 36C5940008 X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1664249570-493767 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 Reviewed-by: David Hildenbrand --- .../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