From patchwork Thu May 25 18:01:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Morse X-Patchwork-Id: 99153 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp557955vqr; Thu, 25 May 2023 11:05:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ74h1TAtayML1ysVq356kLZWJe6+Bpzrn5GPUSmq66b/Khq4VRY83UyWeBbgboZdeCd5xeS X-Received: by 2002:a17:903:283:b0:1b0:a3f:2713 with SMTP id j3-20020a170903028300b001b00a3f2713mr182136plr.36.1685037902110; Thu, 25 May 2023 11:05:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685037902; cv=none; d=google.com; s=arc-20160816; b=Ni1K6tXmCXL0CpyzH8CaVx9WP9qpej4cDdvydLlSOGlQLdKcP/72OPtfPFqmAivtG0 lrKImzJ2Jr7238aT4L7JyZnFH2L/G2l83FCOWptjTweDPPsSjaNEqV9VitnyIov48pzg aiqgA1VifU8KmFSQsM4vsWmsgZ2Up6ata9a0T9Dxuuh/8ODM0Tn+YQIU5ztTrPYBuCbF Ed6sqKeXqz+a1RYzlbzisLRegtAY76gDvCdbNBsd8UKSlgZILyi73HZTbXYBWTbCBWUT ugGpo2eVMnadHPCjwaro10d43b9//xHNnUtEKfgYGAMhIgo81gTsub7Cz9GhPtpoAQPN SbeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ribcpH5uFIRF41uDbRgATLPEhTdSrkNUNlpDUBqkH4U=; b=XsrHEJ9l2zy3XLqz+JU821hPxYL0MyZ7U2gld0X1wVCCZgnaYldYk/F8L3WvK9sJpi KQjhNkSHBHPo+097E/gqtybJnyXwOpohqkDiugH2pfCmbvm4YEnI+gJX7zfv4/Na23uE +4IiMb4KvTEeg0NblXBZY26N76cjvu84pfXuaGxzTXFCWEpiOuYVxMp02uovCY3GsZsh qZE7Qn9qtvjMGfX3AUHS3LTj2uke3yredwv0WYujrcrHL+TtxaHIHlSiU0lh4HQ23j9D jEqhjfBb0DSQLZpA3Lh7qk43Xo8oI/E8O0JFG8dj57zY9M1pq9jBXY/koH4TwCWVT5iP BTpQ== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 12-20020a170902c14c00b001a8173f468fsi1898626plj.314.2023.05.25.11.04.46; Thu, 25 May 2023 11:05:02 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240853AbjEYSCw (ORCPT + 99 others); Thu, 25 May 2023 14:02:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240581AbjEYSCo (ORCPT ); Thu, 25 May 2023 14:02:44 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id BDDA3E6 for ; Thu, 25 May 2023 11:02:38 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9325C1650; Thu, 25 May 2023 11:03:23 -0700 (PDT) Received: from merodach.members.linode.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C97F53F6C4; Thu, 25 May 2023 11:02:35 -0700 (PDT) From: James Morse To: x86@kernel.org, linux-kernel@vger.kernel.org Cc: Fenghua Yu , Reinette Chatre , Thomas Gleixner , Ingo Molnar , Borislav Petkov , H Peter Anvin , Babu Moger , James Morse , shameerali.kolothum.thodi@huawei.com, D Scott Phillips OS , carl@os.amperecomputing.com, lcherian@marvell.com, bobo.shaobowang@huawei.com, tan.shaopeng@fujitsu.com, xingxin.hx@openanolis.org, baolin.wang@linux.alibaba.com, Jamie Iles , Xin Hao , peternewman@google.com, dfustini@baylibre.com Subject: [PATCH v4 03/24] x86/resctrl: Create helper for RMID allocation and mondata dir creation Date: Thu, 25 May 2023 18:01:48 +0000 Message-Id: <20230525180209.19497-4-james.morse@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230525180209.19497-1-james.morse@arm.com> References: <20230525180209.19497-1-james.morse@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham 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?1766890303334388368?= X-GMAIL-MSGID: =?utf-8?q?1766890303334388368?= When monitorrring is support, each monitor and control group is allocated an RMID. For control groups, rdtgroup_mkdir_ctrl_mon() later goes on to allocate the CLOSID. MPAM's equivalent of RMID are not an independent number, so can't be allocated until the CLOSID is known. An RMID allocation for one CLOSID may fail, whereas another may succeed depending on how many monitor groups a control group has. The RMID allocation needs to move to be after the CLOSID has been allocated. To make a subsequent change that does this easier to read, move the RMID allocation and mondata dir creation to a helper. Tested-by: Shaopeng Tan Reviewed-by: Ilpo Järvinen Signed-off-by: James Morse --- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 42 +++++++++++++++++--------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 023eae69f29e..05774b185eec 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -3152,6 +3152,30 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp) return ret; } +static int mkdir_rdt_prepare_rmid_alloc(struct rdtgroup *rdtgrp) +{ + int ret; + + if (!rdt_mon_capable) + return 0; + + ret = alloc_rmid(); + if (ret < 0) { + rdt_last_cmd_puts("Out of RMIDs\n"); + return ret; + } + rdtgrp->mon.rmid = ret; + + ret = mkdir_mondata_all(rdtgrp->kn, rdtgrp, &rdtgrp->mon.mon_data_kn); + if (ret) { + rdt_last_cmd_puts("kernfs subdir error\n"); + free_rmid(rdtgrp->closid, rdtgrp->mon.rmid); + return ret; + } + + return 0; +} + static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, const char *name, umode_t mode, enum rdt_group_type rtype, struct rdtgroup **r) @@ -3217,20 +3241,10 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, goto out_destroy; } - if (rdt_mon_capable) { - ret = alloc_rmid(); - if (ret < 0) { - rdt_last_cmd_puts("Out of RMIDs\n"); - goto out_destroy; - } - rdtgrp->mon.rmid = ret; + ret = mkdir_rdt_prepare_rmid_alloc(rdtgrp); + if (ret) + goto out_destroy; - ret = mkdir_mondata_all(kn, rdtgrp, &rdtgrp->mon.mon_data_kn); - if (ret) { - rdt_last_cmd_puts("kernfs subdir error\n"); - goto out_idfree; - } - } kernfs_activate(kn); /* @@ -3238,8 +3252,6 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, */ return 0; -out_idfree: - free_rmid(rdtgrp->closid, rdtgrp->mon.rmid); out_destroy: kernfs_put(rdtgrp->kn); kernfs_remove(rdtgrp->kn);