From patchwork Thu Apr 27 21:10:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Bulekov X-Patchwork-Id: 1774635 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bu.edu header.i=@bu.edu header.a=rsa-sha256 header.s=s1gsbu header.b=YSJAwvgb; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q6pNc4ynQz23vH for ; Fri, 28 Apr 2023 07:12:48 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ps8tL-0005wu-AG; Thu, 27 Apr 2023 17:11:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ps8tJ-0005wD-I5 for qemu-devel@nongnu.org; Thu, 27 Apr 2023 17:11:01 -0400 Received: from esa6.hc2706-39.iphmx.com ([216.71.137.79]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ps8tI-0005Ov-22 for qemu-devel@nongnu.org; Thu, 27 Apr 2023 17:11:01 -0400 X-IronPort-RemoteIP: 209.85.160.197 X-IronPort-MID: 279189031 X-IronPort-Reputation: None X-IronPort-Listener: OutgoingMail X-IronPort-SenderGroup: RELAY_GSUITE X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:NWQ9OatJlLyuki7FmAlnZjIIHOfnVO9cMUV32f8akzHdYApBsoF/q tZmKT3SbvvbM2HxeookPN/n9E4C7cCDz95nS1Rlqn1kHnwR9ZOVVN+UEBzMMnLJJKUvbq7GA +byyDXkBJppJpMJjk71atANlVEliefTAOK6ULWeUsxIbVcMYD87jh5+kPIOjIdtgNyoayuAo tq3qMDEULOf82cc3lk8tuTS+XuDgNyo4GlD5gBkOqgQ1LPjvyJ94Kw3dPnZw0TQH9E88t6SH 47r0Ly/92XFyBYhYvvNfmHTKxBirhb6ZGBiu1IPM0SQqkEqSh8ai87XAMEhhXJ/0F1lqTzQJ OJl7vRcQS9xVkHFdX90vxNwSkmSNoUfkFPLzOTWXWV+ACQqflO1q8iCAn3aMqU34PZ4CkVp5 cZFFxAEaQu8v8WYyZuCH7wEasQLdKEHPasas3BkiCjFVLMoGMGcBarN4tBc0XE7gcUm8fT2P ZJIL2oyKk2eO1sWawh/5JEWxY9EglH2dy1epEi9r7dx7mTOpOB0+OKyYYOFK4TRHK25mG6Su U/Lr07EOi1DJfOuzh+C43eOi9L2yHaTtIU6UefQGuRRqESew3FWBBAIWF+Tp/6/hUijHdVFJ CQpFjEGqKEz8AmyUoC4UUTp/ziLuRkTX9cWGOo/gO2Q9pfpD8+iLjBsZlZ8hBYO75FeqeACv rNRo+7UOA== IronPort-HdrOrdr: A9a23:0y2CWageyocUg78Kg6URRATF4HBQXgwji2hC6mlwRA09TyVXrb HLoB19726JtN91YhsdcL+7Sc+9qB/nhPxICMwqTMyftWrdyRaVxf9ZnPLfKlTbckWUh41gPO VbAtJD4bXLbWSS5vyKhzVQfexQpeWvweSDqd2b4U1QbTxHXYld0iYRMHflLqS0fmV77FgCea Z0KvAom9PZQwVuUi1zPBZlY9T+ X-Talos-CUID: 9a23:Y/Yitm7s+1NR90DwZtss21QEFcsBVW3nkUjwKkijNl5OZrS8cArF X-Talos-MUID: 9a23:y0solQsOaw4xytAJdM2nji5POZdC3pySUVEioJIjvNiBFyFNAmLI Received: from mail-qt1-f197.google.com ([209.85.160.197]) by ob1.hc2706-39.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 27 Apr 2023 17:10:49 -0400 Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-3ef3fc80bb6so103868531cf.1 for ; Thu, 27 Apr 2023 14:10:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bu.edu; s=s1gsbu; t=1682629848; x=1685221848; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=68oaiYGL7UhG3W5jva6oSZ0GIeZDrcn2k6P7uHwGxlY=; b=YSJAwvgbkH9fCZCzgmtIGlAln585VR2jxmWRALT8Yi2/XojQ5qUBmUfQEzau/aCnEK 7DCedm+QrBtV8fCgFzEBNcckbrbiaGOzt7ihuhMcFBsWIuVhuNq4x9thhQST/QW/mWbR 5sdJ0Ydw8YVaTPhpoBKMYZfOedNPehCOATEndJ2fmVdQDYcTrHzryH0sp4dZwvUgDjNK u9XAsGMywpSbUoVvtSIf7QqAPMLp85ZkX1/yuZsdo0j7phkruWM7ZjL5KfmffM7Cjw0b WwKizpYWu4jEYS4o8XqazzJoMXFZeYbZhLSdZQc6Bs+HQsSSwm04Gaaqyl5V6sbvYP6C AnCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682629848; x=1685221848; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=68oaiYGL7UhG3W5jva6oSZ0GIeZDrcn2k6P7uHwGxlY=; b=adMb1cepxVE144y9Xzi56+dSBgLJ1tk8vfCacMYy4ya6YCNJXzR4XQ8ZBmFSz8+3Or KuoRT6Ot4VstozyBvMM8UL2IROUPQHmaATNvNgZffurNq6GscbAmbt2n8DLjRKltGoOr 5YYjX/F2JNmR2JsR41+jLYrpN0vuWNg2JsSSknw/E1t8jdQz3GDZ8kW3UrcTl24wNHfU k8j35JoBusxM68sAXFeBnYOdlDXxCpcn4Z9tifZBaaBfKRVTUpVd/8Bif802HoF4Osd9 t4sRd9K+wrx2q7Q53GrlxfQiMP/NbAUQxk1QTjOxFlJxhg1W/4h+vPVIegaSJ11nuO/y Fg1Q== X-Gm-Message-State: AC+VfDzDnTPNIOs5iiAcmbuGLj5us/qV3tF9uD4iESB/w/gzt8gJYvJo rrz/fLdJX1cVhdztPG7DAvD2zmZhgNwig/9MWZMhlKVdaD33rPUgcu36O5CC5+BGA72mF3fxfy/ sfmgHbgtF1QDgE+Z/2bNjyERarmgp3mbcl0Rl5hzUc08= X-Received: by 2002:a05:622a:649:b0:3ef:3bad:6d24 with SMTP id a9-20020a05622a064900b003ef3bad6d24mr4087797qtb.47.1682629848454; Thu, 27 Apr 2023 14:10:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6wcIS9ZrvhiadDC7X/QUy+vREYVt3Z6AlKXrwXCOzQvwDK1XzR/bvOsR0KVROqeeeemzrb7g== X-Received: by 2002:a05:622a:649:b0:3ef:3bad:6d24 with SMTP id a9-20020a05622a064900b003ef3bad6d24mr4087748qtb.47.1682629848140; Thu, 27 Apr 2023 14:10:48 -0700 (PDT) Received: from mozz.bu.edu (mozz.bu.edu. [128.197.127.33]) by smtp.gmail.com with ESMTPSA id z16-20020a05620a08d000b0074acaeeb7c3sm6204862qkz.91.2023.04.27.14.10.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Apr 2023 14:10:47 -0700 (PDT) From: Alexander Bulekov To: qemu-devel@nongnu.org Cc: Alexander Bulekov , Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Mauro Matteo Cascella , Peter Xu , Jason Wang , David Hildenbrand , Gerd Hoffmann , Thomas Huth , Laurent Vivier , Bandan Das , "Edgar E . Iglesias" , Darren Kenny , Bin Meng , Paolo Bonzini , "Michael S . Tsirkin" , Marcel Apfelbaum , =?utf-8?q?Daniel_P_=2E_Berra?= =?utf-8?q?ng=C3=A9?= , Eduardo Habkost , Jon Maloy , Siqi Chen , Michael Tokarev , =?utf-8?q?Herv=C3=A9_Poussineau?= , qemu-ppc@nongnu.org (open list:PReP) Subject: [PATCH v10 7/8] raven: disable reentrancy detection for iomem Date: Thu, 27 Apr 2023 17:10:12 -0400 Message-Id: <20230427211013.2994127-8-alxndr@bu.edu> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230427211013.2994127-1-alxndr@bu.edu> References: <20230427211013.2994127-1-alxndr@bu.edu> MIME-Version: 1.0 X-CES-GSUITE_AUTH: bf3aNvsZpxl8 Received-SPF: pass client-ip=216.71.137.79; envelope-from=alxndr@bu.edu; helo=esa6.hc2706-39.iphmx.com X-Spam_score_int: -7 X-Spam_score: -0.8 X-Spam_bar: / X-Spam_report: (-0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HK_RANDOM_ENVFROM=0.266, HK_RANDOM_FROM=0.999, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org As the code is designed for re-entrant calls from raven_io_ops to pci-conf, mark raven_io_ops as reentrancy-safe. Signed-off-by: Alexander Bulekov Reviewed-by: Darren Kenny --- hw/pci-host/raven.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c index 072ffe3c5e..9a11ac4b2b 100644 --- a/hw/pci-host/raven.c +++ b/hw/pci-host/raven.c @@ -294,6 +294,13 @@ static void raven_pcihost_initfn(Object *obj) memory_region_init(&s->pci_memory, obj, "pci-memory", 0x3f000000); address_space_init(&s->pci_io_as, &s->pci_io, "raven-io"); + /* + * Raven's raven_io_ops use the address-space API to access pci-conf-idx + * (which is also owned by the raven device). As such, mark the + * pci_io_non_contiguous as re-entrancy safe. + */ + s->pci_io_non_contiguous.disable_reentrancy_guard = true; + /* CPU address space */ memory_region_add_subregion(address_space_mem, PCI_IO_BASE_ADDR, &s->pci_io);