From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E4FEC31E4B for ; Fri, 14 Jun 2019 20:29:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 71E46217F9 for ; Fri, 14 Jun 2019 20:29:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544173; bh=71CBmJBELF6Up+VwLkK6W7S5mNrL7k+xdUVn+a4juUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sSkF4WDHKNAvkgO/t/OTYUNIAbpkFMDAcGm6Tc6xqgnK7d4OOil9+l9yeA0OCUsAA JnRKIAyyCrcaGAhAdVABlKZp5vjTvxnoqLY+thBeVuiLVFpVpIFcgPsIQMaHGg4DtH 5RqLWO9DqdqodwHrHcW/DVcCrY808PBIKILY0kUw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726841AbfFNU3N (ORCPT ); Fri, 14 Jun 2019 16:29:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:51132 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726835AbfFNU3M (ORCPT ); Fri, 14 Jun 2019 16:29:12 -0400 Received: from sasha-vm.mshome.net (unknown [131.107.159.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0A30B217F9; Fri, 14 Jun 2019 20:29:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544152; bh=71CBmJBELF6Up+VwLkK6W7S5mNrL7k+xdUVn+a4juUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DKeBk4IXTZlZ+wV1vog894twnyM99b7wLRYojkYhRr62xoPUBYCCbRtdzIgiuzeVT AW6K5mnT8a3w0ILJzmeSNROpwsegP9tlEm2SwZsJwuYIza/Hz6+732qK1jzpRGLNJ5 H6pST7oCyHKHv6a+2Cf3C71qojFR5wnde2Pn0ptw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Shi , Shuah Khan , Tejun Heo , Roman Gushchin , Claudio Zumbo , Claudio , linux-kselftest@vger.kernel.org, Shuah Khan , Sasha Levin Subject: [PATCH AUTOSEL 5.1 29/59] kselftest/cgroup: fix unexpected testing failure on test_core Date: Fri, 14 Jun 2019 16:28:13 -0400 Message-Id: <20190614202843.26941-29-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190614202843.26941-1-sashal@kernel.org> References: <20190614202843.26941-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alex Shi [ Upstream commit 00e38a5d753d7788852f81703db804a60a84c26e ] The cgroup testing relys on the root cgroup's subtree_control setting, If the 'memory' controller isn't set, some test cases will be failed as following: $sudo ./test_core not ok 1 test_cgcore_internal_process_constraint ok 2 test_cgcore_top_down_constraint_enable not ok 3 test_cgcore_top_down_constraint_disable ... To correct this unexpected failure, this patch write the 'memory' to subtree_control of root to get a right result. Signed-off-by: Alex Shi Cc: Shuah Khan Cc: Tejun Heo Cc: Roman Gushchin Cc: Claudio Zumbo Cc: Claudio Cc: linux-kselftest@vger.kernel.org Cc: linux-kernel@vger.kernel.org Reviewed-by: Roman Gushchin Acked-by: Tejun Heo Signed-off-by: Shuah Khan Signed-off-by: Sasha Levin --- tools/testing/selftests/cgroup/test_core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/testing/selftests/cgroup/test_core.c b/tools/testing/selftests/cgroup/test_core.c index be59f9c34ea2..d78f1c5366d3 100644 --- a/tools/testing/selftests/cgroup/test_core.c +++ b/tools/testing/selftests/cgroup/test_core.c @@ -376,6 +376,11 @@ int main(int argc, char *argv[]) if (cg_find_unified_root(root, sizeof(root))) ksft_exit_skip("cgroup v2 isn't mounted\n"); + + if (cg_read_strstr(root, "cgroup.subtree_control", "memory")) + if (cg_write(root, "cgroup.subtree_control", "+memory")) + ksft_exit_skip("Failed to set memory controller\n"); + for (i = 0; i < ARRAY_SIZE(tests); i++) { switch (tests[i].fn(root)) { case KSFT_PASS: -- 2.20.1