From patchwork Sun Apr 3 10:38:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Education Directorate X-Patchwork-Id: 8733971 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4A5759F36E for ; Sun, 3 Apr 2016 10:38:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7F7812017D for ; Sun, 3 Apr 2016 10:38:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A5B05200E8 for ; Sun, 3 Apr 2016 10:38:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752674AbcDCKiL (ORCPT ); Sun, 3 Apr 2016 06:38:11 -0400 Received: from mail-pf0-f176.google.com ([209.85.192.176]:35805 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752138AbcDCKiK (ORCPT ); Sun, 3 Apr 2016 06:38:10 -0400 Received: by mail-pf0-f176.google.com with SMTP id n1so18618343pfn.2 for ; Sun, 03 Apr 2016 03:38:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=C5gTqKHg19pjj0WDN4Qd2FxjJZFB13tNPME+eoxvQLM=; b=Sc+6cXOqSvP0kDISeIHg7CDwWIbFfQESvQEF3PcBlL8CDkfXV93QQNyfxun0KSHRnh WkFZ3TnKZP1JfOU2gKPZEPHdzjha8lWLnDzAn1aCG6yNKuTgh3DQKUcSFHinf7UjKZ0E ATPP3PNMpXZ64dNvb7FhpXLxvN5IA49qZsShjQaPNeVIAV9Zp2pZ1/98gTvfZv3QG5bq GPr6MQ9lWifXr/EKSrlk0frKPXEojAbZYvD84E6rHG86jEbeBKNC82NM4nluTRUT40tB v6WH1b/cipZikO27qyKRTedYzwVD+lc5kVb5YO4+OcYMxc+iVXAp73Cyi/7Z7sQE6m35 8UVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=C5gTqKHg19pjj0WDN4Qd2FxjJZFB13tNPME+eoxvQLM=; b=jDBcv6H0KTn7GtBacNY0qs3F/gn2V/4Ju/omKm3uOmqZiu4sBK+RZTCLOjqfrrNSif Wy/ZFZbBxGKB9uKoGaBxuXnjdfAbRBLemFQUxsYaXrkowY0dMU/UE/uc6E6AgdfOE4cj SlZEUqX9UX7DdqmMTXRwKM5e+UsFR9Pb4SE8kdjZS8pNVV+jK9DI6IUYgnhVVY/T1853 PsPBMkJ32lJkrBuQ5BbIiqzlOMpNCZ4IsZNoIIVhnjcTBriQ+Nk8CxJ1HQuSw1xUeQHm UvBpzwOeFqSm/m3jnis54NMMaj9Obux3Bv0eULdLXuOtx0TCbb/uBj5Bb5pF9CaW8gWu x2ig== X-Gm-Message-State: AD7BkJIYDjd3KV4r1GOT7kqO7kY6Oh0N21EL/ISb3nX49OmV54hR8Lb62ECQoo+beD70NA== X-Received: by 10.98.14.207 with SMTP id 76mr12048277pfo.1.1459679889235; Sun, 03 Apr 2016 03:38:09 -0700 (PDT) Received: from cotter.ozlabs.ibm.com (14-202-194-140.static.tpgi.com.au. [14.202.194.140]) by smtp.gmail.com with ESMTPSA id v74sm31962371pfa.7.2016.04.03.03.38.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Apr 2016 03:38:07 -0700 (PDT) Received: by cotter.ozlabs.ibm.com (Postfix, from userid 1000) id E80E7C0102; Sun, 3 Apr 2016 20:38:03 +1000 (AEST) From: Balbir Singh To: will.deacon@arm.com, kvm@vger.kernel.org Cc: mpe@ellerman.id.au, mikey@neuling.org, aik@ozlabs.ru, Balbir Singh Subject: [KVMTOOL][PATCH 4/5] Fix a race during exit processing Date: Sun, 3 Apr 2016 20:38:01 +1000 Message-Id: <1459679882-30382-5-git-send-email-bsingharora@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1459679882-30382-1-git-send-email-bsingharora@gmail.com> References: <1459679882-30382-1-git-send-email-bsingharora@gmail.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Fix a race, described below lkvm stop ... handle_stop kvm_cpu__reboot kvm_cmd_run_exit vcpus exit ... dev_exit ... ioport__unregister ..serial... kvm__pause --> br_write_lock pthread_kill But the thread is already dead above. We mark the cpus as dying so that kvm_pause does nothing. This should not break any semantics Signed-off-by: Balbir Singh Acked-by: Michael Ellerman --- builtin-run.c | 3 +++ kvm.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/builtin-run.c b/builtin-run.c index 17b1428..cdc7158 100644 --- a/builtin-run.c +++ b/builtin-run.c @@ -58,6 +58,7 @@ __thread struct kvm_cpu *current_kvm_cpu; static int kvm_run_wrapper; bool do_debug_print = false; +int kvm_cmd_exit; static const char * const run_usage[] = { "lkvm run [] []", @@ -648,6 +649,7 @@ static void kvm_cmd_run_exit(struct kvm *kvm, int guest_ret) { compat__print_all_messages(); + kvm_cmd_exit = 1; init_list__exit(kvm); if (guest_ret == 0 && do_debug_print) @@ -659,6 +661,7 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) int ret = -EFAULT; struct kvm *kvm; + kvm_cmd_exit = 0; kvm = kvm_cmd_run_init(argc, argv); if (IS_ERR(kvm)) return PTR_ERR(kvm); diff --git a/kvm.c b/kvm.c index 1081072..53cf0e2 100644 --- a/kvm.c +++ b/kvm.c @@ -33,6 +33,8 @@ #define DEFINE_KVM_EXIT_REASON(reason) [reason] = #reason +extern int kvm_cmd_exit; + const char *kvm_exit_reasons[] = { DEFINE_KVM_EXIT_REASON(KVM_EXIT_UNKNOWN), DEFINE_KVM_EXIT_REASON(KVM_EXIT_EXCEPTION), @@ -435,6 +437,9 @@ void kvm__pause(struct kvm *kvm) if (!kvm->cpus[0] || kvm->cpus[0]->thread == 0) return; + if (kvm_cmd_exit) + return; + mutex_lock(&pause_lock); pause_event = eventfd(0, 0);