From patchwork Tue Nov 29 12:01:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Newman X-Patchwork-Id: 27213 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp305263wrr; Tue, 29 Nov 2022 04:30:22 -0800 (PST) X-Google-Smtp-Source: AA0mqf6Q5C3WFrNzhPTAL+v1Hhpzim9mld/V8LY3S98EK1bewJNZALQqWsvWOHCD/WLaGZbCrMgH X-Received: by 2002:a05:6402:4a:b0:461:aa10:cb0c with SMTP id f10-20020a056402004a00b00461aa10cb0cmr52044042edu.383.1669725021973; Tue, 29 Nov 2022 04:30:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669725021; cv=none; d=google.com; s=arc-20160816; b=EEdX7o6Ioj/BpHQOtcrtt/3RxcHwj1ZgdkjPimzD0YyG+wSu41nEM1Uq1rgpYKZ+jU 6vO9AtLUiLqMCJbEWwHrgqzi84TA8P6Cx8tW2/SHlH6r3TIDdZ1OlOCAjNEgdZlpdItz ER3Ev9NqjNzes9KV/YxFdA6Eldgf6UcDgsZC5+hykgJ80RdrutbpHNdNm3XAncdYWlIi tnnnfGs2xXzLi6CbU8x6Lv2JpsJ6lunFjJtDpioq2ZnKD41hclc3133kWXNZ1mHbSoMn Ma/jZ5zeWKaX+jbGT61nZTlCuJc8FNpCNfYzRAnx8tgeURREA910Jj9oo7zikLOW9H/b jqUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=c1IfWFHp5DCIRjiKA/TeeRTh2AwfodazgUFac9Fpba4=; b=Mm9qHITm3ky45sVkhEj0/Ng0UwsXCnM6/vE4xF3hOJh/HSI785zUFSHMvOZOE2KHNc sBAyn4DJ9n2SevmtRBLr8Cj2CObj/f8JjfB3ntse4zNEAjSMxLtcc7yorUesQKHUtfIS +M2uJTIvGqU7e2XtFp8qLmAy7vc0aw+mxE1YIceaDWDOV2c0UONn1dzHXlvWUbqFaUhx 1EqanshJlZdkP0nXmu4A9xCW+yASGG4cnBh5w6wN1S5Z0kXFYz5sZoDCXqXby9ymVxGp MJaAic0kSyYNxMu8ttN7aPfdo4/6D4jrL5J9MSgdkLAsar3pVi+HiQCh53sOeClxMp1F agNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=qrag6pK4; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c7-20020a50d647000000b00461540620f1si11732823edj.169.2022.11.29.04.29.54; Tue, 29 Nov 2022 04:30:21 -0800 (PST) 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; dkim=pass header.i=@google.com header.s=20210112 header.b=qrag6pK4; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233813AbiK2MDL (ORCPT + 99 others); Tue, 29 Nov 2022 07:03:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233446AbiK2MCZ (ORCPT ); Tue, 29 Nov 2022 07:02:25 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C62A1C105 for ; Tue, 29 Nov 2022 04:02:23 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-3c9960ad866so46193777b3.4 for ; Tue, 29 Nov 2022 04:02:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=c1IfWFHp5DCIRjiKA/TeeRTh2AwfodazgUFac9Fpba4=; b=qrag6pK4vXNlb/XxqP9rXIRk1oPoO8kFnVqhuDBEdVcmYt1HLwpv7218GphnLolIjm tO0ZntJA3VdfxCbJdAsDc2m/9byccsuxHJgKbmjzVs7GuDi58E8RhVVYpQJUtCfSTEY9 J98PQ9ZKt8hp5Ohvw9uQSe6iIsRTJzatIgZ9qIGjRCpFVa8Upd3vBwO4G39YWBkRMCqx d9wQ5DheEjXcuVlUbodI7d1bLpJG4Y/ESclxNLL1EXWd1tKNAMAv+OM3BorqoEcJKLdT XZhDx+SesoCF5XxvLNQYh7VhdDbsWbYBJ32OAWgVu1Vw4XQIPu3eNn42QOcMqmqueXfq NIPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=c1IfWFHp5DCIRjiKA/TeeRTh2AwfodazgUFac9Fpba4=; b=cNzV3K/JfIVB5GQnEi7QN9f9FfBpSKLQBmsK4rW3Dn20HwHxRCNNVxLawtd46eF932 cRW9Z/245V9pLKRixoqRHvDh2mRiQbrZAmYbGK/9XmLX25uGaecNqgmrmmokEuLEDC5T TNmL2DL0uL7sePigHkmozGF+qSoInVwaTT8vwZGfNSU2euJcFPObTgHg2B0EIFi9N3dZ ynlSuyAGpiaboa1YKtmJHXh5JjQn7CA5a+aTA3ikSx9I52XjW1ZNVR4C1FAPLYqeFwgz Ja3Gm3eKtu0fZRlWuir1CncMu6ISDxXFP3pri3sqhFHPMZ9fOFwMvbUeWhll+SAtS4Mk VCBQ== X-Gm-Message-State: ANoB5pnXaq8wNdK4FQJUNjNAl/YlZX7hWYO490l2PA4NPD2YiLnGAGcw 35L91QJQQZXHTty8TOXxnGyU23ub1jegZFSZfw== X-Received: from peternewman10.zrh.corp.google.com ([2a00:79e0:9d:6:e398:2261:c909:b359]) (user=peternewman job=sendgmr) by 2002:a81:cb06:0:b0:394:5309:68f8 with SMTP id q6-20020a81cb06000000b00394530968f8mr7ywi.317.1669723342256; Tue, 29 Nov 2022 04:02:22 -0800 (PST) Date: Tue, 29 Nov 2022 13:01:48 +0100 In-Reply-To: <20221129120149.1035444-1-peternewman@google.com> Mime-Version: 1.0 References: <20221129120149.1035444-1-peternewman@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Message-ID: <20221129120149.1035444-2-peternewman@google.com> Subject: [PATCH v2 1/2] x86/resctrl: Factor rdtgroup lock for multi-file ops From: Peter Newman To: fenghua.yu@intel.com, reinette.chatre@intel.com Cc: Babu.Moger@amd.com, bp@alien8.de, dave.hansen@linux.intel.com, eranian@google.com, gupasani@google.com, hpa@zytor.com, james.morse@arm.com, linux-kernel@vger.kernel.org, mingo@redhat.com, tglx@linutronix.de, x86@kernel.org, Peter Newman X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL 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?1750833584488211886?= X-GMAIL-MSGID: =?utf-8?q?1750833584488211886?= rdtgroup_kn_lock_live() can only release a kernfs lock for a single file before waiting on the rdtgroup_mutex, limiting its usefulness for operations on multiple files, such as rename. Factor the work needed to respectively break and unbreak active protection on an individual file into rdtgroup_kn_{get,put}(). This refactoring should not result in any functional change. Signed-off-by: Peter Newman --- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 35 ++++++++++++++++---------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index e5a48f05e787..03b51543c26d 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -2026,6 +2026,26 @@ static struct rdtgroup *kernfs_to_rdtgroup(struct kernfs_node *kn) } } +static void rdtgroup_kn_get(struct rdtgroup *rdtgrp, struct kernfs_node *kn) +{ + atomic_inc(&rdtgrp->waitcount); + kernfs_break_active_protection(kn); +} + +static void rdtgroup_kn_put(struct rdtgroup *rdtgrp, struct kernfs_node *kn) +{ + if (atomic_dec_and_test(&rdtgrp->waitcount) && + (rdtgrp->flags & RDT_DELETED)) { + if (rdtgrp->mode == RDT_MODE_PSEUDO_LOCKSETUP || + rdtgrp->mode == RDT_MODE_PSEUDO_LOCKED) + rdtgroup_pseudo_lock_remove(rdtgrp); + kernfs_unbreak_active_protection(kn); + rdtgroup_remove(rdtgrp); + } else { + kernfs_unbreak_active_protection(kn); + } +} + struct rdtgroup *rdtgroup_kn_lock_live(struct kernfs_node *kn) { struct rdtgroup *rdtgrp = kernfs_to_rdtgroup(kn); @@ -2033,8 +2053,7 @@ struct rdtgroup *rdtgroup_kn_lock_live(struct kernfs_node *kn) if (!rdtgrp) return NULL; - atomic_inc(&rdtgrp->waitcount); - kernfs_break_active_protection(kn); + rdtgroup_kn_get(rdtgrp, kn); mutex_lock(&rdtgroup_mutex); @@ -2053,17 +2072,7 @@ void rdtgroup_kn_unlock(struct kernfs_node *kn) return; mutex_unlock(&rdtgroup_mutex); - - if (atomic_dec_and_test(&rdtgrp->waitcount) && - (rdtgrp->flags & RDT_DELETED)) { - if (rdtgrp->mode == RDT_MODE_PSEUDO_LOCKSETUP || - rdtgrp->mode == RDT_MODE_PSEUDO_LOCKED) - rdtgroup_pseudo_lock_remove(rdtgrp); - kernfs_unbreak_active_protection(kn); - rdtgroup_remove(rdtgrp); - } else { - kernfs_unbreak_active_protection(kn); - } + rdtgroup_kn_put(rdtgrp, kn); } static int mkdir_mondata_all(struct kernfs_node *parent_kn,