From patchwork Mon Jan 13 07:42:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriele Monaco X-Patchwork-Id: 13936820 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 424CBE7719F for ; Mon, 13 Jan 2025 07:43:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BE7626B0089; Mon, 13 Jan 2025 02:43:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B8B006B0088; Mon, 13 Jan 2025 02:43:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A54556B0089; Mon, 13 Jan 2025 02:43:00 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 928036B0085 for ; Mon, 13 Jan 2025 02:43:00 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 43C581C8E51 for ; Mon, 13 Jan 2025 07:43:00 +0000 (UTC) X-FDA: 83001637320.18.2661624 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf14.hostedemail.com (Postfix) with ESMTP id 64D65100007 for ; Mon, 13 Jan 2025 07:42:58 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hnzC8PRA; spf=pass (imf14.hostedemail.com: domain of gmonaco@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=gmonaco@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=1736754178; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=GJeI+pmaW4qowU1ejojWx0fMypXcCKUplYgl81NpP58=; b=RbiQjGNGRhBx2FNt2aeUpdJKpuVlt618UJ25ZgWKrKxoZiOY+dGNuCFEueKYbwe5SYp8Gw YauFOxQM7EdP2aKXDhhlB15/AtCZn/p/zbZmfF7PHz2DqowAB2/WILGWSB0MbnrGQkNPLD lwkZvuBVPp6ttb168fDto5ljTJuZDc4= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hnzC8PRA; spf=pass (imf14.hostedemail.com: domain of gmonaco@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=gmonaco@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736754178; a=rsa-sha256; cv=none; b=dkxzaNHE1xshKRl17H0UWkhQ6X59XyDMm7yvjsCV49W6/p7R0SWPbujnEPlo9P9GAgCe+O 28D/LOB3g+c+/Jj5zJDLE7l8EZm2EMA+6fUmIZG+ww8QcdYprX+VugR22I+pf4V/hmm1QL CGuN6kEf16iP0uzUNUIlGNqxhJY63Ug= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736754177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GJeI+pmaW4qowU1ejojWx0fMypXcCKUplYgl81NpP58=; b=hnzC8PRAR5Hco5sbClgQAs/hNfZWt8Ks0+ZZm51XBX6cWcx3ug+yeN5Rx4ptMr+VPGROFF nDypizpwquby3FU5itXqc7tl+KXdeVthc97jHW/WQTdiTZf5G7jgXzbMdSXYqGQHi9E92I oeRiGiNHpd0JoJCusDmOxsnfM3TX8Ck= Received: from mx-prod-mc-01.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-450-zE0BzDsWNwaOxeq0QooVgw-1; Mon, 13 Jan 2025 02:42:53 -0500 X-MC-Unique: zE0BzDsWNwaOxeq0QooVgw-1 X-Mimecast-MFC-AGG-ID: zE0BzDsWNwaOxeq0QooVgw Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0D15519560B3; Mon, 13 Jan 2025 07:42:52 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.39.192.91]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D5FB2195608A; Mon, 13 Jan 2025 07:42:48 +0000 (UTC) From: Gabriele Monaco To: Mathieu Desnoyers , Peter Zijlstra , Ingo Molnar , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Juri Lelli , Marco Elver , Gabriele Monaco Subject: [PATCH v4 1/3] sched: Compact RSEQ concurrency IDs with reduced threads and affinity Date: Mon, 13 Jan 2025 08:42:29 +0100 Message-ID: <20250113074231.61638-2-gmonaco@redhat.com> In-Reply-To: <20250113074231.61638-1-gmonaco@redhat.com> References: <20250113074231.61638-1-gmonaco@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Rspamd-Queue-Id: 64D65100007 X-Rspamd-Server: rspam12 X-Stat-Signature: 5ufdduzcefbi1bijweb1y3qszbubbo6b X-Rspam-User: X-HE-Tag: 1736754178-6368 X-HE-Meta: U2FsdGVkX189cgxxcXdYZAqJioIla+JgH7nhLoyybLoULl+DXarf0RzSfB3Wog2rROpx7HOqgGACWQbaIEUj5AhImBtRg6ljcWHDOvG/UTj0b6b3NsiVgutzBFIWpi3cSzrid8PDi+AQV20pG1CBxAU/jQq9yG/HS1l6wslrkMpFbw+vEhAo0yWmoAZyUVCoS+gxQYjCN1VdMmAibIHxsVW1lUpMS9BO2y9em4bSwceSkwuQQ+fb0u8u+PzBJx1w89PIfnQ5GXnqp1u4lFQpmZISV4yP8npG7HlHoRNoYOTVpaiyrGlTOUONo+axtXnj5sTHKTWYX2efuG2jt5+fkAG/mqHVrHKrRlHlS2KaRl8v4m/widEd1QqPVymyxZ/BrCDXNQJdRJf6EJyCkupgEy90qvXa2hril/o/guBqZWeqIWjl/gMa6IYl93fe/1ecZXvzChxvvNvUQBZmo/uVkFOJnkNJ94TfiZQIXSxJPsYZkd1yMUkOrSrO+ogJKYG93MxfNrwf/wJ2YA9eVmMzbpu7Oc6Z1Q8HDrh82sw+jjTb868gVWCjIOOdf/GoNHteAUnMc2dFrLMIcwcAVLITnHaF/X8iAV68Nmd5BiTvPlttIdnexaSAP94s1P9nY7Mw5z6LKU9mrKc8m3Xv6mYtCteLBJyZikvZAWXF3qBN5qo+BZarpGpGPkfH0lLDG5G4S/w0W2zxpZRJEvOgBHcO6v8yEXyKnhWv29rU29Wl8CZi8LABtLbgaHCNn41JiHhlZuLPZ+iBrJrdGUpbGcyj719bUlE4Kfc9UCKsnX+TVr9ZWqvfoRLuLYlh3QrV4oO/jEA4+PAEDoGC7soa8vS9eUiwH8t/6lwLW77Wy/2fsBNLr5Ws2BSRHVmijCTbSZTk5ZD6tNXgYJ99TuBEwlUOVY4MluLuGdeFs6uVpzzWuEXNWkPMOX5+qRDI1eZ2hqb1BFyoAHLw3LA4R4/0CFN JZw1dMUb z1Fyr/Fy10d+llFUN3dmjJdTR9t8JpY0o7hLnCAIlv0ZTnkF/n7X4JvVkgIm+1+4/Zw7TqLMeZNsSbmX5wM1Z+MPofuwlvsosxsmfdjqCeLl87Tx2UFhrjSYeqDaYhnAslpqgOWmqwdIxCXSaZw53OnrIJFOwFvQsO8ChqlAItyvRp0Os7Lv8ZVHx5CTfjbcQGsek+2dTH1xevV/ioHUkmKVxmY+zdc8W6IuVtD9IVLHsOIBSfDRPxEmraoxF41CM2u6ggGFVrxru7E1rZcCnGq07sjS9XhcreVfKODbElBxv/XC5UaQ3MwYNowBEP9Gl8ezqlLE2a9eOKlnNbm1tKjy8q0sgsGMwL2r1UJQW8WZvy4jcZ1N7vnnBTFybxROPsnKTmHl87U1CNZ/Ky/SG6ZxZr0Ct4f12BZL8cA9qP85uMWb4esDLtPcqHRAWhRUYUjhA/i9UFIkQAeXLMWxsYS2SF8lUG2xubC4i06igEel+ASQ= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Mathieu Desnoyers When a process reduces its number of threads or clears bits in its CPU affinity mask, the mm_cid allocation should eventually converge towards smaller values. However, the change introduced by: commit 7e019dcc470f ("sched: Improve cache locality of RSEQ concurrency IDs for intermittent workloads") adds a per-mm/CPU recent_cid which is never unset unless a thread migrates. This is a tradeoff between: A) Preserving cache locality after a transition from many threads to few threads, or after reducing the hamming weight of the allowed CPU mask. B) Making the mm_cid upper bounds wrt nr threads and allowed CPU mask easy to document and understand. C) Allowing applications to eventually react to mm_cid compaction after reduction of the nr threads or allowed CPU mask, making the tracking of mm_cid compaction easier by shrinking it back towards 0 or not. D) Making sure applications that periodically reduce and then increase again the nr threads or allowed CPU mask still benefit from good cache locality with mm_cid. Introduce the following changes: * After shrinking the number of threads or reducing the number of allowed CPUs, reduce the value of max_nr_cid so expansion of CID allocation will preserve cache locality if the number of threads or allowed CPUs increase again. * Only re-use a recent_cid if it is within the max_nr_cid upper bound, else find the first available CID. Fixes: 7e019dcc470f ("sched: Improve cache locality of RSEQ concurrency IDs for intermittent workloads") Cc: Peter Zijlstra (Intel) Cc: Marco Elver Cc: Ingo Molnar Tested-by: Gabriele Monaco Signed-off-by: Mathieu Desnoyers Signed-off-by: Gabriele Monaco --- include/linux/mm_types.h | 7 ++++--- kernel/sched/sched.h | 25 ++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 332cee2856620..14fc1b39c0cf3 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -873,10 +873,11 @@ struct mm_struct { */ unsigned int nr_cpus_allowed; /** - * @max_nr_cid: Maximum number of concurrency IDs allocated. + * @max_nr_cid: Maximum number of allowed concurrency + * IDs allocated. * - * Track the highest number of concurrency IDs allocated for the - * mm. + * Track the highest number of allowed concurrency IDs + * allocated for the mm. */ atomic_t max_nr_cid; /** diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index c5d67a43fe524..13db32370a381 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -3666,10 +3666,28 @@ static inline int __mm_cid_try_get(struct task_struct *t, struct mm_struct *mm) { struct cpumask *cidmask = mm_cidmask(mm); struct mm_cid __percpu *pcpu_cid = mm->pcpu_cid; - int cid = __this_cpu_read(pcpu_cid->recent_cid); + int cid, max_nr_cid, allowed_max_nr_cid; + /* + * After shrinking the number of threads or reducing the number + * of allowed cpus, reduce the value of max_nr_cid so expansion + * of cid allocation will preserve cache locality if the number + * of threads or allowed cpus increase again. + */ + max_nr_cid = atomic_read(&mm->max_nr_cid); + while ((allowed_max_nr_cid = min_t(int, READ_ONCE(mm->nr_cpus_allowed), + atomic_read(&mm->mm_users))), + max_nr_cid > allowed_max_nr_cid) { + /* atomic_try_cmpxchg loads previous mm->max_nr_cid into max_nr_cid. */ + if (atomic_try_cmpxchg(&mm->max_nr_cid, &max_nr_cid, allowed_max_nr_cid)) { + max_nr_cid = allowed_max_nr_cid; + break; + } + } /* Try to re-use recent cid. This improves cache locality. */ - if (!mm_cid_is_unset(cid) && !cpumask_test_and_set_cpu(cid, cidmask)) + cid = __this_cpu_read(pcpu_cid->recent_cid); + if (!mm_cid_is_unset(cid) && cid < max_nr_cid && + !cpumask_test_and_set_cpu(cid, cidmask)) return cid; /* * Expand cid allocation if the maximum number of concurrency @@ -3677,8 +3695,9 @@ static inline int __mm_cid_try_get(struct task_struct *t, struct mm_struct *mm) * and number of threads. Expanding cid allocation as much as * possible improves cache locality. */ - cid = atomic_read(&mm->max_nr_cid); + cid = max_nr_cid; while (cid < READ_ONCE(mm->nr_cpus_allowed) && cid < atomic_read(&mm->mm_users)) { + /* atomic_try_cmpxchg loads previous mm->max_nr_cid into cid. */ if (!atomic_try_cmpxchg(&mm->max_nr_cid, &cid, cid + 1)) continue; if (!cpumask_test_and_set_cpu(cid, cidmask)) From patchwork Mon Jan 13 07:42:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriele Monaco X-Patchwork-Id: 13936821 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 9DED2E7719E for ; Mon, 13 Jan 2025 07:43:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 302846B0088; Mon, 13 Jan 2025 02:43:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2B3036B008A; Mon, 13 Jan 2025 02:43:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1523B6B008C; Mon, 13 Jan 2025 02:43:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 042D46B0088 for ; Mon, 13 Jan 2025 02:43:04 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id BC658161A5A for ; Mon, 13 Jan 2025 07:43:03 +0000 (UTC) X-FDA: 83001637446.10.26E5A96 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 0EAD0C000B for ; Mon, 13 Jan 2025 07:43:01 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=P6T6jIBc; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of gmonaco@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=gmonaco@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736754182; a=rsa-sha256; cv=none; b=qocPGWhnXoOvx046JqjFzyaX8sBMQiBF4fBsIa7qps98TJ6FmpKcrkZ+PKYm/u+71EU6U8 pUK7zuhyszct337s+388gQKtp8fRvhUn1aq1EtbNx5I8VrEKqXtdo+lweyyK5+u9Y6RL/a BjYc0oFgeZglwH84g7/uuMwbT85dm1g= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=P6T6jIBc; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of gmonaco@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=gmonaco@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1736754182; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=APCQB05FXd5GdsZ+0WMwcSU+mpqB3aeUhGULyuv/mhU=; b=A+moNggcokocCTb5PvPFGu7HzAwsLwvByAvK1yQwl62i+XZy1aQ6VxOx9Ri9UGCpJ42jx0 9Zf/s6Q+dG7fD54meC3wqisHM9gj4oLveuo0AgqH9o4qedFm2G8k9h3fDym/QA7+sJcEnq tnaDpyGkaB+UgfmxcZNtJfcPf/aP6FY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736754181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=APCQB05FXd5GdsZ+0WMwcSU+mpqB3aeUhGULyuv/mhU=; b=P6T6jIBcVKv2Ap9ohuQVfQTqEE0mkqd9rV5vRTlwt+wpuwCDSYly7wr3MSd14ajzJa23tV nJJrSKXDFS4EhDI2xNKTZi4jyLU+zpU6c87/v0ZjEb3R0D+O5m0x/EHLuvU21HyFm8Ok7u K6Smvo1vOUAaA0p8Jr3Zq4ExKTX6eQk= Received: from mx-prod-mc-02.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-300-1pk4g7avMBeW3dK_vM1hvw-1; Mon, 13 Jan 2025 02:42:57 -0500 X-MC-Unique: 1pk4g7avMBeW3dK_vM1hvw-1 X-Mimecast-MFC-AGG-ID: 1pk4g7avMBeW3dK_vM1hvw Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0B5E419560BA; Mon, 13 Jan 2025 07:42:56 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.39.192.91]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AEA56195E3D9; Mon, 13 Jan 2025 07:42:52 +0000 (UTC) From: Gabriele Monaco To: Mathieu Desnoyers , Peter Zijlstra , Ingo Molnar , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Juri Lelli , Gabriele Monaco , Andrew Morton Subject: [PATCH v4 2/3] sched: Move task_mm_cid_work to mm delayed work Date: Mon, 13 Jan 2025 08:42:30 +0100 Message-ID: <20250113074231.61638-3-gmonaco@redhat.com> In-Reply-To: <20250113074231.61638-1-gmonaco@redhat.com> References: <20250113074231.61638-1-gmonaco@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 0EAD0C000B X-Stat-Signature: 9i6ipg3659b75yuqm9cqfjykknbzw9rj X-Rspam-User: X-HE-Tag: 1736754181-638085 X-HE-Meta: U2FsdGVkX1+PxDYveOR+5nJvEHXZaJVtU9hAER6ra+YXGfB/L99HHe32g1Nn2LjDfGFWFNSec/nMGZKW8NMbWwEOHLALmN9ShrH0bm7m5L6AV5IDo3MQYdnWWkef8I/KmI0uZL9/upZZKai/+t/VedD72oFQlUU/Nmg2/w+W62vrUKe07RDrkt1WX1KlFfwWGZuV0Ee6QpAJVulownhOMskdbB9fu24Kb+1Y7IiXUa8Vg9ka5ovm+CAGthK9y++X4uY/XNrkqImocvS6noBQJlmuCxPHH0WRVCNjTv26JNVsG2xpZQQhvrQFLOcbpP4Mpp4U+xrAbpjVtzJTiJGlBSct7JNfwg584ypOU3F0am0QXTGRho+kV4dvQcAlqKM/rWO7kh5Fwd2AcS4guZICRjXHn+QWiGc+AxSv1jc+U6TEsKK63Y3yXH+He/qcRsOlE5aWHcdQI9cEEgAiexO3rt5Xtc3QsQ0SbNOXvnGGyv+Ji26h742pa2OIaZsSXuLcFcMXOwJw/Qf9vwt5/1bXd3eB4RwLI+ebld4kGVI84yNv11YaBq2NgB+jtYRW2Ef4XSxjvl0eyMiVX1j6zfgul3bLqCl5z3jV+k1GZYILi/xU44daAq54o3W+RjuWVq06qZha0s5Q8Oz6svlxF2SGlYvkgNkjcV04KMkcp8QCrJwGzxNE4fsH+NKyQ4WXJENznW56r6sktAa8JO2kO3krPh8HHqJ7ibFV9/XvO7Sl5pvpmK/4EB1I4fzFtYWYM+Came6Gg6ck3+Ua1L/87YS+OsFHaK95fhH1t9SWkypXmMQEkydEvFpq9GPIYVyNa5lVhFt63E0Sz7azWqvykkqQO0dMSmEWwaJ01cRFAHoWgEWMN9Z/w/oVcJDCiaZKMHFdcTEphN5jNBCrd5uSXPrkUd6E9B2PDgSZlyeNt0CQSAS+lVL8yk1qO2I6UhM/j1O2Ia2VT44TTPHE/obuyb4 OpFy+eOc tubZpN1fWdvYANtSzibXuFLrpt5J5epHflDf0Mn7Ga55mX8LrR2iAQ4Ma9RkQJXOYSOk+F1ppzll2PekbWmGX/9ZRaPJKLz9ENKWtGUbk9ls69jBzN5WlZNifJ13TldSmB+UCtCebhep7KOMhWLdv1Io65H0sluUGNkOpxRN1lmGJeTBE80odwSSFxIUbTeWPI00zViEQNj30Z6yetouYApp6IlXr+1M2Wt9/VGjORuZcCvSO32E+BpT5Mu5q0mtRNJtU+ZKeCZ2OEv6esf+k44E/vfytV2njvUmW1oGgRD4WkcZh0n4HJ3gBozUu7gmPM2OkL1gQewhJqLDwuBypCJGZTgzJsnyRztlc4wvhHgbJz6Q+cHvEwgRH096iv0M697EDrJCgh5QInpq3qM+ue5Mi53syMPM98cT6kzj+DASbvmKvl9aC1Z6fqk7nNB60i3YRou0Jzf5CX/hdE+RqccPyiBruibULQujarEns1KtlAZT3eVGd5cWX7JgMXqLOIQEv/UhoL9tCp1AHWQuBJLRzNvL2wnf6vw5w0lM0V/C+chRtR0yqcBuUxAd2TlAtZoqZ X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Currently, the task_mm_cid_work function is called in a task work triggered by a scheduler tick to frequently compact the mm_cids of each process. This can delay the execution of the corresponding thread for the entire duration of the function, negatively affecting the response in case of real time tasks. In practice, we observe task_mm_cid_work increasing the latency of 30-35us on a 128 cores system, this order of magnitude is meaningful under PREEMPT_RT. Run the task_mm_cid_work in a new delayed work connected to the mm_struct rather than in the task context before returning to userspace. This delayed work is initialised while allocating the mm and disabled before freeing it, its execution is no longer triggered by scheduler ticks but run periodically based on the defined MM_CID_SCAN_DELAY. The main advantage of this change is that the function can be offloaded to a different CPU and even preempted by RT tasks. Moreover, this new behaviour could be more predictable with periodic tasks with short runtime, which may rarely run during a scheduler tick. Now, the work is always scheduled with the same periodicity for each mm (though the periodicity is not guaranteed due to interference from other tasks, but mm_cid compaction is mostly best effort). To avoid excessively increased runtime, we quickly return from the function if we have no work to be done (i.e. no mm_cid is allocated). This is helpful for tasks that sleep for a long time, but also for terminated task. We are no longer following the process' state, hence the function continues to run after a process terminates but before its mm is freed. Fixes: 223baf9d17f2 ("sched: Fix performance regression introduced by mm_cid") Reviewed-by: Mathieu Desnoyers Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Andrew Morton Signed-off-by: Gabriele Monaco --- include/linux/mm_types.h | 16 ++++++---- include/linux/sched.h | 1 - kernel/sched/core.c | 66 +++++----------------------------------- kernel/sched/sched.h | 7 ----- 4 files changed, 18 insertions(+), 72 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 14fc1b39c0cf3..26d631de6fe1b 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -859,12 +859,6 @@ struct mm_struct { * runqueue locks. */ struct mm_cid __percpu *pcpu_cid; - /* - * @mm_cid_next_scan: Next mm_cid scan (in jiffies). - * - * When the next mm_cid scan is due (in jiffies). - */ - unsigned long mm_cid_next_scan; /** * @nr_cpus_allowed: Number of CPUs allowed for mm. * @@ -887,6 +881,7 @@ struct mm_struct { * mm nr_cpus_allowed updates. */ raw_spinlock_t cpus_allowed_lock; + struct delayed_work mm_cid_work; #endif #ifdef CONFIG_MMU atomic_long_t pgtables_bytes; /* size of all page tables */ @@ -1175,11 +1170,16 @@ static inline void vma_iter_init(struct vma_iterator *vmi, #ifdef CONFIG_SCHED_MM_CID +#define SCHED_MM_CID_PERIOD_NS (100ULL * 1000000) /* 100ms */ +#define MM_CID_SCAN_DELAY 100 /* 100ms */ + enum mm_cid_state { MM_CID_UNSET = -1U, /* Unset state has lazy_put flag set. */ MM_CID_LAZY_PUT = (1U << 31), }; +extern void task_mm_cid_work(struct work_struct *work); + static inline bool mm_cid_is_unset(int cid) { return cid == MM_CID_UNSET; @@ -1252,12 +1252,16 @@ static inline int mm_alloc_cid_noprof(struct mm_struct *mm, struct task_struct * if (!mm->pcpu_cid) return -ENOMEM; mm_init_cid(mm, p); + INIT_DELAYED_WORK(&mm->mm_cid_work, task_mm_cid_work); + schedule_delayed_work(&mm->mm_cid_work, + msecs_to_jiffies(MM_CID_SCAN_DELAY)); return 0; } #define mm_alloc_cid(...) alloc_hooks(mm_alloc_cid_noprof(__VA_ARGS__)) static inline void mm_destroy_cid(struct mm_struct *mm) { + disable_delayed_work_sync(&mm->mm_cid_work); free_percpu(mm->pcpu_cid); mm->pcpu_cid = NULL; } diff --git a/include/linux/sched.h b/include/linux/sched.h index 64934e0830af3..901dadeba3e80 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1381,7 +1381,6 @@ struct task_struct { int last_mm_cid; /* Most recent cid in mm */ int migrate_from_cpu; int mm_cid_active; /* Whether cid bitmap is active */ - struct callback_head cid_work; #endif struct tlbflush_unmap_batch tlb_ubc; diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 3e5a6bf587f91..a8b3d8df25d63 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4516,7 +4516,6 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p) p->wake_entry.u_flags = CSD_TYPE_TTWU; p->migration_pending = NULL; #endif - init_sched_mm_cid(p); } DEFINE_STATIC_KEY_FALSE(sched_numa_balancing); @@ -5654,7 +5653,6 @@ void sched_tick(void) resched_latency = cpu_resched_latency(rq); calc_global_load_tick(rq); sched_core_tick(rq); - task_tick_mm_cid(rq, donor); scx_tick(rq); rq_unlock(rq, &rf); @@ -10520,38 +10518,17 @@ static void sched_mm_cid_remote_clear_weight(struct mm_struct *mm, int cpu, sched_mm_cid_remote_clear(mm, pcpu_cid, cpu); } -static void task_mm_cid_work(struct callback_head *work) +void task_mm_cid_work(struct work_struct *work) { - unsigned long now = jiffies, old_scan, next_scan; - struct task_struct *t = current; struct cpumask *cidmask; - struct mm_struct *mm; + struct delayed_work *delayed_work = container_of(work, struct delayed_work, work); + struct mm_struct *mm = container_of(delayed_work, struct mm_struct, mm_cid_work); int weight, cpu; - SCHED_WARN_ON(t != container_of(work, struct task_struct, cid_work)); - - work->next = work; /* Prevent double-add */ - if (t->flags & PF_EXITING) - return; - mm = t->mm; - if (!mm) - return; - old_scan = READ_ONCE(mm->mm_cid_next_scan); - next_scan = now + msecs_to_jiffies(MM_CID_SCAN_DELAY); - if (!old_scan) { - unsigned long res; - - res = cmpxchg(&mm->mm_cid_next_scan, old_scan, next_scan); - if (res != old_scan) - old_scan = res; - else - old_scan = next_scan; - } - if (time_before(now, old_scan)) - return; - if (!try_cmpxchg(&mm->mm_cid_next_scan, &old_scan, next_scan)) - return; cidmask = mm_cidmask(mm); + /* Nothing to clear for now */ + if (cpumask_empty(cidmask)) + goto out; /* Clear cids that were not recently used. */ for_each_possible_cpu(cpu) sched_mm_cid_remote_clear_old(mm, cpu); @@ -10562,35 +10539,8 @@ static void task_mm_cid_work(struct callback_head *work) */ for_each_possible_cpu(cpu) sched_mm_cid_remote_clear_weight(mm, cpu, weight); -} - -void init_sched_mm_cid(struct task_struct *t) -{ - struct mm_struct *mm = t->mm; - int mm_users = 0; - - if (mm) { - mm_users = atomic_read(&mm->mm_users); - if (mm_users == 1) - mm->mm_cid_next_scan = jiffies + msecs_to_jiffies(MM_CID_SCAN_DELAY); - } - t->cid_work.next = &t->cid_work; /* Protect against double add */ - init_task_work(&t->cid_work, task_mm_cid_work); -} - -void task_tick_mm_cid(struct rq *rq, struct task_struct *curr) -{ - struct callback_head *work = &curr->cid_work; - unsigned long now = jiffies; - - if (!curr->mm || (curr->flags & (PF_EXITING | PF_KTHREAD)) || - work->next != work) - return; - if (time_before(now, READ_ONCE(curr->mm->mm_cid_next_scan))) - return; - - /* No page allocation under rq lock */ - task_work_add(curr, work, TWA_RESUME | TWAF_NO_ALLOC); +out: + schedule_delayed_work(delayed_work, msecs_to_jiffies(MM_CID_SCAN_DELAY)); } void sched_mm_cid_exit_signals(struct task_struct *t) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 13db32370a381..4b3396d4c642c 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -3590,16 +3590,11 @@ extern void sched_dynamic_update(int mode); #ifdef CONFIG_SCHED_MM_CID -#define SCHED_MM_CID_PERIOD_NS (100ULL * 1000000) /* 100ms */ -#define MM_CID_SCAN_DELAY 100 /* 100ms */ - extern raw_spinlock_t cid_lock; extern int use_cid_lock; extern void sched_mm_cid_migrate_from(struct task_struct *t); extern void sched_mm_cid_migrate_to(struct rq *dst_rq, struct task_struct *t); -extern void task_tick_mm_cid(struct rq *rq, struct task_struct *curr); -extern void init_sched_mm_cid(struct task_struct *t); static inline void __mm_cid_put(struct mm_struct *mm, int cid) { @@ -3867,8 +3862,6 @@ static inline void switch_mm_cid(struct rq *rq, static inline void switch_mm_cid(struct rq *rq, struct task_struct *prev, struct task_struct *next) { } static inline void sched_mm_cid_migrate_from(struct task_struct *t) { } static inline void sched_mm_cid_migrate_to(struct rq *dst_rq, struct task_struct *t) { } -static inline void task_tick_mm_cid(struct rq *rq, struct task_struct *curr) { } -static inline void init_sched_mm_cid(struct task_struct *t) { } #endif /* !CONFIG_SCHED_MM_CID */ extern u64 avg_vruntime(struct cfs_rq *cfs_rq); From patchwork Mon Jan 13 07:42:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriele Monaco X-Patchwork-Id: 13936822 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 12AFCE7719F for ; Mon, 13 Jan 2025 07:43:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 91CEE6B008A; Mon, 13 Jan 2025 02:43:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8CC556B008C; Mon, 13 Jan 2025 02:43:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 795EF6B0092; Mon, 13 Jan 2025 02:43:06 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 6475F6B008A for ; Mon, 13 Jan 2025 02:43:06 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 350F81A1B08 for ; Mon, 13 Jan 2025 07:43:06 +0000 (UTC) X-FDA: 83001637572.21.1492FE9 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf08.hostedemail.com (Postfix) with ESMTP id 7ABD5160022 for ; Mon, 13 Jan 2025 07:43:04 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=AmJbvHjB; spf=pass (imf08.hostedemail.com: domain of gmonaco@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=gmonaco@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=1736754184; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=WrSLXJgkncdYyrYbqneAfqqWPwYyj0iI94Z6Q+w4Jg4=; b=O7O55Ytv6amZRJTWg476O0E60LIsMEA68pzUbh/lw609824EVRyPGvVl7PPNQtH5ZAyRqg Zb28O7aZ7smRB1+kVNj+83W2ls7TMZAUwmfqM9J6rV0jShY0CZv8ReGGwPgEIbXz6x1Mrp 7ue9SqhnFoXAH8abXA6XPmGyS3iqjqM= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=AmJbvHjB; spf=pass (imf08.hostedemail.com: domain of gmonaco@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=gmonaco@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736754184; a=rsa-sha256; cv=none; b=WWQb/G44TfYGiwIAvnPveq4qBQbtETZzzn25Y2013fICJaixluHJB++RBfUwmbjz0JC8Yg Cwf4Bm/iE90WzIi0xkzcfBQdFG0JwbwKeYhVP92wF+WtOrYudPe98w1QAgRhvi4EWHFwv/ RErujhDCK6Y7UFmbxeTQKexXg7quDRc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736754183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WrSLXJgkncdYyrYbqneAfqqWPwYyj0iI94Z6Q+w4Jg4=; b=AmJbvHjBHSl0WvRCwuc8OdTTSVX9FQzvRVuFSmfVCnFziz2RBZv2TkoyzKpUUK5V8O1n0f a3TFkaoS/EBBJRarIB0yTv1iLVt32g+/iXRjd12vQSneflMXU99b2Oavkkxy/6uO621+qt U0luhktpmvxKSLwhGKlxWDsi5De8ItQ= 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-12-aWuxDwKKNIuLuC89j4p3NQ-1; Mon, 13 Jan 2025 02:43:01 -0500 X-MC-Unique: aWuxDwKKNIuLuC89j4p3NQ-1 X-Mimecast-MFC-AGG-ID: aWuxDwKKNIuLuC89j4p3NQ Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 A867919560B4; Mon, 13 Jan 2025 07:42:59 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.39.192.91]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 99FFC195608A; Mon, 13 Jan 2025 07:42:56 +0000 (UTC) From: Gabriele Monaco To: Mathieu Desnoyers , Peter Zijlstra , Ingo Molnar , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Juri Lelli , Gabriele Monaco , Shuah Khan Subject: [PATCH v4 3/3] rseq/selftests: Add test for mm_cid compaction Date: Mon, 13 Jan 2025 08:42:31 +0100 Message-ID: <20250113074231.61638-4-gmonaco@redhat.com> In-Reply-To: <20250113074231.61638-1-gmonaco@redhat.com> References: <20250113074231.61638-1-gmonaco@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Rspamd-Server: rspam05 X-Stat-Signature: 6po4qhzwzc9bc7h1u71bx3csw8am3ocw X-Rspamd-Queue-Id: 7ABD5160022 X-Rspam-User: X-HE-Tag: 1736754184-893060 X-HE-Meta: U2FsdGVkX19F+GeFcmFMJWMB8FKh2yH31uN8fkhsnzNwWugN7jd4NDoJXfDdzvpj/nMbUvWXus8+BME67RTMeaXALMDrVVy9QlD1LRc0MoKzCeA5h2h24QZ+XaZGMlUdwxTQtLtvF/vqu9kEYsN8hjM+Q8Po20NKxB3zaHRYBdcL+mthKMh1hZBcRHFoTpffDXtX2q4MHm7RVdC/mMCftDeml1We+NkUkYZ8fDJffYXV9fM+Q5yTRXfn/AxMMpWgeTUkS/PfgCmgn2OvrO5WoYypggPgSWMRbyl49JCVP2pEl9UmmYGYQW0Qdf710/SVRXNneqDZNKWm1eg12soFDgBvjw/CmaP3B0Zp1CGyXdbFHq0hrgR9WCLrdzVYG8ElgIQ+CUQXabFTH0RrJpZZWmaIYZyOs4o/onhzCApqNfXWXg3HdR+0yGlGKHE3pmeMC1p1tlY8W3fwMsP1z7Had10Hf2ws5VwMKYI40MOEUgZVCoTBjsuMkw6aECe+gD9qxIK+vzy28b6GoGM+GuZ+phO56Z6xnralOZcl8RuadOm+ilXVMf51zYLvft7NlPQrkh1cysD+NUnvVqKL0srEdr3+REIuLwXjqPSWYZs/fwR430c+sdS1E2JAbgSe3GEsHwftk7TRr1yU3uT01OLGEnaBIIRSkQZ/NzIRl0JMkaaHcyyeVsmdQyQZS/ilG67AUZ/xEF0onu5TmdrUsrjIIwkDJGmDNMeLuJ6gi4f+M7PGSnCAcpOm7f4h220GqxoAg/xoHZESv0F6527Hwh63chpSK7W9dRB0SnScocp9BpGEIeke3qok0SbqHPhKeiFwO4mmJowNcJlsEWrdx0x7RwFZIRKdeZhtfAgS4a3pRD3hKhHV7B92PICE3p5eaVcjFIS7SRdAGQNFp9sUktKvnay53uo16qp914TPve1mw7VBn2vYxarFBte0LVBUL3uj8BEMzjdB1fsMv7P1CDr 7mL6o8Qv nYrVlXl6HmL9UlpwmmzxDWDxn48TM1WTYqCK4HzABM8O6F8g8zIUgi/Fznkf6wskGjJbzPWcvMb3xOETjrTjrta3nA1HERvATUZLX9AZmTaPvun/n3JFciLscjouZAjS1E79l0g0sxVBAtuexQToIxwLyW7N8YCKK9XN2Ortn9h0uPhoBPUfnx3jV/J7S4MXBhKsVMd8SpEQJtUSQ6CiBvbyq7HavUnS6XCUp/jjTr+Rp3rzMmLYlSXyPh/z6TdZrHtzTquOOtTalWuGpo8L4cN4dOvozbr08hPMqXLsWJ8WeLlUPf/zI4kGzMQy10PhVxOgrEWn6iYLMlg+uDflXpAfoMOt0Was5wE5oBiHSUHr9xwsK2AOf/bUFa8t01Plpb0k6L7Vfo9GBKhYZ1DImkcb6A5l4u2nG4FISXg7TyxvmWBXUkk43nR2utsuUwk4h98ow X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: A task in the kernel (task_mm_cid_work) runs somewhat periodically to compact the mm_cid for each process. Add a test to validate that it runs correctly and timely. The test spawns 1 thread pinned to each CPU, then each thread, including the main one, runs in short bursts for some time. During this period, the mm_cids should be spanning all numbers between 0 and nproc. At the end of this phase, a thread with high enough mm_cid (>= nproc/2) is selected to be the new leader, all other threads terminate. After some time, the only running thread should see 0 as mm_cid, if that doesn't happen, the compaction mechanism didn't work and the test fails. The test never fails if only 1 core is available, in which case, we cannot test anything as the only available mm_cid is 0. To: Mathieu Desnoyers Cc: Shuah Khan Signed-off-by: Gabriele Monaco --- tools/testing/selftests/rseq/.gitignore | 1 + tools/testing/selftests/rseq/Makefile | 2 +- .../selftests/rseq/mm_cid_compaction_test.c | 185 ++++++++++++++++++ 3 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/rseq/mm_cid_compaction_test.c diff --git a/tools/testing/selftests/rseq/.gitignore b/tools/testing/selftests/rseq/.gitignore index 16496de5f6ce4..2c89f97e4f737 100644 --- a/tools/testing/selftests/rseq/.gitignore +++ b/tools/testing/selftests/rseq/.gitignore @@ -3,6 +3,7 @@ basic_percpu_ops_test basic_percpu_ops_mm_cid_test basic_test basic_rseq_op_test +mm_cid_compaction_test param_test param_test_benchmark param_test_compare_twice diff --git a/tools/testing/selftests/rseq/Makefile b/tools/testing/selftests/rseq/Makefile index 5a3432fceb586..ce1b38f46a355 100644 --- a/tools/testing/selftests/rseq/Makefile +++ b/tools/testing/selftests/rseq/Makefile @@ -16,7 +16,7 @@ OVERRIDE_TARGETS = 1 TEST_GEN_PROGS = basic_test basic_percpu_ops_test basic_percpu_ops_mm_cid_test param_test \ param_test_benchmark param_test_compare_twice param_test_mm_cid \ - param_test_mm_cid_benchmark param_test_mm_cid_compare_twice + param_test_mm_cid_benchmark param_test_mm_cid_compare_twice mm_cid_compaction_test TEST_GEN_PROGS_EXTENDED = librseq.so diff --git a/tools/testing/selftests/rseq/mm_cid_compaction_test.c b/tools/testing/selftests/rseq/mm_cid_compaction_test.c new file mode 100644 index 0000000000000..618f874c53905 --- /dev/null +++ b/tools/testing/selftests/rseq/mm_cid_compaction_test.c @@ -0,0 +1,185 @@ +// SPDX-License-Identifier: LGPL-2.1 +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../kselftest.h" +#include "rseq.h" + +#define VERBOSE 0 +#define printf_verbose(fmt, ...) \ + do { \ + if (VERBOSE) \ + printf(fmt, ##__VA_ARGS__); \ + } while (0) + +/* 0.5 s */ +#define RUNNER_PERIOD 500000 +/* Number of runs before we terminate or get the token */ +#define THREAD_RUNS 5 + +/* + * Number of times we check that the mm_cid were compacted. + * Checks are repeated every RUNNER_PERIOD. + */ +#define MM_CID_COMPACT_TIMEOUT 10 + +struct thread_args { + int cpu; + int num_cpus; + pthread_mutex_t *token; + pthread_barrier_t *barrier; + pthread_t *tinfo; + struct thread_args *args_head; +}; + +static void __noreturn *thread_runner(void *arg) +{ + struct thread_args *args = arg; + int i, ret, curr_mm_cid; + cpu_set_t cpumask; + + CPU_ZERO(&cpumask); + CPU_SET(args->cpu, &cpumask); + ret = pthread_setaffinity_np(pthread_self(), sizeof(cpumask), &cpumask); + if (ret) { + errno = ret; + perror("Error: failed to set affinity"); + abort(); + } + pthread_barrier_wait(args->barrier); + + for (i = 0; i < THREAD_RUNS; i++) + usleep(RUNNER_PERIOD); + curr_mm_cid = rseq_current_mm_cid(); + /* + * We select one thread with high enough mm_cid to be the new leader + * all other threads (including the main thread) will terminate. + * After some time, the mm_cid of the only remaining thread should + * converge to 0, if not, the test fails. + */ + if (curr_mm_cid >= args->num_cpus / 2 && + !pthread_mutex_trylock(args->token)) { + printf_verbose( + "cpu%d has mm_cid=%d and will be the new leader.\n", + sched_getcpu(), curr_mm_cid); + for (i = 0; i < args->num_cpus; i++) { + if (args->tinfo[i] == pthread_self()) + continue; + ret = pthread_join(args->tinfo[i], NULL); + if (ret) { + errno = ret; + perror("Error: failed to join thread"); + abort(); + } + } + pthread_barrier_destroy(args->barrier); + free(args->tinfo); + free(args->token); + free(args->barrier); + free(args->args_head); + + for (i = 0; i < MM_CID_COMPACT_TIMEOUT; i++) { + curr_mm_cid = rseq_current_mm_cid(); + printf_verbose("run %d: mm_cid=%d on cpu%d.\n", i, + curr_mm_cid, sched_getcpu()); + if (curr_mm_cid == 0) + exit(EXIT_SUCCESS); + usleep(RUNNER_PERIOD); + } + exit(EXIT_FAILURE); + } + printf_verbose("cpu%d has mm_cid=%d and is going to terminate.\n", + sched_getcpu(), curr_mm_cid); + pthread_exit(NULL); +} + +void test_mm_cid_compaction(void) +{ + cpu_set_t affinity; + int i, j, ret, num_threads; + pthread_t *tinfo; + pthread_mutex_t *token; + pthread_barrier_t *barrier; + struct thread_args *args; + + sched_getaffinity(0, sizeof(affinity), &affinity); + num_threads = CPU_COUNT(&affinity); + tinfo = calloc(num_threads, sizeof(*tinfo)); + if (!tinfo) { + perror("Error: failed to allocate tinfo"); + abort(); + } + args = calloc(num_threads, sizeof(*args)); + if (!args) { + perror("Error: failed to allocate args"); + abort(); + } + token = malloc(sizeof(*token)); + if (!token) { + perror("Error: failed to allocate token"); + abort(); + } + token = malloc(sizeof(*token)); + barrier = malloc(sizeof(*barrier)); + if (!barrier) { + perror("Error: failed to allocate barrier"); + abort(); + } + token = malloc(sizeof(*token)); + if (num_threads == 1) { + fprintf(stderr, "cannot test on a single cpu. " + "Skipping mm_cid_compaction test.\n"); + return; + } + pthread_mutex_init(token, NULL); + ret = pthread_barrier_init(barrier, NULL, num_threads); + if (ret) { + errno = ret; + perror("Error: failed to initialise barrier"); + abort(); + } + for (i = 0, j = 0; i < CPU_SETSIZE && j < num_threads; i++) { + if (!CPU_ISSET(i, &affinity)) + continue; + args[j].num_cpus = num_threads; + args[j].tinfo = tinfo; + args[j].token = token; + args[j].barrier = barrier; + args[j].cpu = i; + args[j].args_head = args; + if (!j) { + /* The first thread is the main one */ + tinfo[0] = pthread_self(); + ++j; + continue; + } + ret = pthread_create(&tinfo[j], NULL, thread_runner, &args[j]); + if (ret) { + errno = ret; + perror("Error: failed to create thread"); + abort(); + } + ++j; + } + printf_verbose("Started %d threads.\n", num_threads); + + /* Also main thread will terminate if it is not selected as leader */ + thread_runner(&args[0]); +} + +int main(int argc, char **argv) +{ + if (!rseq_mm_cid_available()) { + fprintf(stderr, "Error: rseq_mm_cid unavailable\n"); + return -1; + } + test_mm_cid_compaction(); + return 0; +}