From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372483-1517179649-2-4481569986456975290 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517179649; b=Y27nHybRMqsuMcVET4M5ttZHN8KxAhXwmE+qbPp65ikXsA7 wZUXaJb2ZKBoPjqjCKqYUGHyhGETJ9Hh95NT9gud9JgApJr40GvJgURG9Rx2RLUE xWqekrWClAuy+HlgPjCfowsHuq7bbfGT/pcXs+ELfRJDT2+5JjI5aUu6ohBo3VUC NQ1XEU0jboRpcSIhmu/PE5r2MusEEZzPg5n3eQkEZD2/kR5Oa46LRU8ZROhC9jog tlfWMgIK3NkT0wsHg4+U2LIzT/nSIdAn+XYJVdWvG0h/KILrtyAVkzu6/+CIsCMQ 53C6i9wc/fo15XZWk7aF5DpBvoKpBN448EBVBkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517179649; bh=ssuTC+ 0LMaZk1Qi/xkRETPYTd1G1VHEvvwHxgK5qFdY=; b=rKoqKpREhtZxPe7d7LOOrd sdf+fckgXySUQDAaD4nDamYVZpZnJEsrI4jKm9DkMOEghHRPqT8VopxU3l0fQEyl 8CuWHzAS9p3jybelW7L/maF4FepUrIPA828K3+vIdrn5jRIjbqevA9uXhGJzusmI gue0jv/Xtn9X9YqJd0O5K3mKE7uuSDJkMCc1eRCZFUwsibee5D8vCXK8y4jUKKgj i6gflJrPSTcEMpQGM7+6zE+E5xFnnuUpU7xE5zIXDF9zBtPsde9rdzBg1HViAcDR Zrvn7SqVs4ZiYZTI78Yi+XLb32PyifghINZM52sAgoNo7mD719pN/oQObVf2guWw == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=X1cd0XCg x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=X1cd0XCg x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932372AbeA1Wq7 (ORCPT ); Sun, 28 Jan 2018 17:46:59 -0500 Received: from mail-sn1nam01on0139.outbound.protection.outlook.com ([104.47.32.139]:17739 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932272AbeA1W3P (ORCPT ); Sun, 28 Jan 2018 17:29:15 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Karol Herbst , Linus Torvalds , Peter Zijlstra , Steven Rostedt , Thomas Gleixner , "nouveau@lists.freedesktop.org" , Ingo Molnar , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 46/49] x86/mm/kmmio: Fix mmiotrace for page unaligned addresses Thread-Topic: [PATCH AUTOSEL for 4.9 46/49] x86/mm/kmmio: Fix mmiotrace for page unaligned addresses Thread-Index: AQHTmIdF6uKF1JxM50GMlCurdlpxaQ== Date: Sun, 28 Jan 2018 22:28:07 +0000 Message-ID: <20180128222727.22404-46-alexander.levin@microsoft.com> References: <20180128222727.22404-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222727.22404-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB0924;7:QCYlmVZhN0H/UNHRjYrFa7/THZfrRPTEVJd19hlUFm9/g/w4EEXCfPSjaa+m6a2rcZORxpkgbwN9lCsPUHl/KAclN113y9IctL4uALehmLjCEV+PO3W3EIjSL4iB9St2H0B7sYSekN2HlgGISbRiP/rTbZuaHbsfcVCTpi1/ya+Wqna80mj8EVZBTW6U1BBaYjV+XdHt0BLUtS4pWSqnVxMrrb6KgU9rMP/P0zv455E5EaFS6rfBey2MsXM3xmy7 x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: c88a2c33-2fa1-4bb9-4eae-08d5669e8cf9 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB0924; x-ms-traffictypediagnostic: MW2PR2101MB0924: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158)(217544274631240)(42068640409301); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011);SRVR:MW2PR2101MB0924;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB0924; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(346002)(39860400002)(366004)(39380400002)(376002)(189003)(199004)(2906002)(26005)(10090500001)(6116002)(3846002)(59450400001)(8936002)(86362001)(36756003)(186003)(66066001)(99286004)(1076002)(107886003)(86612001)(4326008)(25786009)(5250100002)(68736007)(2900100001)(2501003)(72206003)(6512007)(3280700002)(22452003)(53936002)(478600001)(10290500003)(966005)(106356001)(3660700001)(110136005)(54906003)(97736004)(6436002)(316002)(2950100002)(8676002)(81156014)(76176011)(81166006)(6506007)(105586002)(305945005)(14454004)(6486002)(6306002)(102836004)(5660300001)(7736002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB0924;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: Edq+qOJQCIqp/H6Inu9NEOOiC14kENiRpadTPwzJdnYZuswWcV7sek6LoniqYjlQuKUK8aDQKM/Jq6lwtiuYUA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: c88a2c33-2fa1-4bb9-4eae-08d5669e8cf9 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:28:07.5065 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB0924 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Karol Herbst [ Upstream commit 6d60ce384d1d5ca32b595244db4077a419acc687 ] If something calls ioremap() with an address not aligned to PAGE_SIZE, the returned address might be not aligned as well. This led to a probe registered on exactly the returned address, but the entire page was armed for mmiotracing. On calling iounmap() the address passed to unregister_kmmio_probe() was PAGE_SIZE aligned by the caller leading to a complete freeze of the machine. We should always page align addresses while (un)registerung mappings, because the mmiotracer works on top of pages, not mappings. We still keep track of the probes based on their real addresses and lengths though, because the mmiotrace still needs to know what are mapped memory regions. Also move the call to mmiotrace_iounmap() prior page aligning the address, so that all probes are unregistered properly, otherwise the kernel ends up failing memory allocations randomly after disabling the mmiotracer. Tested-by: Lyude Signed-off-by: Karol Herbst Acked-by: Pekka Paalanen Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Steven Rostedt Cc: Thomas Gleixner Cc: nouveau@lists.freedesktop.org Link: http://lkml.kernel.org/r/20171127075139.4928-1-kherbst@redhat.com Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- arch/x86/mm/ioremap.c | 4 ++-- arch/x86/mm/kmmio.c | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 7aaa2635862d..ecae9ac216fa 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -347,11 +347,11 @@ void iounmap(volatile void __iomem *addr) (void __force *)addr < phys_to_virt(ISA_END_ADDRESS)) return; =20 + mmiotrace_iounmap(addr); + addr =3D (volatile void __iomem *) (PAGE_MASK & (unsigned long __force)addr); =20 - mmiotrace_iounmap(addr); - /* Use the vm area unlocked, assuming the caller ensures there isn't another iounmap for the same address in parallel. Reuse of the virtual address is prevented by diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c index afc47f5c9531..cadb82be5f36 100644 --- a/arch/x86/mm/kmmio.c +++ b/arch/x86/mm/kmmio.c @@ -434,17 +434,18 @@ int register_kmmio_probe(struct kmmio_probe *p) unsigned long flags; int ret =3D 0; unsigned long size =3D 0; + unsigned long addr =3D p->addr & PAGE_MASK; const unsigned long size_lim =3D p->len + (p->addr & ~PAGE_MASK); unsigned int l; pte_t *pte; =20 spin_lock_irqsave(&kmmio_lock, flags); - if (get_kmmio_probe(p->addr)) { + if (get_kmmio_probe(addr)) { ret =3D -EEXIST; goto out; } =20 - pte =3D lookup_address(p->addr, &l); + pte =3D lookup_address(addr, &l); if (!pte) { ret =3D -EINVAL; goto out; @@ -453,7 +454,7 @@ int register_kmmio_probe(struct kmmio_probe *p) kmmio_count++; list_add_rcu(&p->list, &kmmio_probes); while (size < size_lim) { - if (add_kmmio_fault_page(p->addr + size)) + if (add_kmmio_fault_page(addr + size)) pr_err("Unable to set page fault.\n"); size +=3D page_level_size(l); } @@ -527,19 +528,20 @@ void unregister_kmmio_probe(struct kmmio_probe *p) { unsigned long flags; unsigned long size =3D 0; + unsigned long addr =3D p->addr & PAGE_MASK; const unsigned long size_lim =3D p->len + (p->addr & ~PAGE_MASK); struct kmmio_fault_page *release_list =3D NULL; struct kmmio_delayed_release *drelease; unsigned int l; pte_t *pte; =20 - pte =3D lookup_address(p->addr, &l); + pte =3D lookup_address(addr, &l); if (!pte) return; =20 spin_lock_irqsave(&kmmio_lock, flags); while (size < size_lim) { - release_kmmio_fault_page(p->addr + size, &release_list); + release_kmmio_fault_page(addr + size, &release_list); size +=3D page_level_size(l); } list_del_rcu(&p->list); --=20 2.11.0