Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp1463002pxf; Fri, 12 Mar 2021 10:02:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJzcNrIRBPo+PpSvKbfVHMRGyVbtcDqAn2yvbICwf5fHQD8fnbRUJ0amSEXy27GljKxdq+O+ X-Received: by 2002:a17:907:119b:: with SMTP id uz27mr9734248ejb.464.1615572172267; Fri, 12 Mar 2021 10:02:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615572172; cv=none; d=google.com; s=arc-20160816; b=lHntfYTodL2du+jeZxAhvIm5HvXD5SMYXMtsONvccucYrrnh0fk1nBFZjv6P1Z55o+ TtlLdisLYByFECy8ylN/EnY7C+DlSpcsYqGkwCFRiPQLA8TNylbx6Q0Thmvdlt76hChy +FNppwJG4/d8ySUyIVXCh+oINukqdrlgLKufjOWkWFwQRJJK+6krn6Rboi9lzXA0Ystc iOIlmJVfeN6zrzi8gDw8ik1jX6lNz+xcsDU/xNxCZpXCkr4X9YdVXVtAPtYj8YcbvoPV OYqKRhxDynujSwCPmKJZLZ5iSXKsqztSodMv5wVkVjC2EmdOtqErp/yWPrvgn0sIezsl OT1Q== 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 :message-id:date:subject:cc:to:from; bh=3uWc6l+8A83sLOaEk5eSfLNANXCI8vPd/n69TJlPPpI=; b=t/02Z0GYJubPX7oslbw5iTT8JBzvaZF8MpdH+fIuYTaXQUJqubpMHI9E1kG5t5oZJb D6HXbNU3wQlsDucAPO7kPMzuFNeEGM6oYP8I+2mEPjb4TvuilQtNhVUir3fIEcqy7WO7 gfZMceHYe5UnQA4XbSqSFPMGv9sNjgkJ00mmEeElUidsbWE2vA6dr1LjLmb5PIYL/WPM 9zzzOQaq8+cyJ12LArlTIZI+JGXyySpptv7uBBdZupYB13quqadzxfPubuYkrENzYYC7 7S5YYNcVOKdCTRQmrROIOF1k+LCidgUTrwHPlwBzUEfOEcfWYWgzKAtbRImsLT55GUdw jUNg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d15si2308433edr.357.2021.03.12.10.02.30; Fri, 12 Mar 2021 10:02:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S231601AbhCLR73 (ORCPT + 99 others); Fri, 12 Mar 2021 12:59:29 -0500 Received: from foss.arm.com ([217.140.110.172]:58332 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232487AbhCLR7U (ORCPT ); Fri, 12 Mar 2021 12:59:20 -0500 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 F2825ED1; Fri, 12 Mar 2021 09:59:19 -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 2EEBA3F7D7; Fri, 12 Mar 2021 09:59:18 -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, Jamie Iles , D Scott Phillips OS Subject: [PATCH v2 00/24] x86/resctrl: Merge the CDP resources Date: Fri, 12 Mar 2021 17:58:25 +0000 Message-Id: <20210312175849.8327-1-james.morse@arm.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi folks, Thanks to Reinette and Jamie for the comments on v1. Major changes in v2 are to keep the closid in resctrl_arch_update_domains(), eliminating one patch, splitting another that was making two sorts of change, and to re-order the first few patches. See each patches changelog for more. ---- This series re-folds the resctrl code so the CDP resources (L3CODE et al) behaviour is all contained in the filesystem parts, with a minimum amount of arch specific code. Arm have some CPU support for dividing caches into portions, and applying bandwidth limits at various points in the SoC. The collective term for these features is MPAM: Memory Partitioning and Monitoring. MPAM is similar enough to Intel RDT, that it should use the defacto linux interface: resctrl. This filesystem currently lives under arch/x86, and is tightly coupled to the architecture. Ultimately, my plan is to split the existing resctrl code up to have an arch<->fs abstraction, then move all the bits out to fs/resctrl. From there MPAM can be wired up. x86 might have two resources with cache controls, (L2 and L3) but has extra copies for CDP: L{2,3}{CODE,DATA}, which are marked as enabled if CDP is enabled for the corresponding cache. MPAM has an equivalent feature to CDP, but its a property of the CPU, not the cache. Resctrl needs to have x86's odd/even behaviour, as that its the ABI, but this isn't how the MPAM hardware works. It is entirely possible that an in-kernel user of MPAM would not be using CDP, whereas resctrl is. Pretending L3CODE and L3DATA are entirely separate resources is a neat trick, but doing this is specific to x86. Doing this leaves the arch code in control of various parts of the filesystem ABI: the resources names, and the way the schemata are parsed. Allowing this stuff to vary between architectures is bad for user space. This series collapses the CODE/DATA resources, moving all the user-visible resctrl ABI into what becomes the filesystem code. CDP becomes the type of configuration being applied to a cache. This is done by adding a struct resctrl_schema to the parts of resctrl that will move to fs. This holds the arch-code resource that is in use for this schema, along with other properties like the name, and whether the configuration being applied is CODE/DATA/BOTH. This lets us fold the extra resources out of the arch code so that they don't need to be duplicated if the equivalent feature to CDP is missing, or implemented in a different way. The first two patches split the resource and domain structs to have an arch specific 'hw' portion, and the rest that is visible to resctrl. Future series massage the resctrl code so there are no accesses to 'hw' structures in the parts of resctrl that will move to fs, providing helpers where necessary. This series adds temporary scaffolding, which it removes a few patches later. This is to allow things like the ctrlval arrays and resources to be merged separately, which should make is easier to bisect. These things are marked temporary, and should all be gone by the end of the series. This series is a little rough around the monitors, would a fake struct resctrl_schema for the monitors simplify things, or be a source of bugs? This series is based on v5.12-rc2, and can be retrieved from: git://git.kernel.org/pub/scm/linux/kernel/git/morse/linux.git mpam/resctrl_merge_cdp/v2 v1 was posted here: https://lore.kernel.org/lkml/20201030161120.227225-1-james.morse@arm.com/ Parts were previously posted as an RFC here: https://lore.kernel.org/lkml/20200214182947.39194-1-james.morse@arm.com/ Thanks, James Morse (24): x86/resctrl: Split struct rdt_resource x86/resctrl: Split struct rdt_domain x86/resctrl: Add a separate schema list for resctrl x86/resctrl: Pass the schema in info dir's private pointer x86/resctrl: Label the resources with their configuration type x86/resctrl: Walk the resctrl schema list instead of an arch list x86/resctrl: Store the effective num_closid in the schema x86/resctrl: Add resctrl_arch_get_num_closid() x86/resctrl: Pass the schema to resctrl filesystem functions x86/resctrl: Swizzle rdt_resource and resctrl_schema in pseudo_lock_region x86/resctrl: Move the schemata names into struct resctrl_schema x86/resctrl: Group staged configuration into a separate struct x86/resctrl: Allow different CODE/DATA configurations to be staged x86/resctrl: Rename update_domains() resctrl_arch_update_domains() x86/resctrl: Add a helper to read a closid's configuration x86/resctrl: Add a helper to read/set the CDP configuration x86/resctrl: Use cdp_enabled in rdt_domain_reconfigure_cdp() x86/resctrl: Pass configuration type to resctrl_arch_get_config() x86/resctrl: Make ctrlval arrays the same size x86/resctrl: Apply offset correction when config is staged x86/resctrl: Calculate the index from the configuration type x86/resctrl: Merge the ctrl_val arrays x86/resctrl: Remove rdt_cdp_peer_get() x86/resctrl: Merge the CDP resources arch/x86/kernel/cpu/resctrl/core.c | 272 +++++-------- arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 164 +++++--- arch/x86/kernel/cpu/resctrl/internal.h | 218 +++-------- arch/x86/kernel/cpu/resctrl/monitor.c | 44 ++- arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 12 +- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 447 ++++++++++++---------- include/linux/resctrl.h | 176 +++++++++ 7 files changed, 741 insertions(+), 592 deletions(-) -- 2.30.0