From patchwork Mon Oct 17 21:45:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 3753 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1655903wrs; Mon, 17 Oct 2022 14:49:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4WfkwfRwlw/JCUS9Y7CGIcOA/C/dlflEr8pnjxa5S/LHeFjhrdjoAf4U6clW6PbmCb9Dac X-Received: by 2002:aa7:dd57:0:b0:453:2d35:70bb with SMTP id o23-20020aa7dd57000000b004532d3570bbmr12201486edw.26.1666043364573; Mon, 17 Oct 2022 14:49:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666043364; cv=none; d=google.com; s=arc-20160816; b=JEU1NzTnCq+TPqVi54K5ID+5i3XWlO2TuCV2qSCVF3bMMyc+ulWas02JIfqwvcAP86 5dm+96kskklKjwctVNzOyKOJh2J5G76oZtgJ+0NF996lN098xeANVjPtpCc+We7g1ec/ Ctytn8lXVumP91pxUUoRdllvdYlUeSgYtN7OTv0jbCFMYhy6n9Qn74qSc2xuT5mTnN3S m8few0F4rGkcNL/1q9S64RZRF8EFShe3TBTE2a1NPJb5TnIHG7/YqoUQ17gV0zreC8Ak ISrVMdZlsjJ4BwxUHp8NWIFfoMYfoJV/GEVzbstfZ5x3w++pkUuDzDaGx7QMsQKzWiGn VkYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-disposition :mime-version:message-id:subject:cc:to:from:date:sender :dkim-signature; bh=FpjDhdEYCevjuzshNCxGyveRGg8J9v5lzGJkYpIm3yo=; b=c2SaZ1GUbPkEpYH7HP8tNPf9d44FLXQtXGdyeKRh7cs6IWSF4eS8/NDZON9zh4QgsG tZx14cvieG47vpmw1YgMVDrvLxsT/UnAcBJTlEzIPS0R37nZq/pGGj3Hj+uUKVoKvpjm uI5HAsaEchu6IZGK1ZpfP/N5sSfM7xBUxeNq+yOFMjSnTfSs31SvLqkmCUd0+tq71uA2 gjRM3n74L6BlgZPcjndoSM+Z1hfL8vAcasXAd25cp+Q7cZ11K6KixF3xi15AGV5wx44R D2Tqn9QIO6DWpXm+ZNgJViHb6hxh5lCMzpvp+tydsgoanh5Ek8lxVpCenuWGulnxaPNQ gx+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=PwfF1qfG; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i21-20020a170906a29500b0077bd009107dsi8206965ejz.714.2022.10.17.14.48.59; Mon, 17 Oct 2022 14:49:24 -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=@gmail.com header.s=20210112 header.b=PwfF1qfG; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229955AbiJQVqf (ORCPT + 99 others); Mon, 17 Oct 2022 17:46:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230161AbiJQVqR (ORCPT ); Mon, 17 Oct 2022 17:46:17 -0400 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4983E2CC8A; Mon, 17 Oct 2022 14:45:49 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id b2so11995173plc.7; Mon, 17 Oct 2022 14:45:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:content-disposition:mime-version :message-id:subject:cc:to:from:date:sender:from:to:cc:subject:date :message-id:reply-to; bh=FpjDhdEYCevjuzshNCxGyveRGg8J9v5lzGJkYpIm3yo=; b=PwfF1qfG7/L22xs/9xUr1w4RjP34Qo/Gja2efbLUE1Vep091V/fXEDwe6ctvoMbo8c g3e7Rnysdbf8WgQ8hC86n1iUDvtyKudrI/nvAYZlxINPRhc1gO22EMnvO51aLs+Jvb9i x7EzQ1XmFrnH9Zdq/M1Lr4TL3l7mkCOYhioxmL/0d6THKgaJycgj9WpXYzczrKFolWC2 kb9ew/OwaTvpH/cNwEq6v8mVTupS7OwfX4aEg1YXZcWkkRWytVTgxX+h2e9GiDvQ5qKW sm20bt3QYdqPnGAtxVOqIO1Wbp4qI8cQ5yVqqi2VC81MJgj81FhX+ZPbttw/buRsMw4K 7vRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:content-disposition:mime-version :message-id:subject:cc:to:from:date:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FpjDhdEYCevjuzshNCxGyveRGg8J9v5lzGJkYpIm3yo=; b=dyf9ruhnhhHwJvr7IJzDXU84jKXMqahGZ3lIZBCn3p7BzIDtqXs3K74P8r/3gbx6Cc hOM9h0Kh/jSvrY8KFRf1CRMFWzeFrcEUn4Uk5u3SabVHqcmg8TsvaPPesihRJ+wLZH0+ ehGWHABWKKb7vdd4+wEBBG5xgH/MGNSppeX9H0+HDWDlEWNXJ3+a3o77cHpPgk6HZI2H /EJYioTcZX4VGFk5OYX4uJMjLipmILYZk5kVt/Vt32Ghq0FxOh6Pi1CMZfj0SpxuZIVs I+1ee6FKr/oMYwCufJwOeDtBGbZHTvKfTSa0SpPxA189bYUbNivU/zHf62Yb/gVu0INw 4WWw== X-Gm-Message-State: ACrzQf1Se1b/3BbO9cerpQkbFYqNnYA8pfXNVglUmyNMqdM8bxelnLk6 /EC6cSwBPizJ0ms9ozymidVkW0opYlye5Q== X-Received: by 2002:a17:90a:c984:b0:20a:ac88:d39d with SMTP id w4-20020a17090ac98400b0020aac88d39dmr34918720pjt.13.1666043149141; Mon, 17 Oct 2022 14:45:49 -0700 (PDT) Received: from localhost (2603-800c-1a02-1bae-a7fa-157f-969a-4cde.res6.spectrum.com. [2603:800c:1a02:1bae:a7fa:157f:969a:4cde]) by smtp.gmail.com with ESMTPSA id k24-20020a170902761800b001782aab6318sm7077181pll.68.2022.10.17.14.45.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Oct 2022 14:45:48 -0700 (PDT) Sender: Tejun Heo Date: Mon, 17 Oct 2022 11:45:47 -1000 From: Tejun Heo To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Subject: [GIT PULL] cgroup fixes for v6.1-rc1 Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE, SPF_PASS autolearn=no 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746973087046227228?= X-GMAIL-MSGID: =?utf-8?q?1746973087046227228?= The following changes since commit 4de65c5830233e7a4adf2e679510089ec4e210c7: Merge tag 'livepatching-for-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching (2022-10-10 11:36:19 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/ tags/cgroup-for-6.1-rc1-fixes for you to fetch changes up to 79a818b5087393d5a4cb356d4545d02f55bf1a2f: blkcg: Update MAINTAINERS entry (2022-10-17 09:27:18 -1000) ---------------------------------------------------------------- cgroup fixes for v6.1-rc1 * Fix a recent regression where a sleeping kernfs function is called with css_set_lock (spinlock) held. * Revert the commit to enable cgroup1 support for cgroup_get_from_fd/file(). Multiple users assume that the lookup only works for cgroup2 and breaks when fed a cgroup1 file. Instead, introduce a separate set of functions to lookup both v1 and v2 and use them where the user explicitly wants to support both versions. * Compat update for tools/perf/util/bpf_skel/bperf_cgroup.bpf.c. * Add Josef Bacik as a blkcg maintainer. ---------------------------------------------------------------- Michal Koutný (1): cgroup: Reorganize css_set_lock and kernfs path processing Namhyung Kim (1): perf stat: Support old kernels for bperf cgroup counting Tejun Heo (2): Revert "cgroup: enable cgroup_get_from_file() on cgroup1" blkcg: Update MAINTAINERS entry Yosry Ahmed (3): cgroup: add cgroup_v1v2_get_from_[fd/file]() bpf: cgroup_iter: support cgroup1 using cgroup fd mm: cgroup: fix comments for get from fd/file helpers MAINTAINERS | 2 + include/linux/cgroup.h | 1 + kernel/bpf/cgroup_iter.c | 2 +- kernel/cgroup/cgroup.c | 99 +++++++++++++++++++++++------ tools/perf/util/bpf_skel/bperf_cgroup.bpf.c | 29 ++++++++- 5 files changed, 111 insertions(+), 22 deletions(-)