From patchwork Mon Nov 10 19:37:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Cohen X-Patchwork-Id: 5268861 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6AFDFC11AC for ; Mon, 10 Nov 2014 19:40:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 67F4C2011D for ; Mon, 10 Nov 2014 19:40:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 616512010E for ; Mon, 10 Nov 2014 19:40:08 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xnumg-0003Z7-Rk; Mon, 10 Nov 2014 19:37:54 +0000 Received: from mx1.redhat.com ([209.132.183.28]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xnumd-0003Te-Mr for linux-arm-kernel@lists.infradead.org; Mon, 10 Nov 2014 19:37:52 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAAJbO3q030337 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 10 Nov 2014 14:37:24 -0500 Received: from [10.13.129.24] (dhcp129-24.rdu.redhat.com [10.13.129.24]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sAAJbO19014588; Mon, 10 Nov 2014 14:37:24 -0500 Message-ID: <546113F4.1050304@redhat.com> Date: Mon, 10 Nov 2014 14:37:24 -0500 From: William Cohen User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Will Deacon Subject: Re: [PATCH] Correct the race condition in aarch64_insn_patch_text_sync() References: <1415637362-30754-1-git-send-email-wcohen@redhat.com> <20141110170846.GH23942@arm.com> In-Reply-To: <20141110170846.GH23942@arm.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141110_113751_792796_8711049E X-CRM114-Status: GOOD ( 27.96 ) X-Spam-Score: -5.6 (-----) Cc: Catalin Marinas , "dave.long@linaro.org" , "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 11/10/2014 12:08 PM, Will Deacon wrote: > Hi Will, > > Thanks for the tracking this down. > > On Mon, Nov 10, 2014 at 04:36:02PM +0000, William Cohen wrote: >> When experimenting with patches to provide kprobes support for aarch64 >> smp machines would hang when inserting breakpoints into kernel code. >> The hangs were caused by a race condition in the code called by >> aarch64_insn_patch_text_sync(). The first processor in the >> aarch64_insn_patch_text_cb() function would patch the code while other >> processors were still entering the function and decrementing the > > s/decrementing/incrementing/ > >> cpu_count field. This resulted in some processors never observing the >> exit condition and exiting the function. Thus, processors in the >> system hung. >> >> The patching function now waits for all processors to enter the >> patching function before changing code to ensure that none of the >> processors are in code that is going to be patched. Once all the >> processors have entered the function, the last processor to enter the >> patching function performs the pathing and signals that the patching >> is complete with one last decrement of the cpu_count field to make it >> -1. >> >> Signed-off-by: William Cohen >> --- >> arch/arm64/kernel/insn.c | 10 +++++++--- >> 1 file changed, 7 insertions(+), 3 deletions(-) >> >> diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c >> index e007714..e6266db 100644 >> --- a/arch/arm64/kernel/insn.c >> +++ b/arch/arm64/kernel/insn.c >> @@ -153,8 +153,10 @@ static int __kprobes aarch64_insn_patch_text_cb(void *arg) >> int i, ret = 0; >> struct aarch64_insn_patch *pp = arg; >> >> - /* The first CPU becomes master */ >> - if (atomic_inc_return(&pp->cpu_count) == 1) { >> + /* Make sure all the processors are in this functionaarch64_insn_patch_text_cb( >> + before patching the code. The last CPU to this function >> + does the update. */ >> + if (atomic_dec_return(&pp->cpu_count) == 0) { >> for (i = 0; ret == 0 && i < pp->insn_cnt; i++) >> ret = aarch64_insn_patch_text_nosync(pp->text_addrs[i], >> pp->new_insns[i]); >> @@ -163,7 +165,8 @@ static int __kprobes aarch64_insn_patch_text_cb(void *arg) >> * which ends with "dsb; isb" pair guaranteeing global >> * visibility. >> */ >> - atomic_set(&pp->cpu_count, -1); >> + /* Notifiy other processors with an additional decrement. */ >> + atomic_dec(&pp->cpu_count); >> } else { >> while (atomic_read(&pp->cpu_count) != -1) >> cpu_relax(); >> @@ -185,6 +188,7 @@ int __kprobes aarch64_insn_patch_text_sync(void *addrs[], u32 insns[], int cnt) >> if (cnt <= 0) >> return -EINVAL; >> >> + atomic_set(&patch.cpu_count, num_online_cpus()); > > I think this is still racy with hotplug before stop_machine has done > get_online_cpus. How about we leave the increment in the callback and change > the exit condition to compare with num_online_cpus() instead? > > Cheers, > > Will > Hi Will, Thanks for the feedback. I am no expert in the corner cases involved with hotplug. Dave Long suggested something similar with num_online_cpus in the arch64_insn_patch_text_cb() and using increments and checking the num_cpus_online() inside aarch64_insn_patch_text_cb(). Moving the num_cpu_online() inside the aarch64_insn_patch_text_cb() is sufficient to avoid race conditions with hotplug? If so, would the attached patch be appropriate? -Will Cohen From d02e3244c436234d0d07500be6d4df64feb2052a Mon Sep 17 00:00:00 2001 From: William Cohen Date: Mon, 10 Nov 2014 14:26:44 -0500 Subject: [PATCH] Correct the race condition in aarch64_insn_patch_text_sync() When experimenting with patches to provide kprobes support for aarch64 smp machines would hang when inserting breakpoints into kernel code. The hangs were caused by a race condition in the code called by aarch64_insn_patch_text_sync(). The first processor in the aarch64_insn_patch_text_cb() function would patch the code while other processors were still entering the function and incrementing the cpu_count field. This resulted in some processors never observing the exit condition and exiting the function. Thus, processors in the system hung. The patching function now waits for all processors to enter the patching function before changing code to ensure that none of the processors are in code that is going to be patched. Once all the processors have entered the function, the last processor to enter the patching function performs the patching and signals that the patching is complete with one last increment of the cpu_count field to make it num_cpus_online()+1. Signed-off-by: William Cohen --- arch/arm64/kernel/insn.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c index e007714..4fdddf1 100644 --- a/arch/arm64/kernel/insn.c +++ b/arch/arm64/kernel/insn.c @@ -151,10 +151,13 @@ struct aarch64_insn_patch { static int __kprobes aarch64_insn_patch_text_cb(void *arg) { int i, ret = 0; + int count = num_online_cpus(); struct aarch64_insn_patch *pp = arg; - /* The first CPU becomes master */ - if (atomic_inc_return(&pp->cpu_count) == 1) { + /* Make sure all the processors are in this function + before patching the code. The last CPU to this function + does the update. */ + if (atomic_inc_return(&pp->cpu_count) == count) { for (i = 0; ret == 0 && i < pp->insn_cnt; i++) ret = aarch64_insn_patch_text_nosync(pp->text_addrs[i], pp->new_insns[i]); @@ -163,9 +166,10 @@ static int __kprobes aarch64_insn_patch_text_cb(void *arg) * which ends with "dsb; isb" pair guaranteeing global * visibility. */ - atomic_set(&pp->cpu_count, -1); + /* Notifiy other processors with an additional increment. */ + atomic_inc(&pp->cpu_count); } else { - while (atomic_read(&pp->cpu_count) != -1) + while (atomic_read(&pp->cpu_count) <= count) cpu_relax(); isb(); } -- 1.8.3.1