From patchwork Tue Jan 14 17:51:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentin Schneider X-Patchwork-Id: 13939214 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 41607E77188 for ; Tue, 14 Jan 2025 18:02:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C5BB7280013; Tue, 14 Jan 2025 13:02:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C0A6828000C; Tue, 14 Jan 2025 13:02:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A5CAF280013; Tue, 14 Jan 2025 13:02:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 8771A28000C for ; Tue, 14 Jan 2025 13:02:07 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 30330120C02 for ; Tue, 14 Jan 2025 18:02:07 +0000 (UTC) X-FDA: 83006826294.22.962B879 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf06.hostedemail.com (Postfix) with ESMTP id 63CB8180017 for ; Tue, 14 Jan 2025 18:02:05 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cMdqYwt4; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf06.hostedemail.com: domain of vschneid@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=vschneid@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736877725; a=rsa-sha256; cv=none; b=WegrqoYU4TJQ6wZrlkGe4BHgfiYWwCQAZUZJZcUFi8z6obyA6FTF2l8fr40j59z8Pltvo9 hni2Gx/znA6nqMdyQ51+mYgJ/RvK6GsVbXzYPrc4AV7Fb2M9J8jVh2PsgArcFMmea3tgKC YRZ2+yp3IqyPzkwa20RuRbyBYJqjGY4= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cMdqYwt4; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf06.hostedemail.com: domain of vschneid@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=vschneid@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1736877725; 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=KdPtt6PQsN+ylVvy58F0NcuUnOqkUWc+oSjD61c8P1k=; b=TYopI5gtdEUSi9vhSz65eX980wTRi6rSMJ6FHFcBNvje5wUwdiGbK7zERexRpoPhT0Ohzm NLCO/qZ9pGzv6Oxr2dHrWHMZFJftgZKrMDS8Hlq6O6F54adCZAtwgUTrG2nIkkHOEeZr+y UT7MDHXIufBvcer/pvJgp7EJgxWykv4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736877724; 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=KdPtt6PQsN+ylVvy58F0NcuUnOqkUWc+oSjD61c8P1k=; b=cMdqYwt4pG7JtjxWcu40hBioQpioNdZv0ASsFz3bTteZMVEe6o1s4NSLZxdXGwyzvluzK4 wuM52AqqZ2MD/l+1mODWoz8NJNAbDsEf7JCRXW/2xFCuMgpFONs/IVEQAyhg6vpWT95ONO r0GE5T5BS1pL/6n59EscIxNdZFvW668= Received: from mx-prod-mc-05.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-518-cs0jRgydMTW_3xbdYVeS2w-1; Tue, 14 Jan 2025 13:02:03 -0500 X-MC-Unique: cs0jRgydMTW_3xbdYVeS2w-1 X-Mimecast-MFC-AGG-ID: cs0jRgydMTW_3xbdYVeS2w 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E1CD319772CA; Tue, 14 Jan 2025 18:01:45 +0000 (UTC) Received: from vschneid-thinkpadt14sgen2i.remote.csb (unknown [10.39.192.55]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8F01A195E3EA; Tue, 14 Jan 2025 18:01:23 +0000 (UTC) From: Valentin Schneider To: linux-kernel@vger.kernel.org, x86@kernel.org, virtualization@lists.linux.dev, linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linux-riscv@lists.infradead.org, linux-perf-users@vger.kernel.org, xen-devel@lists.xenproject.org, kvm@vger.kernel.org, linux-arch@vger.kernel.org, rcu@vger.kernel.org, linux-hardening@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, bpf@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com Cc: Juergen Gross , Ajay Kaher , Alexey Makhalov , Russell King , Catalin Marinas , Will Deacon , Huacai Chen , WANG Xuerui , Paul Walmsley , Palmer Dabbelt , Albert Ou , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Peter Zijlstra , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , Boris Ostrovsky , Josh Poimboeuf , Pawan Gupta , Sean Christopherson , Paolo Bonzini , Andy Lutomirski , Arnd Bergmann , Frederic Weisbecker , "Paul E. McKenney" , Jason Baron , Steven Rostedt , Ard Biesheuvel , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Boqun Feng , Uladzislau Rezki , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Juri Lelli , Clark Williams , Yair Podemsky , Tomas Glozar , Vincent Guittot , Dietmar Eggemann , Ben Segall , Mel Gorman , Kees Cook , Andrew Morton , Christoph Hellwig , Shuah Khan , Sami Tolvanen , Miguel Ojeda , Alice Ryhl , "Mike Rapoport (Microsoft)" , Samuel Holland , Rong Xu , Nicolas Saenz Julienne , Geert Uytterhoeven , Yosry Ahmed , "Kirill A. Shutemov" , "Masami Hiramatsu (Google)" , Jinghao Jia , Luis Chamberlain , Randy Dunlap , Tiezhu Yang Subject: [PATCH v4 21/30] context_tracking: Explicitely use CT_STATE_KERNEL where it is missing Date: Tue, 14 Jan 2025 18:51:34 +0100 Message-ID: <20250114175143.81438-22-vschneid@redhat.com> In-Reply-To: <20250114175143.81438-1-vschneid@redhat.com> References: <20250114175143.81438-1-vschneid@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Stat-Signature: h94jozqnm33jz91538chuozwq41tee7u X-Rspam-User: X-Rspamd-Queue-Id: 63CB8180017 X-Rspamd-Server: rspam08 X-HE-Tag: 1736877725-368131 X-HE-Meta: U2FsdGVkX1+3TJ/lX8ONXAKZr+l528JsoB6+4MpunlbUyePVVMpNP7WNIUUqOd7Qy/zsPNslyXfj2/3EYcMIyORJWTAsnh2LuecdKKubykjw4NCtPncHLA2ZGeO7lawt/U2FXrT2Zanp9c3doIvn0F36taX5XjPSPL/PuI29XIf2SxKA8r5T6M+avOLKIb6i5JjV8U3HtIK4DHylUBXy0v7SugY9d3ubQ9/p1aXpBSgcNP0lxTCYoMSKZ1fKWOUXA2pXQii0IoL1UolY5Yu72igLwmPOb72GD8VKf5zLvvHs/CC7nprBCZzIwqK0fMHLDbLyW4cTfJQtsClC5MCBE4D9AsMFiLUd7/UdWH1mu32Pmi7jU/V7KLMjjlDu1wYoDSxUYD6XgPq5pSBKpcFZs4qc9E6Bi3FADxTRhZGe4OUMcCsGrzr46EUS34J+53ZJnC8BluRKBV/duLmCwR5iyrvkUgMKPW0hWZCgOMAFgGPD1yfFnQc4bUTFLUd/WDwe3zUq+ukzeQMRvJAJSIhPKl7e7inisyrdtZTgFeQKnGATwtOueI99Ib9YoOdQJjxWfzKE97tGvqwlkFrfv9uBJ7wQ6aacg3GAbGdTLjW6Y6xdogUe6VS5iXobszaEyFytY/mCUKMKTUl+hTiVpPeoB2mGm32M/AqziYOesRwxmnTBvGZsn61go5INTv3SBDIX0LxV9iH+vZAqFAG719QZaRL/v57JgbVdd6gX/oL3WNT6ChXD+dgbU++JSlhzY6M6KOPhhzGUQKaAWq3o0tA227xpMOAbR4r5a+UJqQ7SpvcFDAmiq4Aw8suPN8H4jWLQ/u710YwRzA3ZUF48oFez5/OeYe/dfu1npHLQKHjsOokU0TOgN4C02mUx3jPfSIzCJoHiMVFIbjomPJsx2v00MhW1bJ7hFAvwAZ75pWO2PIIfdNP+PYlHT9MsnlXp1pKRUKJPXgcybEHeZerIApP JWBZL+/v nrbTTIoY5pN1LAh6C8z0AQTrmUyJs59zHtzObdrlzpZYjeiGSs8cgOFeK/OK7dQIlS+KFTqNlcpLDR/b5jWpzExi6HHWAtw0AVgRPOoTFIGplg9BAIkavXmi6jvFbR7MSjIU6QKdvAidTPnpPTQ4CAWjFTnYL+ybKO36mns2dp8KV3vLPH5OQiUwTjI077i/FbGGytVHO8Hggd9iFKKW4QZV2shtnI96BJKLP0FyQzLbrPduMz3JnMQkol2bt3FMs5cwBEvqxZrE7cu4AtQGYykC/ox0kKcTTC9jHLDmiAKwzTR0NCc5mqaXbuPb7DtuV4534WqB1pBOdaNrBtiVyIn9CpvhNm2tXyrtkEQh36y46POjg5xg4Hbhio6KsjaIFi8ponxeEngM346P/Tglh2/ZSkZ/57Q/wKV8TvcIZj7gd/o9Jvmx3NYTiN3t5fEdAmsq8Bk/C60474ddVz8yoCw/czA== 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: CT_STATE_KERNEL being zero means it can be (and is) omitted in a handful of places. A later patch will change CT_STATE_KERNEL into a non-zero value, prepare that by using it where it should be: o In the initial CT state o At kernel entry / exit No change in functionality intended. Signed-off-by: Valentin Schneider --- kernel/context_tracking.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c index 938c48952d265..a61498a8425e2 100644 --- a/kernel/context_tracking.c +++ b/kernel/context_tracking.c @@ -31,7 +31,7 @@ DEFINE_PER_CPU(struct context_tracking, context_tracking) = { .nesting = 1, .nmi_nesting = CT_NESTING_IRQ_NONIDLE, #endif - .state = ATOMIC_INIT(CT_RCU_WATCHING), + .state = ATOMIC_INIT(CT_RCU_WATCHING | CT_STATE_KERNEL), }; EXPORT_SYMBOL_GPL(context_tracking); @@ -147,7 +147,7 @@ static void noinstr ct_kernel_exit(bool user, int offset) instrumentation_end(); WRITE_ONCE(ct->nesting, 0); /* Avoid irq-access tearing. */ // RCU is watching here ... - ct_kernel_exit_state(offset); + ct_kernel_exit_state(offset - CT_STATE_KERNEL); // ... but is no longer watching here. rcu_task_exit(); } @@ -175,7 +175,7 @@ static void noinstr ct_kernel_enter(bool user, int offset) } rcu_task_enter(); // RCU is not watching here ... - ct_kernel_enter_state(offset); + ct_kernel_enter_state(offset + CT_STATE_KERNEL); // ... but is watching here. instrumentation_begin(); @@ -537,7 +537,7 @@ void noinstr __ct_user_enter(enum ctx_state state) * RCU only requires CT_RCU_WATCHING increments to be fully * ordered. */ - raw_atomic_add(state, &ct->state); + raw_atomic_add(state - CT_STATE_KERNEL, &ct->state); } } } @@ -647,7 +647,7 @@ void noinstr __ct_user_exit(enum ctx_state state) * RCU only requires CT_RCU_WATCHING increments to be fully * ordered. */ - raw_atomic_sub(state, &ct->state); + raw_atomic_sub(state - CT_STATE_KERNEL, &ct->state); } } }