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=-3.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 845DCC433FF for ; Sat, 3 Aug 2019 04:49:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E8BC2173E for ; Sat, 3 Aug 2019 04:49:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564807758; bh=lzhv0V6MKtfzAcmE7gDLDOzn/9iX/pY/3fBfTr7jeGs=; h=Date:From:To:Subject:List-ID:From; b=Fr2HgjFMs6yx/nVmXNhjM1VAV+/IvIds7JRZ8YCB17gf9nURv+CK7b+z+qcdy6wzY TrUX5+jrv/gv76dbxK+jIxO/PIAjjUMnQ3vvuvTo90ZJ+58YUsHdTgWZPOaoCUA/K4 OGiIGdrff8D1tFbdhOJpXQeboUtYtLKXZK9Aa0ZU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726251AbfHCEtR (ORCPT ); Sat, 3 Aug 2019 00:49:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:35942 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725283AbfHCEtR (ORCPT ); Sat, 3 Aug 2019 00:49:17 -0400 Received: from X1 (unknown [76.191.170.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5877F2166E; Sat, 3 Aug 2019 04:49:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564807756; bh=lzhv0V6MKtfzAcmE7gDLDOzn/9iX/pY/3fBfTr7jeGs=; h=Date:From:To:Subject:From; b=q6fwvJii31Pyw3bi3HTuHKck9zpaKf2FTe3OlxDr2h+7ad8Yn/7h2odyPbFbLzDSp qvYYwgaqhm/x8OYi320vDJD93noYhmAnxLiBaMl3GvA52DGtHdu+WIpPmNQLVaogUT jiFt/euEIR5pgiOTyr/lCtrG1FNR/PSQk91hT718= Date: Fri, 02 Aug 2019 21:49:15 -0700 From: akpm@linux-foundation.org To: tj@kernel.org, stable@vger.kernel.org, hannes@cmpxchg.org, guro@fb.com, chris@chrisdown.name, akpm@linux-foundation.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 13/17] cgroup: kselftest: relax fs_spec checks Message-ID: <20190803044915.FHYla%akpm@linux-foundation.org> User-Agent: s-nail v14.9.10 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chris Down Subject: cgroup: kselftest: relax fs_spec checks On my laptop most memcg kselftests were being skipped because it claimed cgroup v2 hierarchy wasn't mounted, but this isn't correct. Instead, it seems current systemd HEAD mounts it with the name "cgroup2" instead of "cgroup": % grep cgroup /proc/mounts cgroup2 /sys/fs/cgroup cgroup2 rw,nosuid,nodev,noexec,relatime,nsdelegate 0 0 I can't think of a reason to need to check fs_spec explicitly since it's arbitrary, so we can just rely on fs_vfstype. After these changes, `make TARGETS=cgroup kselftest` actually runs the cgroup v2 tests in more cases. Link: http://lkml.kernel.org/r/20190723210737.GA487@chrisdown.name Signed-off-by: Chris Down Cc: Johannes Weiner Cc: Tejun Heo Cc: Roman Gushchin Cc: Signed-off-by: Andrew Morton --- tools/testing/selftests/cgroup/cgroup_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/tools/testing/selftests/cgroup/cgroup_util.c~cgroup-kselftest-relax-fs_spec-checks +++ a/tools/testing/selftests/cgroup/cgroup_util.c @@ -191,8 +191,7 @@ int cg_find_unified_root(char *root, siz strtok(NULL, delim); strtok(NULL, delim); - if (strcmp(fs, "cgroup") == 0 && - strcmp(type, "cgroup2") == 0) { + if (strcmp(type, "cgroup2") == 0) { strncpy(root, mount, len); return 0; } _