From patchwork Thu Sep 26 09:46:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11162153 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B229B13B1 for ; Thu, 26 Sep 2019 09:50:42 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8DCB5222C6 for ; Thu, 26 Sep 2019 09:50:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="iKzwo0Uh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8DCB5222C6 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amazon.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iDQPK-00078w-Qw; Thu, 26 Sep 2019 09:49:54 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iDQPJ-00075X-59 for xen-devel@lists.xenproject.org; Thu, 26 Sep 2019 09:49:53 +0000 X-Inumbo-ID: fcd3d69a-e042-11e9-97fb-bc764e2007e4 Received: from smtp-fw-6002.amazon.com (unknown [52.95.49.90]) by localhost (Halon) with ESMTPS id fcd3d69a-e042-11e9-97fb-bc764e2007e4; Thu, 26 Sep 2019 09:49:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569491392; x=1601027392; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=hLhaqBqKlhsYdBQLmVKD140d9/Kwf8o4PkFJCGHBtN4=; b=iKzwo0UhQ7J1u2IhnJXXBYLBin2GNjjhjBAeAtELD6ufWbP8d2AZ2ZBf Ycs6/QpskEEIonYM1c7pIckscnzaiNChGvxZgjHUxrrPhhkyCPdGPszCH dFOlC4zHJFae+lGJYUoEYThgitjEIq0Ust8jsPDgAmSJyj3rfptufwdMv Y=; X-IronPort-AV: E=Sophos;i="5.64,551,1559520000"; d="scan'208";a="423750784" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1e-62350142.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6002.iad6.amazon.com with ESMTP; 26 Sep 2019 09:49:52 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1e-62350142.us-east-1.amazon.com (Postfix) with ESMTPS id 0F489A1EF3; Thu, 26 Sep 2019 09:49:52 +0000 (UTC) Received: from EX13D28EUB001.ant.amazon.com (10.43.166.50) by EX13MTAUEA001.ant.amazon.com (10.43.61.243) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:49:34 +0000 Received: from EX13MTAUWA001.ant.amazon.com (10.43.160.58) by EX13D28EUB001.ant.amazon.com (10.43.166.50) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:49:33 +0000 Received: from u9d785c4ba99158.ant.amazon.com (10.125.106.58) by mail-relay.amazon.com (10.43.160.118) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Thu, 26 Sep 2019 09:49:30 +0000 From: To: Date: Thu, 26 Sep 2019 10:46:35 +0100 Message-ID: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk Subject: [Xen-devel] [RFC PATCH 72/84] acpi: don't assume an always-mapped direct map in acpi allocations. X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Jan Beulich , Hongyan Xia Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Hongyan Xia Signed-off-by: Hongyan Xia --- xen/drivers/acpi/osl.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c index 4c8bb7839e..dbf62325f3 100644 --- a/xen/drivers/acpi/osl.c +++ b/xen/drivers/acpi/osl.c @@ -216,14 +216,25 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width) void *__init acpi_os_alloc_memory(size_t sz) { - void *ptr; - - if (system_state == SYS_STATE_early_boot) - return mfn_to_virt(mfn_x(alloc_boot_pages(PFN_UP(sz), 1))); - - ptr = xmalloc_bytes(sz); - ASSERT(!ptr || is_xmalloc_memory(ptr)); - return ptr; + void *ptr; + unsigned long nr_pfns = PFN_UP(sz); + mfn_t mfn; + + if (system_state == SYS_STATE_early_boot) + { + mfn = alloc_boot_pages(nr_pfns, 1); + ptr = mfn_to_virt(mfn_x(mfn)); + /* + * Direct map is garbage now, fill the actual mapping. Safe to do so + * now because map_pages got rid of the direct map even in early boot. + */ + map_pages_to_xen((unsigned long)ptr, mfn, nr_pfns, PAGE_HYPERVISOR); + return ptr; + } + + ptr = xmalloc_bytes(sz); + ASSERT(!ptr || is_xmalloc_memory(ptr)); + return ptr; } void *__init acpi_os_zalloc_memory(size_t sz) @@ -241,8 +252,14 @@ void *__init acpi_os_zalloc_memory(size_t sz) void __init acpi_os_free_memory(void *ptr) { - if (is_xmalloc_memory(ptr)) - xfree(ptr); - else if (ptr && system_state == SYS_STATE_early_boot) - init_boot_pages(__pa(ptr), __pa(ptr) + PAGE_SIZE); + mfn_t mfn; + if (is_xmalloc_memory(ptr)) + xfree(ptr); + else if (ptr && system_state == SYS_STATE_early_boot) + { + init_boot_pages(__pa(ptr), __pa(ptr) + PAGE_SIZE); + /* Also unmap in the 1:1 region for security. */ + mfn = _mfn(virt_to_mfn(ptr)); + map_pages_to_xen((unsigned long)ptr, mfn, 1, _PAGE_NONE); + } }