From mboxrd@z Thu Jan 1 00:00:00 1970 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 F0A38C4332F for ; Tue, 11 Oct 2022 00:03:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229550AbiJKADN (ORCPT ); Mon, 10 Oct 2022 20:03:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229436AbiJKADL (ORCPT ); Mon, 10 Oct 2022 20:03:11 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 298C480504; Mon, 10 Oct 2022 17:03:11 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id h185so4427201pgc.10; Mon, 10 Oct 2022 17:03:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=l+llQOs1rDUP1s79HRj7eRagiprARX+HG1GAmZurmEA=; b=bFHvYCEQLjSfzroDOuLQ9Iu9SAR9bjDwReNKR9N1SoBlWDmZ+SRcBe52uoZWup5vkr mSOWD5Le1Sj0AS20ah3a5X5YUWs0Khm3JrUy/4ElGslNB2ryYstN+Q7hOBW1z0FDOr5x nnPyXM7UqK7Gs+bel7pTZ2GxXMn6BTKiSVBYKsf2GMunWfpQWiT/aaMLCmvGRZciJCUb S+kdQY8YaWhT/c2wMqcE7cscmzsW4pKvYN/uG5qGcHQyySgn4L9CCMVEBjRbLNX7mfZk K6jw2UrKqcezN517aTlL7K7gOdnTIr32jkOK8kSba7wokCrMsycBHLxRKP9hLtpO10U5 Il+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l+llQOs1rDUP1s79HRj7eRagiprARX+HG1GAmZurmEA=; b=7iAKRt3+ayvuOT2Qimdbm6AV9KFab84xyzyK45XsA//aH7oQHDDtTihUm0KH0SGEpK B0tPraQQC8a5uDe/Tp/hiuaRiBPE40RLi0eu3GxG/TrO0lwfdNGJryEieTUeTiWIRKUW seamYAMoHbducEiTxoGqtbv+fdEq+iJzNO+b5g/R4qtn0krG+nOS/Fr5l+x3dpA00AtC G9y4GaumXuYED26ccERnJvHoicyf5JgJTPycYbF4KXweSonCHIFoMwm/mmOzaeE+r41L BTvi9IR4N6U8jotRcYdpgmjTnXPZE/0s77MXK3MvcTlTsEhyRdkXNKAdm9Yuuy12q5UF cJeg== X-Gm-Message-State: ACrzQf10VrvybzYijY3/3wUfEsJK844hzl80OWF50FYOfH0jHAOY/9ZX dquFMN8Ro5qYSvXICJcBAEg= X-Google-Smtp-Source: AMsMyM5NMWylJqWXpz7AzoIykyglnmxpYJOMlu6VMfUrXLfW/UxOxWJGbMhiaqwjgssb9gzOdne/XQ== X-Received: by 2002:a05:6a00:3392:b0:547:f861:1fad with SMTP id cm18-20020a056a00339200b00547f8611fadmr22376236pfb.16.1665446590528; Mon, 10 Oct 2022 17:03:10 -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 l76-20020a633e4f000000b00460a5c6304dsm4183661pga.67.2022.10.10.17.03.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Oct 2022 17:03:10 -0700 (PDT) Sender: Tejun Heo Date: Mon, 10 Oct 2022 14:03:08 -1000 From: Tejun Heo To: Yosry Ahmed Cc: Zefan Li , Johannes Weiner , Yonghong Song , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, "Christian A . Ehrhardt" Subject: Re: [PATCH v1 1/3] Revert "cgroup: enable cgroup_get_from_file() on cgroup1" Message-ID: References: <20221010235845.3379019-1-yosryahmed@google.com> <20221010235845.3379019-2-yosryahmed@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221010235845.3379019-2-yosryahmed@google.com> Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Hello, Already queued the following to cgroup/for-6.1-fixes. Will send it out soon. Thanks. ----- 8< ----- >From 03db7716159477b595e9af01be8003b7e994cc79 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 10 Oct 2022 11:08:17 -1000 Subject: [PATCH] Revert "cgroup: enable cgroup_get_from_file() on cgroup1" This reverts commit f3a2aebdd6fb90e444d595e46de64e822af419da. The commit enabled looking up v1 cgroups via cgroup_get_from_file(). However, there are multiple users, including CLONE_INTO_CGROUP, which have been assuming that it would only look up v2 cgroups. Returning v1 cgroups breaks them. Let's revert the commit and retry later with a separate lookup interface which allows both v1 and v2. Signed-off-by: Tejun Heo Link: http://lkml.kernel.org/r/000000000000385cbf05ea3f1862@google.com Cc: Yosry Ahmed --- kernel/cgroup/cgroup.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index ecf409e3c3a7..6d8a5a40c24d 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -6234,6 +6234,11 @@ static struct cgroup *cgroup_get_from_file(struct file *f) return ERR_CAST(css); cgrp = css->cgroup; + if (!cgroup_on_dfl(cgrp)) { + cgroup_put(cgrp); + return ERR_PTR(-EBADF); + } + return cgrp; } -- 2.37.3