From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 273A5C2BD09 for ; Thu, 27 Jun 2024 22:22:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9248B6B0089; Thu, 27 Jun 2024 18:22:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8D4526B008A; Thu, 27 Jun 2024 18:22:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 774CA6B008C; Thu, 27 Jun 2024 18:22:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 5A29D6B0089 for ; Thu, 27 Jun 2024 18:22:46 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id AF1D8161101 for ; Thu, 27 Jun 2024 22:22:45 +0000 (UTC) X-FDA: 82278094290.08.2F31B8D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf23.hostedemail.com (Postfix) with ESMTP id BF9AF14000E for ; Thu, 27 Jun 2024 22:22:43 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EKTbGixN; spf=pass (imf23.hostedemail.com: domain of longman@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=longman@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719526946; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=G8Y8sRPgLs0p8pfHCw8O8kar0+6k5OzXteERRqt0u8g=; b=h6nYxRVXvfLOJNRpq/goWeCRMX5k8u2OhobQBTeT/vhRbSZS+jnxp+GcUeXNXoQx920IY/ J3i4o0PfBUdea8wu+xgOSN2mAD9U7siKjDgKxWx8aYmSJEanXjJShrDSfiRZkPZSqAxu8n fgCsoh3spAtBNReGOXxvQHjoLaof/JQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719526946; a=rsa-sha256; cv=none; b=DHx75YkwrY9SOdzcyVy8BPA73pxX7X57Y6Y1MjVuTp0VLIsAnGRMZk/rd8xFITpJ3qgkwD qrWtL6g5NLihTHPdLhGEGIPvngkmTWBO0EXGQ4KzR0cxxVgidZURC2y9T115MCAqpqjIoN Y0+oxPL7GGCbWjf0UPioka5aDZLn/AA= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EKTbGixN; spf=pass (imf23.hostedemail.com: domain of longman@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=longman@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719526962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G8Y8sRPgLs0p8pfHCw8O8kar0+6k5OzXteERRqt0u8g=; b=EKTbGixN+aQkc6je5TXbCpw7Mc6GmXThhCakPh9wZKB3XNCjF3Mx74pQjz9HosK4oDlVgW T311fOMuxNdwS5Gnfg7pbdLK6TbNwqjW18FPfZbKVMiWsRVWmCjvfrAnJBD78OTwWdQREl ihnXf5yQGd+kkk0EzWiHiTKasf8UEhg= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-160-lnK5EB3wMoaHtQ06oPb_5g-1; Thu, 27 Jun 2024 18:22:37 -0400 X-MC-Unique: lnK5EB3wMoaHtQ06oPb_5g-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2E26919560B2; Thu, 27 Jun 2024 22:22:35 +0000 (UTC) Received: from [10.22.32.240] (unknown [10.22.32.240]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 87CDA1955D8C; Thu, 27 Jun 2024 22:22:32 +0000 (UTC) Message-ID: <08062501-f3fb-4e4d-b72c-f1b0f964640f@redhat.com> Date: Thu, 27 Jun 2024 18:22:31 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH V4 1/2] cgroup/rstat: Helper functions for locking expose trylock To: Jesper Dangaard Brouer , tj@kernel.org, cgroups@vger.kernel.org, yosryahmed@google.com, shakeel.butt@linux.dev Cc: hannes@cmpxchg.org, lizefan.x@bytedance.com, kernel-team@cloudflare.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <171952310959.1810550.17003659816794335660.stgit@firesoul> Content-Language: en-US From: Waiman Long In-Reply-To: <171952310959.1810550.17003659816794335660.stgit@firesoul> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: BF9AF14000E X-Stat-Signature: q73owjaug1igczzgz4shgoxhga95ag5i X-HE-Tag: 1719526963-840718 X-HE-Meta: U2FsdGVkX19jDiKCXqSKOBzz75+556ICE4mzM0m9Ctc4pCRXqLZIbj0Fu+IId2PrdbSQ2pC3cAr2NfdzVBzlDNvyuyGP6w/cgOykq5tSQVFH4GmoeBgk8RM978lA7z1FigLJ5CXmFvI+HU9/fdiHEtvpHNIZ9I3E2j0NHYff4bRE/m3GA5+Vl6Vhn0Wp+VwqjFmvIHwO/0c3UWROkCNKPjjHxsvSFCYIuGU3lq9nImehB1GJBKTcS7FVFHPMUEh9au872ni8dMd2WF6TATVM8llPSHh40ZI1OQpCPcja7lUOkvGaKfjE7hJm66VK45biRFY7+hnxlbr5JWnoPy5zudDfNZqB/lALZ30wYx1s1gFCKg7Y36YDdw7bNGmWLz9jMxdCp17X1O3l4OSRYeelf5sXz5addrs2WywDFpmsZBo5rO96CGdX1uePYqiOjdLJWuugoNUgRNZd+BFAyzB4u3a/ugq7h4OpX0g6Bh0Quzu/0V+SsmkF9AuU5Av/HnK6ajhEZpnPNDELTnRncigIY3rW5EXfy/XZ6OR6IQbfJql8jyyIeH9aAcvop38VgHl+NXA3hRrSmc/45HNlC5XJrpsTey/NRUB72vLKX8nfBcan3hpu9MAlNEl6rLlaWVBEVpDOuIYTSaC2TBxCKkVuOmaPP4iLu0np4D9g36+yLaeAZo6GWrU+6oPt8B+t5zwTTxq63qPokqDBBzz8Yee4yFeG5XBxIxseAYbtjGSD3VT8mwHS+Cj+FOu/Sb9F2m7QULa8KA9p4cg/rA/m1gXJ58PLutEl7EX1slLjOof0KUHcof8a2Qj8pOa+JHyIv0r/iVSpSQgnLdclUtxIlrTzeVDPfN7Tt9YXx1EGSY3T7v3m1KpJdDR1Z/SFiQnn2gWvgey8fByZPW2NmV9nlbSTlcZHMi3i3rptb3zRUJiSgMagO4PwxZ5649u2LiP1oBc+D3bBGx871ko28y2lu2K ZNvvkoIP e4LETPwOXu5h4slp5z52kurAterziCaoJQtW/+EtjVmGcs9yq8LawfvbQ/B/87l4rrRFtmMWlvCthstKTX+vSYC3I4lBDNIlXNU1BFnx/h03pUwJipIOFXptIt/9KBms3seRjRcMVn3v3XlwpoP6QQ5K2gGQbxtI1a+LV7QQ+3jrGqEVO7mQFxcJ4XaO0mb2hc1uGviw25LGVcT5Ohm3L2B9jWDuI4Sm5c1RPvJjEgo8jx1HfRbb0vQz5FarXdRR9LTMc5ZPXdkkksuPsosHgZsCRCao7VVj+H32HFuf+XjF5B2EvLTZipsXgdE2HSYFZa4etBp705UK9g2lhHOQMqsxBaUZ9DWhmObYC X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 6/27/24 17:18, Jesper Dangaard Brouer wrote: > Signed-off-by: Jesper Dangaard Brouer > --- > kernel/cgroup/rstat.c | 40 ++++++++++++++++++++++++++++++---------- > 1 file changed, 30 insertions(+), 10 deletions(-) > > diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c > index fb8b49437573..2a42be3a9bb3 100644 > --- a/kernel/cgroup/rstat.c > +++ b/kernel/cgroup/rstat.c > @@ -279,17 +279,30 @@ __bpf_hook_end(); > * value -1 is used when obtaining the main lock else this is the CPU > * number processed last. > */ > -static inline void __cgroup_rstat_lock(struct cgroup *cgrp, int cpu_in_loop) > +static inline bool __cgroup_rstat_trylock(struct cgroup *cgrp, int cpu_in_loop) > +{ > + bool locked; > + > + locked = spin_trylock_irq(&cgroup_rstat_lock); > + if (!locked) > + trace_cgroup_rstat_lock_contended(cgrp, cpu_in_loop, !locked); > + > + return locked; > +} > + > +static inline void __cgroup_rstat_lock(struct cgroup *cgrp, int cpu_in_loop, > + bool check_contention) > __acquires(&cgroup_rstat_lock) > { > - bool contended; > + bool locked = false; > > - contended = !spin_trylock_irq(&cgroup_rstat_lock); > - if (contended) { > - trace_cgroup_rstat_lock_contended(cgrp, cpu_in_loop, contended); > + if (check_contention) > + locked = __cgroup_rstat_trylock(cgrp, cpu_in_loop); > + > + if (!locked) > spin_lock_irq(&cgroup_rstat_lock); > - } > - trace_cgroup_rstat_locked(cgrp, cpu_in_loop, contended); > + > + trace_cgroup_rstat_locked(cgrp, cpu_in_loop, !locked); > } > > static inline void __cgroup_rstat_unlock(struct cgroup *cgrp, int cpu_in_loop) > @@ -328,7 +341,7 @@ static void cgroup_rstat_flush_locked(struct cgroup *cgrp) > __cgroup_rstat_unlock(cgrp, cpu); > if (!cond_resched()) > cpu_relax(); > - __cgroup_rstat_lock(cgrp, cpu); > + __cgroup_rstat_lock(cgrp, cpu, true); > } > } > } > @@ -348,9 +361,16 @@ static void cgroup_rstat_flush_locked(struct cgroup *cgrp) > */ > __bpf_kfunc void cgroup_rstat_flush(struct cgroup *cgrp) > { > + bool locked; > + > might_sleep(); > > - __cgroup_rstat_lock(cgrp, -1); > + locked = __cgroup_rstat_trylock(cgrp, -1); > + if (!locked) { > + /* Opportunity to ongoing flush detection */ > + __cgroup_rstat_lock(cgrp, -1, false); > + } > + > cgroup_rstat_flush_locked(cgrp); > __cgroup_rstat_unlock(cgrp, -1); > } > @@ -368,7 +388,7 @@ void cgroup_rstat_flush_hold(struct cgroup *cgrp) > __acquires(&cgroup_rstat_lock) > { > might_sleep(); > - __cgroup_rstat_lock(cgrp, -1); > + __cgroup_rstat_lock(cgrp, -1, true); > cgroup_rstat_flush_locked(cgrp); > } > > > Will it be cleaner to add a "bool *flushed" output parameter to __cgroup_rstat_lock() so that the caller can respond differently whether the flushed flag is set or not? In that way, you don't need to expose a separate trylock() API. Also your commit log is empty. Cheers, Longman