From patchwork Mon Dec 2 20:01:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 1203298 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="YmV4wMb/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47Rbbv1J72z9sNx for ; Tue, 3 Dec 2019 07:01:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728111AbfLBUBq (ORCPT ); Mon, 2 Dec 2019 15:01:46 -0500 Received: from mail-pj1-f74.google.com ([209.85.216.74]:52327 "EHLO mail-pj1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728091AbfLBUBq (ORCPT ); Mon, 2 Dec 2019 15:01:46 -0500 Received: by mail-pj1-f74.google.com with SMTP id z24so536123pjt.19 for ; Mon, 02 Dec 2019 12:01:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=GT/6yNTmwD2DOGMzJN+K06ArW/qq3ZcQJhVAAjmKf88=; b=YmV4wMb/n7Fb319BdP58R2AvCRoVBxqIEdzFmSwkDfZLIpzTQRSv+bV3NFXAYO4KOY gV/+OiYdkz/yH8UqOTOj9Pz7hFuRSnsn2RcfR37M1+4Mybpvila7IpC6tOpYYPTyC5Hg hCMh4dC9NKGeLPviPR8zsUv9QLlQTY9rTWSXzePLiF9h+t+05BSL9YFZET47fIf5h+Ik u8njatgJI0kBWzWmrY3RSu52MIs/EgmM7AzOAuODgz19Y/0JAKs29u+GKdPMywUfx1BT wDrk6IyFxjAgkfAveXPTiqxZ/Ho8PcMObAkSg8tWkBCHu8BmvKmvcqE32jmZDRj6GLwp RnyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=GT/6yNTmwD2DOGMzJN+K06ArW/qq3ZcQJhVAAjmKf88=; b=RC37mnUpiMr7Fs2JEHS4IFAwbIPFTGN5a8Qutzxr7wp3WvCas4ODzWNszanKXxOYH0 8lChToV35PcnQxfkDAqJivZm42Khp1lXpFNl4foyU05FsjUOwCKhepPLVFNELnLU1Fxg ghAXqZ1YuZwWMnk9xpAXVH+6s9KmMd0mnawqJCVmaWX/VQbEokb6N30KV8t3yg9B8Dmz p7q76T91rD8wGfUn1Yir2+R/P4UYTB9gj3KkR8/4B9CM8rgBHSem4gUESNbMmsL5aKg3 X/FKkqIdLN4XZqutOi2xhj0xtefB2GlSN45qmhl57dgQJbpAiCBi3AH7wywwg5UGGIBt bdLA== X-Gm-Message-State: APjAAAX4dV+rnusMxfHlvQDqSMvRioPEWBWUV+E8nezWr4L7LuaNseLR GGjxSvYknLKCIC8fk40QmXpTjNWtB83qBbD6gD68fza7rp20DEt4RsAztZDdnrVmeYeLbqt9wIJ DP+cC4bqFd82jfKKSedReGgflG3AOuwvxzNXnyCEd8wTVcVkWQCsr6w== X-Google-Smtp-Source: APXvYqyfL3WMPuMU62jzHHia9uleekwukeoPmqPsS0qyG/NclIpzWze0qehbhz2/MAkbqSYILQnlVWg= X-Received: by 2002:a65:4242:: with SMTP id d2mr927290pgq.166.1575316905445; Mon, 02 Dec 2019 12:01:45 -0800 (PST) Date: Mon, 2 Dec 2019 12:01:43 -0800 Message-Id: <20191202200143.250793-1-sdf@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.24.0.393.g34dc348eaf-goog Subject: [PATCH bpf] selftests/bpf: don't hard-code root cgroup id From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 40430452fd5d ("kernfs: use 64bit inos if ino_t is 64bit") changed the way cgroup ids are exposed to the userspace. Instead of assuming fixed root id, let's query it. Fixes: 40430452fd5d ("kernfs: use 64bit inos if ino_t is 64bit") Signed-off-by: Stanislav Fomichev --- tools/testing/selftests/bpf/test_skb_cgroup_id_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/test_skb_cgroup_id_user.c b/tools/testing/selftests/bpf/test_skb_cgroup_id_user.c index 9220747c069d..356351c0ac28 100644 --- a/tools/testing/selftests/bpf/test_skb_cgroup_id_user.c +++ b/tools/testing/selftests/bpf/test_skb_cgroup_id_user.c @@ -120,7 +120,7 @@ int check_ancestor_cgroup_ids(int prog_id) int err = 0; int map_fd; - expected_ids[0] = 0x100000001; /* root cgroup */ + expected_ids[0] = get_cgroup_id("/.."); /* root cgroup */ expected_ids[1] = get_cgroup_id(""); expected_ids[2] = get_cgroup_id(CGROUP_PATH); expected_ids[3] = 0; /* non-existent cgroup */