From nobody Mon Feb 9 11:08:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@amazon.de; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=amazon.de ARC-Seal: i=1; a=rsa-sha256; t=1621886358; cv=none; d=zohomail.com; s=zohoarc; b=grOGLgNy9g0CLOXmhDVgQLErJJVfXWarUxLKVOGyyZxuPqIlP8sCr75UoiusQmaZ6vxrgMCAa0DL7DDcjMs/8BmTCg/qQjIoFWJAWvlKkesMU1MYITEmnPqe4N0e7zpPusCg83z7TmYhmozUlwiMwKu/L2RQ7MGR8RuADeieArc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621886358; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/cT7Nw140FNR31PuXevCkr1pgU1HbzKiOZ6t4fkkRnQ=; b=cZSno09wl4A6j3k3psh4wIAM9Cgtf8APvFQogi8M/0U0RV661BubyMfetFfcGXgJhK+8nAsaAt4kodQX/C7S99niPQD33kL1jGWBxxchztQRc28BaTlS6lUIKnTs0UZ1bOWwUIUG+O0sTQVc3hdcUJfOWjzJ7ddKWX5tMhWMPtM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@amazon.de; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162188635862521.165737718706055; Mon, 24 May 2021 12:59:18 -0700 (PDT) Received: from localhost ([::1]:34402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llGjN-00011V-L7 for importer@patchew.org; Mon, 24 May 2021 15:59:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llGfz-0003pu-GQ for qemu-devel@nongnu.org; Mon, 24 May 2021 15:55:47 -0400 Received: from smtp-fw-6002.amazon.com ([52.95.49.90]:22670) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llGfx-0001aL-2F for qemu-devel@nongnu.org; Mon, 24 May 2021 15:55:47 -0400 Received: from iad12-co-svc-p1-lb1-vlan2.amazon.com (HELO email-inbound-relay-1d-98acfc19.us-east-1.amazon.com) ([10.43.8.2]) by smtp-border-fw-6002.iad6.amazon.com with ESMTP; 24 May 2021 19:55:35 +0000 Received: from EX13D28EUC003.ant.amazon.com (iad12-ws-svc-p26-lb9-vlan3.iad.amazon.com [10.40.163.38]) by email-inbound-relay-1d-98acfc19.us-east-1.amazon.com (Postfix) with ESMTPS id 2B9EAA20BC; Mon, 24 May 2021 19:55:32 +0000 (UTC) Received: from uc8bbc9586ea454.ant.amazon.com (10.43.161.253) by EX13D28EUC003.ant.amazon.com (10.43.164.43) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 24 May 2021 19:55:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazon201209; t=1621886146; x=1653422146; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=/cT7Nw140FNR31PuXevCkr1pgU1HbzKiOZ6t4fkkRnQ=; b=MLPxjH3m0FdpBU4/ycIs2TawVDcmCSZbO2bQzqhFcqlhVFr5q7X3BdzX ChwTKM4LQtj5nEBriaaSH191xxMKPrBgnbPWO0HXm1WhDFcgf7AzeVvKi qAJhE1zW97Xk192nAI9CuFJKFVdeOI4It1cfZAcbnnU4pymm8MxUJZiAE 0=; X-IronPort-AV: E=Sophos;i="5.82,325,1613433600"; d="scan'208";a="114312601" From: Siddharth Chandrasekaran To: Paolo Bonzini , Marcelo Tosatti CC: Siddharth Chandrasekaran , Siddharth Chandrasekaran , Alexander Graf , Evgeny Iakovlev , Liran Alon , Ioannis Aslanidis , , Subject: [PATCH 2/6] hyper-v: Use -1 as invalid overlay address Date: Mon, 24 May 2021 21:54:05 +0200 Message-ID: <13aa6b6a4434198ad3d43e48501bce1796266850.1621885749.git.sidcha@amazon.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.43.161.253] X-ClientProxiedBy: EX13D10UWB004.ant.amazon.com (10.43.161.121) To EX13D28EUC003.ant.amazon.com (10.43.164.43) Precedence: Bulk Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=52.95.49.90; envelope-from=prvs=771b08666=sidcha@amazon.de; helo=smtp-fw-6002.amazon.com X-Spam_score_int: -47 X-Spam_score: -4.8 X-Spam_bar: ---- X-Spam_report: (-4.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.371, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @amazon.de) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When managing overlay pages, we used hwaddr 0 to signal an invalid address (to disable a page). Although unlikely, 0 _could_ be a valid overlay offset as Hyper-V TLFS does not specify anything about it. Use -1 as the invalid address indicator as it can never be a valid address. Signed-off-by: Siddharth Chandrasekaran Reviewed-by: Alexander Graf --- hw/hyperv/hyperv.c | 15 +++++++++------ include/hw/hyperv/hyperv.h | 1 + 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c index 8d09206702..ac45e8e139 100644 --- a/hw/hyperv/hyperv.c +++ b/hw/hyperv/hyperv.c @@ -43,7 +43,7 @@ static void alloc_overlay_page(struct hyperv_overlay_page= *overlay, memory_region_init_ram(&overlay->mr, owner, name, qemu_real_host_page_size, &error_abort); overlay->ram_ptr =3D memory_region_get_ram_ptr(&overlay->mr); - overlay->addr =3D 0; + overlay->addr =3D HYPERV_INVALID_OVERLAY_GPA; } =20 /** @@ -52,14 +52,17 @@ static void alloc_overlay_page(struct hyperv_overlay_pa= ge *overlay, */ static void hyperv_overlay_update(struct hyperv_overlay_page *overlay, hwa= ddr addr) { - /* check if overlay page is enabled */ - addr =3D (addr & HYPERV_OVERLAY_ENABLED) ? (addr & TARGET_PAGE_MASK) := 0; + if (addr !=3D HYPERV_INVALID_OVERLAY_GPA) { + /* check if overlay page is enabled */ + addr =3D (addr & HYPERV_OVERLAY_ENABLED) ? + (addr & TARGET_PAGE_MASK) : HYPERV_INVALID_OVERLAY_GPA; + } =20 if (overlay->addr !=3D addr) { - if (overlay->addr) { + if (overlay->addr !=3D HYPERV_INVALID_OVERLAY_GPA) { memory_region_del_subregion(get_system_memory(), &overlay->mr); } - if (addr) { + if (addr !=3D HYPERV_INVALID_OVERLAY_GPA) { memory_region_add_subregion(get_system_memory(), addr, &overla= y->mr); overlay->ram_ptr =3D memory_region_get_ram_ptr(&overlay->mr); } @@ -121,7 +124,7 @@ static void synic_reset(DeviceState *dev) SynICState *synic =3D SYNIC(dev); memset(synic->msg_page.ram_ptr, 0, sizeof(struct hyperv_message_page)); memset(synic->event_page.ram_ptr, 0, sizeof(struct hyperv_event_flags_= page)); - synic_update(synic, false, 0, 0); + synic_update(synic, false, HYPERV_INVALID_OVERLAY_GPA, HYPERV_INVALID_= OVERLAY_GPA); } =20 static void synic_class_init(ObjectClass *klass, void *data) diff --git a/include/hw/hyperv/hyperv.h b/include/hw/hyperv/hyperv.h index 3b2e0093b5..d989193e84 100644 --- a/include/hw/hyperv/hyperv.h +++ b/include/hw/hyperv/hyperv.h @@ -15,6 +15,7 @@ #include "exec/memory.h" =20 #define HYPERV_OVERLAY_ENABLED (1u << 0) +#define HYPERV_INVALID_OVERLAY_GPA ((hwaddr)-1) =20 struct hyperv_overlay_page { hwaddr addr; --=20 2.17.1 Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879