From patchwork Thu Aug 25 21:39:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hao Luo X-Patchwork-Id: 12955237 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F1A6ECAAA3 for ; Thu, 25 Aug 2022 21:39:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243897AbiHYVjP (ORCPT ); Thu, 25 Aug 2022 17:39:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243894AbiHYVjM (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 D73A0C2295 for ; Thu, 25 Aug 2022 14:39:10 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-3345ad926f2so363380167b3.12 for ; Thu, 25 Aug 2022 14:39:10 -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=MqSh/rPLKXAjg8PCjN/zcl1Ite0ElFyfPCyE6ccBIYkFRWbawb10ZpsrP8MuIi3Pqr XAekxU76svFtlBR39FmHyT9cO54oQGNiz3pJ1aNhjIejL9EWYd8AlkTUnYwhz0EIQaAJ QBF6V3uZUkXfV3BX40BFLdodAOUIqlWqVPmb/ZzqrObmA3xDSU3r0uVB7m3sztkqraOh Ik5KzmyoqxJv+LX5fTxRidW78KdQOohQnOrDWJiTqzy/Tsk47hPadBVHRipduIDySDV3 rnb4Gx3uRMLoziLAcph5rbgrxCVmQaVI+thSC8x+ySS4c/Q1u9FVsXHLc8KygRsNQxIt Ij+A== X-Gm-Message-State: ACgBeo2BisfkrXVbVGB2Jr634sYoz/Jfs55Y51aN2YW5VmutMP1QMEO4 VawGBcT78ryXi3Q9uQMQo2Oik3XpAZU= X-Google-Smtp-Source: AA6agR7x138fgpCkoVUmt6DrNUUVI2tvfykUhrAY9z9BQ+qRShblMVzFS3t2I0dDI9TMZhhjaQ/aGWu5cIA= 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 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net 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(-) Acked-by: Andrii Nakryiko