From patchwork Tue Feb 13 18:44:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morse X-Patchwork-Id: 200555 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp739156dyb; Tue, 13 Feb 2024 10:47:30 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWpJ0x2NcFQok5Osck8QErRYcK6N+hR6D02c5QtvCiRgWqKi2kVP8OEBBNTmeM8CwJTHuyp9+C201//eAGgoQ0uP9e5vw== X-Google-Smtp-Source: AGHT+IEJI78ufR9GZw7HCdwcalVWP2+RZrZAQeDh42ESgg+Jtf5rJWRekrrzAoyLLt0EX2acoBF8 X-Received: by 2002:a05:6808:603:b0:3bf:f758:8096 with SMTP id y3-20020a056808060300b003bff7588096mr249840oih.32.1707850050499; Tue, 13 Feb 2024 10:47:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707850050; cv=pass; d=google.com; s=arc-20160816; b=w1RAXzvjTnq1Zn6uWxsSbjywl0CrP3vrKBv0aMtTpC10vLHlwhKXo+uvq4zpqyIYRa 2aolaTm2gNVjmVSAUrTDfw0DLqrptEF548ZYH9iJ6+IajCycVyxO1HiqeNFHhyE/NAZN gQSGI+rBevpIqIXRHu72W3Z1Ik1Wt0vJg7fT1c3Wa2hFccDC04mJOXqxohR8U0U86yFM PEhn9DIiMj6CPK8ctG++HIfr2+F7y4srTpTGFO/YPREM0VBkukzI+qzMaJHvDaxAKgRc r6TxYT6iZTanT/9R01XpMlXpbrvQGdBJIxk6HkzkfE8gGK0wZgM24Jrtj3ShemSAjbXI huPA== 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=uOLb68ruCI0vMDHIPjk7bP5Iv2bM/c+aWXUyBejWPHI=; fh=/wOQK4fZBvqJ8oHRmgoyS4NgoVvh7P9Khhlkp5sv4JI=; b=MrN3hGv+31xC094yEv23PvsnfuhTu+pFYQlKCIkWy/ipc/X9q9BRYR2K7fWs/5nG1i 1oxKxQNP/imogh1G5mZIPtp7cVLq5bkxvoD/e7sy5IHCap91MsaUqlYbdyK3oM12SJxY M5MiNE33cUkx4KnBkMKOIMMaJhK+eLWWIkv/6aUNsXQbITjNvMNR7gXVGSQ0KvwAyGms byNVoCj7W5guxsrzjAI7XTapp09g3YpKuydXWPCsSAazZRUhU9Ao5tJOKZ5r8bsZaP+d INgMCANw6M5J8bQ8dJ0bxRGnFvDjpNXV9QAPM173G5UMfloxEmj3JQZLOZRcPaEEKQu7 iCoA==; 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-64100-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64100-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com X-Forwarded-Encrypted: i=2; AJvYcCWP4O33GR976uh26ajoZDIWsxos7Q6mLxTFm387NsC0B83C4Gnxkx+4O8eY7THsByWm0CDKt5CT+0Jxv2V/79QugpgOgw== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id i14-20020ad44bae000000b0068c9c9584ffsi1466608qvw.500.2024.02.13.10.47.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 10:47:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64100-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::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-64100-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64100-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 4A5EB1C2329D for ; Tue, 13 Feb 2024 18:47:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BB74A60DEE; Tue, 13 Feb 2024 18:45:35 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A420460DC3 for ; Tue, 13 Feb 2024 18:45:32 +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=1707849934; cv=none; b=IOhEl7UF1hS5RYY+BZQyNeRhlCRINnonwg1Y4/kJ1hH1o8BdFPDn1mrzEp51oSPYxBCITJtiL6BXgxwNyXy8shI+Rv5+ocV/T5dQbQbitacaqzRTPTn2jQs4wtsjf+QQXoAFUlh1KgaGHKplM0DGPJCSrK8KsD4LWWNpfz4Hj5k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707849934; c=relaxed/simple; bh=SohyraE/+H1Ez4/07fPwKDGgs8I/0aYXelB5GAm+lJQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HTW1zPvPEcZDJKACjUBgMVmDnDKzLSRRAEb50nUgxc/ycnn6nSTMnukNMqkCeKbFw49/9GhIFrsQ/E/sCr0Epj+9F1IUKVLHmJR6SxAjXvWhNxvL0nHVhdqesgGwt1vgTEzbN7wHXbp6I2jD+iEQkSL85A+9tKPnSWfzSGKfzfw= 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 5E3111480; Tue, 13 Feb 2024 10:46:13 -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 ED7E73F766; Tue, 13 Feb 2024 10:45:28 -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 09/24] x86/resctrl: Use __set_bit()/__clear_bit() instead of open coding Date: Tue, 13 Feb 2024 18:44:23 +0000 Message-Id: <20240213184438.16675-10-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: 1790810574110404273 X-GMAIL-MSGID: 1790810574110404273 The resctrl CLOSID allocator uses a single 32bit word to track which CLOSID are free. The setting and clearing of bits is open coded. Convert the existing open coded bit manipulations of closid_free_map to use __set_bit() and friends. These don't need to be atomic as this list is protected by the mutex. 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 Reviewed-by: David Hildenbrand --- Changes since v6: * Use the __ inatomic helpers and add lockdep_assert_held() annotations to document how this is safe. * Fixed a resctrl_closid_is_free()/closid_allocated() rename in the commit message. * Use RESCTRL_RESERVED_CLOSID to improve readability. Changes since v7: * Removed paragraph explaining why this should be done now due to badword 'subsequent'. * Changed a comment to refer to RESCTRL_RESERVED_CLOSID. --- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index dcffd1c4a476..bc6e0f83c847 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -111,7 +111,7 @@ void rdt_staged_configs_clear(void) * - Our choices on how to configure each resource become progressively more * limited as the number of resources grows. */ -static int closid_free_map; +static unsigned long closid_free_map; static int closid_free_map_len; int closids_supported(void) @@ -130,8 +130,8 @@ static void closid_init(void) closid_free_map = BIT_MASK(rdt_min_closid) - 1; - /* CLOSID 0 is always reserved for the default group */ - closid_free_map &= ~1; + /* RESCTRL_RESERVED_CLOSID is always reserved for the default group */ + __clear_bit(RESCTRL_RESERVED_CLOSID, &closid_free_map); closid_free_map_len = rdt_min_closid; } @@ -139,17 +139,21 @@ static int closid_alloc(void) { u32 closid = ffs(closid_free_map); + lockdep_assert_held(&rdtgroup_mutex); + if (closid == 0) return -ENOSPC; closid--; - closid_free_map &= ~(1 << closid); + __clear_bit(closid, &closid_free_map); return closid; } void closid_free(int closid) { - closid_free_map |= 1 << closid; + lockdep_assert_held(&rdtgroup_mutex); + + __set_bit(closid, &closid_free_map); } /** @@ -161,7 +165,9 @@ void closid_free(int closid) */ static bool closid_allocated(unsigned int closid) { - return (closid_free_map & (1 << closid)) == 0; + lockdep_assert_held(&rdtgroup_mutex); + + return !test_bit(closid, &closid_free_map); } /**