From patchwork Tue Feb 13 18:44:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morse X-Patchwork-Id: 200572 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp751934dyb; Tue, 13 Feb 2024 11:08:58 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU1m37ZUrcNFVxsqTAHSHI1KELZCHaonCRAU+Kle3x0Oah8XG/tm8DcTtxN6Xl1kGnT+WrvwNoU0NbH6TEFlmiC5q0FRA== X-Google-Smtp-Source: AGHT+IFLCAMQvc2QiDu9P6whLq5GsLM3hp68jDRmWViWT0VoHtXduQvnVmpB7GhWZpaZt/ILVWgu X-Received: by 2002:a05:6a21:9207:b0:19e:9a65:75eb with SMTP id tl7-20020a056a21920700b0019e9a6575ebmr688507pzb.40.1707851337884; Tue, 13 Feb 2024 11:08:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707851337; cv=pass; d=google.com; s=arc-20160816; b=NV1WDKmINmymwLbx6V4SK8vl04UuatxWI1GXH8kcHzplmG2xEDpeaTfff3bCLUSHY6 tk0ZeNiCC/tkFuX9Yr5zOs24wqwqzuS3RPh8t+TjGtONtV2OU/p6Oq7jtIhuFCLvsjZB /jjtY66oF6eZood7Xs/AN++xHZVQuVsuIPjR3B/LtKVSrBMx5DXBjZW3G5oPR1NzpQSo Lg/iGPFLBQ2TrWd6qoc4DmloVHeAjZYhR0LioSLH8+b8KJRfMhe8GLtA3yfPE2w3BEpj kn0FUfcS1npYuOzlnQeeK712HJr2sjKCYlA3pc5J1m+Ph8JlHiMB96P2ITv0bCcc8vlL w70A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=zR9kH6lRo7Yq+kADqTku3v4kD42UAF0nDQHUdwThyNA=; fh=QhdVNWv++wRsnmoUk9HiNBcZkt0k9rQbSanFxuCh7tw=; b=GOd2AGwaAXZ2gzoHtwLe1lppqeiqaGyGLc6vApiVM3b4jzS1QlWNfwLRDIoNCHxPRk mGty4PsdyCRnR7YGhANouC7aRDroF5Tzk7RlMm1Hq34G8Ugt0UndbofgSF/mdRyS76x5 4cD3DnPHN7ndQxuCJlmm0vOnJ1HEFT9sZOSa1XvqTVN/f3HZYBVp2qSgYn3zHuOisW+7 NfgVLq3WkRKtodOP9u9Sd3FCtSp/lNDqwq1LWOgJ/tsOvxy06f3x56DoYRASRpwwNe4d OEgJ4vu4+ukrfcuaQfNX2n2O1CEoAz/9t7turaM+1SAgPbcsONkDXSn4BYQSkNQN+Y2Z 2OKg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-64101-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64101-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com X-Forwarded-Encrypted: i=2; AJvYcCXNmrySKLP/eRpCWEhZXJtXFqSkidHSxa7j25PQp6d3PZzfQtjDrasmtkuBRldkHb6D96+TZXPv6+3ccr6pQTIe8loOLw== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id q3-20020a656a83000000b005cd966560b7si2486026pgu.626.2024.02.13.11.08.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:08:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64101-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-64101-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64101-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 17046B274C4 for ; Tue, 13 Feb 2024 18:47:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6D20460ED0; Tue, 13 Feb 2024 18:45:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EA85360DF1 for ; Tue, 13 Feb 2024 18:45:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707849938; cv=none; b=Ul4JBOvLScMPCbyXCU8ZY5MuQcDtkG1CcIOt3VIrqR0NpHAwfsr4mSNZGPYuACi5nO2A6MDA7ekmVCTFy42ymiRcamuaRygum5BUsS6myGnU+bvKVvk9q1hyO5sOqNRmcHsCfsFZpFGtNuAV6V6S3VfV90ipioArRB2W7BTukQI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707849938; c=relaxed/simple; bh=yTn+5rNsttXSA8wv9R6eV/BdH3FviFAT3quk383HYUk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=peokL6DiyP0FtTuaMoHPuehamH8jIAVUFV0Lvu8r8kwQWlE4PXo7+MrbvwhBROik/DypoqCTJ4Q2EcaBMiTsAS5+3YWeFEVGKIcFMnMoBnh5T0O5lJvOl36aIvVhezqhLCDBKOQtTbQZwJoikbMMuVKmqZpKTWqpCeBGW7DnFqc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 C0CB314BF; Tue, 13 Feb 2024 10:46:16 -0800 (PST) Received: from merodach.members.linode.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 64A323F766; Tue, 13 Feb 2024 10:45:32 -0800 (PST) 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, baolin.wang@linux.alibaba.com, Jamie Iles , Xin Hao , peternewman@google.com, dfustini@baylibre.com, amitsinght@marvell.com, David Hildenbrand , Babu Moger Subject: [PATCH v9 10/24] x86/resctrl: Allocate the cleanest CLOSID by searching closid_num_dirty_rmid Date: Tue, 13 Feb 2024 18:44:24 +0000 Message-Id: <20240213184438.16675-11-james.morse@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240213184438.16675-1-james.morse@arm.com> References: <20240213184438.16675-1-james.morse@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790811924338529113 X-GMAIL-MSGID: 1790811924338529113 MPAM's PMG bits extend its PARTID space, meaning the same PMG value can be used for different control groups. This means once a CLOSID is allocated, all its monitoring ids may still be dirty, and held in limbo. Instead of allocating the first free CLOSID, on architectures where CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID is enabled, search closid_num_dirty_rmid[] to find the cleanest CLOSID. The CLOSID found is returned to closid_alloc() for the free list to be updated. Signed-off-by: James Morse Tested-by: Shaopeng Tan Tested-by: Peter Newman Tested-by: Babu Moger Tested-by: Carl Worth # arm64 Reviewed-by: Shaopeng Tan Reviewed-by: Reinette Chatre Reviewed-by: Babu Moger --- Changes since v4: * Dropped stale section from comment Changes since v5: * Renamed some variables. Changes since v7: * Made comments over closid_num_dirty_rmid() not a kdoc comment. --- arch/x86/kernel/cpu/resctrl/internal.h | 2 ++ arch/x86/kernel/cpu/resctrl/monitor.c | 45 ++++++++++++++++++++++++++ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 19 ++++++++--- 3 files changed, 61 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h index 872ba1a34103..b7b9d9230bef 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -566,5 +566,7 @@ void rdt_domain_reconfigure_cdp(struct rdt_resource *r); void __init thread_throttle_mode_init(void); void __init mbm_config_rftype_init(const char *config); void rdt_staged_configs_clear(void); +bool closid_allocated(unsigned int closid); +int resctrl_find_cleanest_closid(void); #endif /* _ASM_X86_RESCTRL_INTERNAL_H */ diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c index 13b0c8d14f3d..101f1b112d17 100644 --- a/arch/x86/kernel/cpu/resctrl/monitor.c +++ b/arch/x86/kernel/cpu/resctrl/monitor.c @@ -386,6 +386,51 @@ static struct rmid_entry *resctrl_find_free_rmid(u32 closid) return ERR_PTR(-ENOSPC); } +/** + * resctrl_find_cleanest_closid() - Find a CLOSID where all the associated + * RMID are clean, or the CLOSID that has + * the most clean RMID. + * + * MPAM's equivalent of RMID are per-CLOSID, meaning a freshly allocated CLOSID + * may not be able to allocate clean RMID. To avoid this the allocator will + * choose the CLOSID with the most clean RMID. + * + * When the CLOSID and RMID are independent numbers, the first free CLOSID will + * be returned. + */ +int resctrl_find_cleanest_closid(void) +{ + u32 cleanest_closid = ~0; + int i = 0; + + lockdep_assert_held(&rdtgroup_mutex); + + if (!IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) + return -EIO; + + for (i = 0; i < closids_supported(); i++) { + int num_dirty; + + if (closid_allocated(i)) + continue; + + num_dirty = closid_num_dirty_rmid[i]; + if (num_dirty == 0) + return i; + + if (cleanest_closid == ~0) + cleanest_closid = i; + + if (num_dirty < closid_num_dirty_rmid[cleanest_closid]) + cleanest_closid = i; + } + + if (cleanest_closid == ~0) + return -ENOSPC; + + return cleanest_closid; +} + /* * For MPAM the RMID value is not unique, and has to be considered with * the CLOSID. The (CLOSID, RMID) pair is allocated on all domains, which diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index bc6e0f83c847..8fc46204a6cc 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -137,13 +137,22 @@ static void closid_init(void) static int closid_alloc(void) { - u32 closid = ffs(closid_free_map); + int cleanest_closid; + u32 closid; lockdep_assert_held(&rdtgroup_mutex); - if (closid == 0) - return -ENOSPC; - closid--; + if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) { + cleanest_closid = resctrl_find_cleanest_closid(); + if (cleanest_closid < 0) + return cleanest_closid; + closid = cleanest_closid; + } else { + closid = ffs(closid_free_map); + if (closid == 0) + return -ENOSPC; + closid--; + } __clear_bit(closid, &closid_free_map); return closid; @@ -163,7 +172,7 @@ void closid_free(int closid) * Return: true if @closid is currently associated with a resource group, * false if @closid is free */ -static bool closid_allocated(unsigned int closid) +bool closid_allocated(unsigned int closid) { lockdep_assert_held(&rdtgroup_mutex);