From patchwork Fri Sep 30 06:35:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Gongyi X-Patchwork-Id: 12994954 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 92599C433F5 for ; Fri, 30 Sep 2022 06:39:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1FE688D0002; Fri, 30 Sep 2022 02:39:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 19EA36B0074; 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 DFED08D0002; Fri, 30 Sep 2022 02:39:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id CEAD06B0073 for ; Fri, 30 Sep 2022 02:39:45 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A0768A14B1 for ; Fri, 30 Sep 2022 06:39:45 +0000 (UTC) X-FDA: 79967801130.18.D80D659 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf14.hostedemail.com (Postfix) with ESMTP id 194BF100004 for ; Fri, 30 Sep 2022 06:39:42 +0000 (UTC) Received: from canpemm500005.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Mf0pc0ZFGzlVkt; Fri, 30 Sep 2022 14:35: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:38 +0800 From: Zhao Gongyi To: , , , CC: , , , , , Subject: [PATCH -next v5 1/4] selftests/memory-hotplug: Add checking after online or offline Date: Fri, 30 Sep 2022 14:35:24 +0800 Message-ID: <20220930063527.108389-2-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-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of zhaogongyi@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=zhaogongyi@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664519984; a=rsa-sha256; cv=none; b=jSg+MCNmObtyS7E9DvPykWNWcxElTJUI7+M4cpeTrS3uW7ur6mZUowFn1QE7ZSD24Ix7Mj Dc2D2gnwa6Yj5g4Y3neHJYDKtkfNdPhyonxSwKWV2hz3Y04FiFB7CPZgvWwIYUIe5rALgM 9CPKDytXxcBmnlkvlh4261eLzSn3oS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664519984; 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=H7fmGVVf9PPyDgmxWNL6RDAaY4UU8mP6bxHJ+Y31tuo=; b=G7O7wMtHzAfg7ZgtqsXuvZOpU7wLi/2j4hbdmUatlVqtkYuhaaz9SDsFFxG79VPJV/YMW2 LjU/DUvaRAgXdEhHCBmm8WNpDEoOIKHPgnCKK/hKCN93qQEx7KbqwpN3Gp8y/eSFhA+MeX QGl/t/mteVadjPuMRuCMUpZcYOUgvNg= X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 194BF100004 X-Rspam-User: Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of zhaogongyi@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=zhaogongyi@huawei.com X-Stat-Signature: ykn6wocex5sqkh49iukhah7suufcoo4f X-HE-Tag: 1664519982-185713 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: Add checking for online_memory_expect_success()/ offline_memory_expect_success()/offline_memory_expect_fail(), or the test would exit 0 although the functions return 1. Signed-off-by: Zhao Gongyi Reviewed-by: David Hildenbrand --- .../selftests/memory-hotplug/mem-on-off-test.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 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 46a97f318f58..1d87611a7d52 100755 --- a/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh +++ b/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh @@ -266,7 +266,9 @@ done # echo $error > $NOTIFIER_ERR_INJECT_DIR/actions/MEM_GOING_ONLINE/error for memory in `hotpluggable_offline_memory`; do - online_memory_expect_fail $memory + if ! online_memory_expect_fail $memory; then + retval=1 + fi done # @@ -274,7 +276,9 @@ done # echo 0 > $NOTIFIER_ERR_INJECT_DIR/actions/MEM_GOING_ONLINE/error for memory in `hotpluggable_offline_memory`; do - online_memory_expect_success $memory + if ! online_memory_expect_success $memory; then + retval=1 + fi done # @@ -283,7 +287,9 @@ done echo $error > $NOTIFIER_ERR_INJECT_DIR/actions/MEM_GOING_OFFLINE/error for memory in `hotpluggable_online_memory`; do if [ $((RANDOM % 100)) -lt $ratio ]; then - offline_memory_expect_fail $memory + if ! offline_memory_expect_fail $memory; then + retval=1 + fi fi done