From patchwork Fri Jul 24 10:16:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 51411 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by patches.linaro.org (Postfix) with ESMTPS id 5C15222D94 for ; Fri, 24 Jul 2015 10:17:44 +0000 (UTC) Received: by lbcjf8 with SMTP id jf8sf5958188lbc.0 for ; Fri, 24 Jul 2015 03:17:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=EF/P1qYE7l+Kaf/SFYDtH0toSAXW/DoZdMIGDNDLe60=; b=EO+gMznWUDeJLQ+77bf8U4MS2ONzrnCz2G7L/txoyqOnAHEmjzFxkf3zDxsTpPtZ1T hYzn461gtZXq1z2DkAzd9saznrKniv3PxCiQUb0FAxUfMZAcTCCpgqROxqtr6WNlvzhv p/vtM1f1pPKanTzTdVqC1Dg/0VcslJuC+4V21CXJ2aaUfzSeZ3IYI2X9GZA0RdEi+zy/ u//VgttlrMHruVfns99GPTK9QvJlPei+9RC62qsm/m22wRb44+9p3H5lk01nC94qemCG mdQAfaW8DRn01bKnC4wWBnCRW38knbImGoEvZm1mQeftvKyS2kSrw4FcdoH3ILE4n/8S 92Dw== X-Gm-Message-State: ALoCoQkuApSUurHeXVQtml2VbxGBC+frLTJ3fCpQW8kGNWaMoLGoEEwTW0LpIGk32RmTLv/kaEr8 X-Received: by 10.112.99.37 with SMTP id en5mr5839732lbb.7.1437733062942; Fri, 24 Jul 2015 03:17:42 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.39 with SMTP id b7ls340197lae.85.gmail; Fri, 24 Jul 2015 03:17:42 -0700 (PDT) X-Received: by 10.112.142.105 with SMTP id rv9mr12708869lbb.11.1437733062756; Fri, 24 Jul 2015 03:17:42 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id sv3si7105108lbc.111.2015.07.24.03.17.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jul 2015 03:17:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by lbbyj8 with SMTP id yj8so12208713lbb.0 for ; Fri, 24 Jul 2015 03:17:42 -0700 (PDT) X-Received: by 10.112.219.70 with SMTP id pm6mr12604487lbc.41.1437733062664; Fri, 24 Jul 2015 03:17:42 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp1075588lba; Fri, 24 Jul 2015 03:17:41 -0700 (PDT) X-Received: by 10.194.89.98 with SMTP id bn2mr27680785wjb.153.1437733061695; Fri, 24 Jul 2015 03:17:41 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id gn8si3438294wib.43.2015.07.24.03.17.41 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 24 Jul 2015 03:17:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:44376 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZIa2u-00060Y-3g for patch@linaro.org; Fri, 24 Jul 2015 06:17:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZIa1x-00059w-VM for qemu-devel@nongnu.org; Fri, 24 Jul 2015 06:16:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZIa1v-0000iG-21 for qemu-devel@nongnu.org; Fri, 24 Jul 2015 06:16:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42085) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZIa1u-0000i5-Tw for qemu-devel@nongnu.org; Fri, 24 Jul 2015 06:16:39 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 9C353BDD77; Fri, 24 Jul 2015 10:16:38 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t6OAGZf0001711; Fri, 24 Jul 2015 06:16:37 -0400 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 24 Jul 2015 12:16:22 +0200 Message-Id: <1437732994-20478-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1437732994-20478-1-git-send-email-pbonzini@redhat.com> References: <1437732994-20478-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell Subject: [Qemu-devel] [PULL 01/13] exec.c: Use atomic_rcu_read() to access dispatch in memory_region_section_get_iotlb() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: pbonzini@redhat.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Peter Maydell When accessing the dispatch pointer in an AddressSpace within an RCU critical section we should always use atomic_rcu_read(). Fix an access within memory_region_section_get_iotlb() which was incorrectly doing a direct pointer access. Signed-off-by: Peter Maydell Message-Id: <1437391637-31576-1-git-send-email-peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini --- exec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/exec.c b/exec.c index 7d60e15..0a4a0c5 100644 --- a/exec.c +++ b/exec.c @@ -954,7 +954,10 @@ hwaddr memory_region_section_get_iotlb(CPUState *cpu, iotlb |= PHYS_SECTION_ROM; } } else { - iotlb = section - section->address_space->dispatch->map.sections; + AddressSpaceDispatch *d; + + d = atomic_rcu_read(§ion->address_space->dispatch); + iotlb = section - d->map.sections; iotlb += xlat; }