Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp1081362rwe; Thu, 25 Aug 2022 15:13:30 -0700 (PDT) X-Google-Smtp-Source: AA6agR7QYpDtMyycSjOg+faEEhNGSp6ObvOCbPerPLaj/Bu1sBc4YqL8MiuLbUf5+IPBLJ5wTOlk X-Received: by 2002:a17:902:a70f:b0:170:8d38:c57e with SMTP id w15-20020a170902a70f00b001708d38c57emr1119390plq.8.1661465610063; Thu, 25 Aug 2022 15:13:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661465610; cv=none; d=google.com; s=arc-20160816; b=iq5WewqFGXuAknNrvuTi7KsXJMzOqlnnF2ZiTUVzwwK39+tYo5SZCTH33zm+2vZ9iv XSq6Cx9y7rgINPI17d8HgOmeHqKDFRj3wjNWJ+IKJ2jlqGozSN6cd6hIDzbOcw8EG7Ty DcnRSYKNa+h9r1v+tI48ROXquAfekXwWj9MCnpIGGulU+7/lciIgtf7w6fMpqIRa7Jp3 8sEudIsAD4UX+PaJchbkUpzmfFQkUL6O0HICzdNtHRE5G660tpnVIt5Qq2ZKI1fEDgCS 50U4A7jCljsW0HNWU43I9Dhgy187/dxvwjXljcCUQZSTnpDH25WCNuHhg3S+mDFjpG6R zFpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=lM7WG9YzqdGMor8dcuiLn6myEZpNs7q19yn84bxvLf0=; b=FfiiThOcN6HU4BsRJc8MOdJC50N1csquZuIeFD12TCtkJpnhHiv268Vz/2KU12zSMe /YgLoWCuihhIYZiF9zh8v/7UK98gOqs7EMqryTxkZk9GQ9l9sTQgrFDUKWamf0N8h3yB iGoUqrbddWydSu0lyYSFnRFll+lgPlBfGNNUzQf4rv+bUJ2BRkaR+bTF6ZGI+3mvKxjO KkBnoaJX3ljtMcHl8sFVGfQqLh7Bat8UBqX2LYvEQbnWuEuWOr80TJsWOUZ1DVlOsBvA 4k5BZfb/85zyDUTNWlFnztJ4UR6c6sIgqNn+B/Y0utWC0ibgpVwq4+IAL90if+OYoGik Y7lA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="JX+2d/oV"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a2-20020a170902ecc200b0016d0d114d30si145380plh.360.2022.08.25.15.13.19; Thu, 25 Aug 2022 15:13:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="JX+2d/oV"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243936AbiHYVjT (ORCPT + 99 others); Thu, 25 Aug 2022 17:39:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243895AbiHYVjM (ORCPT ); Thu, 25 Aug 2022 17:39:12 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 432E0C2296 for ; Thu, 25 Aug 2022 14:39:11 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-3363b1dffa0so364441127b3.23 for ; Thu, 25 Aug 2022 14:39:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc; bh=lM7WG9YzqdGMor8dcuiLn6myEZpNs7q19yn84bxvLf0=; b=JX+2d/oVQ5mPFVnP0apDqLoeBdHr99X3oV7Oma7L9JPklapt4ivvxn2Gr/DER4dh3e Hoh3zdjQ/XFMOIPuNcla974UM/dYGFbbtJMvpEn6qA7n/uiRjub4L38C5+YPTsvYhm2K Bs95hhPHzn1IdacEVFCEQ2ubIQ+h6lhLRTVca9JG3rBhxsPGw1S6W5te/rizJEuuoGuU eRBdSH9Gi9oS8DgrS+rIaIpih5Qzy0ZvnVgg2ORSZFjjUmivX8EyNg+0rCzt2RIX49rF NoE0Gpcrhdem75wKsWo7VzG6bbjTtknQ+v8i08Ku8d6O5y/LUg/W6j3QG0EUgkWGZhWN e37w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc; bh=lM7WG9YzqdGMor8dcuiLn6myEZpNs7q19yn84bxvLf0=; b=rjaMt0wnCpByaOfK3MzNJ/bKHeFzrdWxJRKfjttw4mtKQ1ijYEAhR5d1VANzSTOf8B zeRD0KsxnJUT+P53A7HZnsW6qqIwfBDcFgNHo2NpuKFkoFwjzwvwzEB+MtvrXQzkuUiw dJfPAnNEAOkq/RsfxQPJBQYCQ0QkxwGGfIOmqis/zwN73ouwxELlheEe021mtj4Z6I83 beZNgAOmlJa5xyW38CanWVDObAAjDfNM2CjVzP/DM91gzgY4dnMSd3nWH/u4eILkrXrC dRz/M8CW0LplvMRS11zJqErm/bN8oqDnmynYPRa0J2yl4H6lH9BnkkJuFzEf4nRgHLz1 iNvg== X-Gm-Message-State: ACgBeo2MtvIzUK4yC3r4FEeyE5W4b4QXCrV3tGJkYVEchEsyHurjlc4D YRod6CnxPHyv5cuysWFhvf9/xCyfqhRnYVi7vn8xtEVM9+IhylfFlqfjbnFFcx7Bqgo5EjlO22u G8IP8kXT5v/KvHcORGTUD4X6XvgQDevYkjlrkRXh1a3vnz/id/ucSRGBRnw8BDIfHjdgLAg== X-Received: from haoluo.svl.corp.google.com ([2620:15c:2d4:203:2c4f:653f:78b3:2b5b]) (user=haoluo job=sendgmr) by 2002:a0d:e6cc:0:b0:338:c82b:9520 with SMTP id p195-20020a0de6cc000000b00338c82b9520mr6044145ywe.66.1661463549945; Thu, 25 Aug 2022 14:39:09 -0700 (PDT) Date: Thu, 25 Aug 2022 14:39:03 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog Message-ID: <20220825213905.1817722-1-haoluo@google.com> Subject: [PATCH bpf-next 0/2] Add CGROUP prefix to cgroup_iter_order From: Hao Luo To: linux-kernel@vger.kernel.org, bpf@vger.kernel.org, netdev@vger.kernel.org Cc: Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , KP Singh , John Fastabend , Jiri Olsa , Stanislav Fomichev , Yosry Ahmed , Hao Luo Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As suggested by Andrii, add 'CGROUP' to cgroup_iter_order. This fix is divided into two patches. Patch 1/2 fixes the commit that introduced cgroup_iter. Patch 2/2 fixes the selftest that uses the cgroup_iter_order. This is because the selftest was introduced in a different commit. I tested this patchset via the following command: test_progs -t cgroup,iter,btf_dump Hao Luo (2): bpf: Add CGROUP to cgroup_iter order selftests/bpf: Fix test that uses cgroup_iter order include/uapi/linux/bpf.h | 10 +++--- kernel/bpf/cgroup_iter.c | 32 +++++++++---------- tools/include/uapi/linux/bpf.h | 10 +++--- .../selftests/bpf/prog_tests/btf_dump.c | 2 +- .../prog_tests/cgroup_hierarchical_stats.c | 2 +- .../selftests/bpf/prog_tests/cgroup_iter.c | 10 +++--- 6 files changed, 33 insertions(+), 33 deletions(-) -- 2.37.2.672.g94769d06f0-goog