From patchwork Fri Oct 26 09:25:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yasuaki Ishimatsu X-Patchwork-Id: 1650571 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 08961DF2F6 for ; Fri, 26 Oct 2012 09:26:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755931Ab2JZJ0U (ORCPT ); Fri, 26 Oct 2012 05:26:20 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:48018 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755914Ab2JZJ0T (ORCPT ); Fri, 26 Oct 2012 05:26:19 -0400 Received: from m1.gw.fujitsu.co.jp (unknown [10.0.50.71]) by fgwmail5.fujitsu.co.jp (Postfix) with ESMTP id 135D63EE0AE; Fri, 26 Oct 2012 18:26:17 +0900 (JST) Received: from smail (m1 [127.0.0.1]) by outgoing.m1.gw.fujitsu.co.jp (Postfix) with ESMTP id E8D9A45DE5B; Fri, 26 Oct 2012 18:26:16 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (s1.gw.fujitsu.co.jp [10.0.50.91]) by m1.gw.fujitsu.co.jp (Postfix) with ESMTP id CB45A45DE5A; Fri, 26 Oct 2012 18:26:16 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id AF4B01DB8056; Fri, 26 Oct 2012 18:26:16 +0900 (JST) Received: from g01jpexchyt31.g01.fujitsu.local (g01jpexchyt31.g01.fujitsu.local [10.128.193.114]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 56B9C1DB8042; Fri, 26 Oct 2012 18:26:16 +0900 (JST) Received: from [127.0.0.1] (10.124.101.33) by g01jpexchyt31.g01.fujitsu.local (10.128.193.114) with Microsoft SMTP Server id 14.2.309.2; Fri, 26 Oct 2012 18:26:10 +0900 X-SecurityPolicyCheck: OK by SHieldMailChecker v1.7.4 Message-ID: <508A5716.1090509@jp.fujitsu.com> Date: Fri, 26 Oct 2012 18:25:42 +0900 From: Yasuaki Ishimatsu User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:16.0) Gecko/20121010 Thunderbird/16.0.1 MIME-Version: 1.0 To: "Rafael J. Wysocki" CC: , , , , Subject: [PATCH v2 1/2] acpi : cpu hot-remove returns error when cpu_down() fails References: <50657D92.3010106@jp.fujitsu.com> <4180255.BSUqs0l2F5@vostro.rjw.lan> <5080D9AA.8070801@jp.fujitsu.com> In-Reply-To: <5080D9AA.8070801@jp.fujitsu.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org v1 -> v2 - update Rafael's comment. >> static int acpi_processor_handle_eject(struct acpi_processor *pr) >> { >> - if (cpu_online(pr->id)) >> - cpu_down(pr->id); >> + int ret = 0; >> + >> + if (cpu_online(pr->id)) { >> + ret = cpu_down(pr->id); > > If you defined ret here ... > >> + if (ret) >> + return ret; >> + } >> >> arch_unregister_cpu(pr->id); >> acpi_unmap_lsapic(pr->id); >> - return (0); >> + return ret; > > ... this line wouldn't need to be changed. --- Even if cpu_down() fails, acpi_processor_remove() continues to remove the cpu. But in this case, it should return error number since some process may run on the cpu. If the cpu has a running process and the cpu is turned the power off, the system may not work well. Reviewed-by: Srivatsa S. Bhat Reviewed-by: Toshi Kani Signed-off-by: Yasuaki Ishimatsu --- drivers/acpi/processor_driver.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-3.7-rc2/drivers/acpi/processor_driver.c =================================================================== --- linux-3.7-rc2.orig/drivers/acpi/processor_driver.c 2012-10-21 04:11:32.000000000 +0900 +++ linux-3.7-rc2/drivers/acpi/processor_driver.c 2012-10-26 18:15:43.721665836 +0900 @@ -605,7 +605,7 @@ err_free_pr: static int acpi_processor_remove(struct acpi_device *device, int type) { struct acpi_processor *pr = NULL; - + int ret; if (!device || !acpi_driver_data(device)) return -EINVAL; @@ -616,8 +616,9 @@ static int acpi_processor_remove(struct goto free; if (type == ACPI_BUS_REMOVAL_EJECT) { - if (acpi_processor_handle_eject(pr)) - return -EINVAL; + ret = acpi_processor_handle_eject(pr); + if (ret) + return ret; } acpi_processor_power_exit(pr); @@ -848,8 +849,13 @@ static acpi_status acpi_processor_hotadd static int acpi_processor_handle_eject(struct acpi_processor *pr) { - if (cpu_online(pr->id)) - cpu_down(pr->id); + int ret = 0; + + if (cpu_online(pr->id)) { + ret = cpu_down(pr->id); + if (ret) + return ret; + } arch_unregister_cpu(pr->id); acpi_unmap_lsapic(pr->id);