From patchwork Fri Jul 20 19:53:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 10538205 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8D978604D3 for ; Fri, 20 Jul 2018 19:53:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7470A297D6 for ; Fri, 20 Jul 2018 19:53:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 67F01298E0; Fri, 20 Jul 2018 19:53:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB966297D6 for ; Fri, 20 Jul 2018 19:53:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D65DB6B0006; Fri, 20 Jul 2018 15:53:49 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D16106B0007; Fri, 20 Jul 2018 15:53:49 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C05AE6B000A; Fri, 20 Jul 2018 15:53:49 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by kanga.kvack.org (Postfix) with ESMTP id 619ED6B0006 for ; Fri, 20 Jul 2018 15:53:49 -0400 (EDT) Received: by mail-wr1-f71.google.com with SMTP id v2-v6so5908544wrr.10 for ; Fri, 20 Jul 2018 12:53:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:date:from:to :cc:subject:in-reply-to:message-id:references:user-agent :mime-version; bh=LnnGA0Lhv20Nr7huPB3PNd5Vbn8h4MErp95a598675M=; b=d0upy7qx82oCjk4EspvUiIoPwov8jXvsLJNaCvg8qI8RaGF+GEEn8ohkD55eV2Ayn+ 6Rl0HMIF+kLRLitp5ipPMneRo5OWemp2qrq6EbiBu+JSoD5FviClWz/50nzoCyRGcQ+C b/oqVO5m1IwUwpKN2WlnzUv/XGpfN4gjTGQ5U5KLTWxgkGmNz1GN3fvBhp47P/AWxX+w F4qPvkq3FuA/k8HTCZU2Xb2jNIg8AmTLqJWL+ZE0Dm3uZgbSzhSNfycjbvdjtAhr8bbM dX9N/Z3/Cevj/MdOKYEt1TrRmkXo+gCQS4lKC6B4E+OvYGsqFS3sZdYG4AZVJl1IkEnV qYTg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of tglx@linutronix.de designates 2a01:7a0:2:106d:700::1 as permitted sender) smtp.mailfrom=tglx@linutronix.de X-Gm-Message-State: AOUpUlFgVD4B7wG2UxHVQuhLvwmsBlcrwIydzRiCfbWx+G7e1WnHVPuc 4MB5nHALWG5snqVXlvYx/9CAr/q64EgULSG1Uww/Zbkb9DP0viVcYyqJ8cozZQeJtBxsfVkjozV j+PDGkfWbzDyGWkq1qYOPGpypltZRle4Su0y/ycyML3iEIlpkymP9AkD6j0m5q3b16g== X-Received: by 2002:a5d:4e49:: with SMTP id r9-v6mr2235087wrt.27.1532116428879; Fri, 20 Jul 2018 12:53:48 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcIXjOlW8E7bYm9EzJldNpxbaT9/h6pabFi862udAfo4vG1LixqN+yEyDv/Ri9KUgcFTXy9 X-Received: by 2002:a5d:4e49:: with SMTP id r9-v6mr2235073wrt.27.1532116428129; Fri, 20 Jul 2018 12:53:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532116428; cv=none; d=google.com; s=arc-20160816; b=yeFtlILhdBRU8opNjADotZcFcU4cl8HpV3Mi46Owas7rFwnLWi+x4FieBYsQHzTM+N IPFhDArQ5FljLI6QK4WmEUgd2FLUSJlVItuujeYtm3zLDf+73xJmW7LyI2/fVkryr28g R3jFx08JFBsgpnOvkeQLiDUe28o1PhI5KBpKPyjJ62CmrlPWXZy+GFBl1aBxzHoK5C1w VgO++8ec4SaE+cNLfavKkSeqvY6wNPLbYIrmWPsmqB3mfT2Yx2ivE0JrovTCF8XUqcKb APqFIpcm9iHQ+9Y658XDlkTZL6Dj5eBO41cf4eN/Ltr9y9MAqrdvVqZ6F3Ss994A6TSC kMew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:message-id:in-reply-to:subject :cc:to:from:date:arc-authentication-results; bh=LnnGA0Lhv20Nr7huPB3PNd5Vbn8h4MErp95a598675M=; b=DK1vf91J8kOjnR+3mrM/luy0L3drNXrT7dpcX2WbMsfr6OLwoHReOgVShXd4ULDVXb yFlwfkItyiWiC6dRfMwc0f84ELhsmJ2/IA7l+IASB4lsak/G4udVtO0+1rmwBfV718zD +SsStfZYjOXe0kpNZvkK2ClQzg68yQEzCMTLnrsIVBnsrX1yKr+7aeo6MxFLQc9E0FAN U8jPOQZvQUMeuymugS7IMLMuVCg1PbrCLBvuxSwdnO7D45SyLB1ndne97BtgyymqkQqH gRAfqKU4FTIevO4OMU7gHxGWXftbGQrxfpAtmdsz54TIZkAZ9Gmqx9/8wesPxIRBZ9DH Irqw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of tglx@linutronix.de designates 2a01:7a0:2:106d:700::1 as permitted sender) smtp.mailfrom=tglx@linutronix.de Received: from Galois.linutronix.de (Galois.linutronix.de. [2a01:7a0:2:106d:700::1]) by mx.google.com with ESMTPS id r14-v6si2193710wrg.106.2018.07.20.12.53.47 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 20 Jul 2018 12:53:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of tglx@linutronix.de designates 2a01:7a0:2:106d:700::1 as permitted sender) client-ip=2a01:7a0:2:106d:700::1; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of tglx@linutronix.de designates 2a01:7a0:2:106d:700::1 as permitted sender) smtp.mailfrom=tglx@linutronix.de Received: from p4fea5a5a.dip0.t-ipconnect.de ([79.234.90.90] helo=nanos) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1fgbTB-0002H9-Tw; Fri, 20 Jul 2018 21:53:42 +0200 Date: Fri, 20 Jul 2018 21:53:41 +0200 (CEST) From: Thomas Gleixner To: Andy Lutomirski cc: Joerg Roedel , Ingo Molnar , "H . Peter Anvin" , X86 ML , LKML , Linux-MM , Linus Torvalds , Dave Hansen , Josh Poimboeuf , Juergen Gross , Peter Zijlstra , Borislav Petkov , Jiri Kosina , Boris Ostrovsky , Brian Gerst , David Laight , Denys Vlasenko , Eduardo Valentin , Greg KH , Will Deacon , "Liguori, Anthony" , Daniel Gruss , Hugh Dickins , Kees Cook , Andrea Arcangeli , Waiman Long , Pavel Machek , "David H . Gutteridge" , Joerg Roedel , Arnaldo Carvalho de Melo , Alexander Shishkin , Jiri Olsa , Namhyung Kim Subject: Re: [PATCH 1/3] perf/core: Make sure the ring-buffer is mapped in all page-tables In-Reply-To: Message-ID: References: <1532103744-31902-1-git-send-email-joro@8bytes.org> <1532103744-31902-2-git-send-email-joro@8bytes.org> User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1, SHORTCIRCUIT=-0.0001 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP On Fri, 20 Jul 2018, Thomas Gleixner wrote: > On Fri, 20 Jul 2018, Andy Lutomirski wrote: > > On Fri, Jul 20, 2018 at 12:27 PM, Thomas Gleixner wrote: > > > On Fri, 20 Jul 2018, Andy Lutomirski wrote: > > >> > On Jul 20, 2018, at 6:22 AM, Joerg Roedel wrote: > > >> > > > >> > From: Joerg Roedel > > >> > > > >> > The ring-buffer is accessed in the NMI handler, so we better > > >> > avoid faulting on it. Sync the vmalloc range with all > > >> > page-tables in system to make sure everyone has it mapped. > > >> > > > >> > This fixes a WARN_ON_ONCE() that can be triggered with PTI > > >> > enabled on x86-32: > > >> > > > >> > WARNING: CPU: 4 PID: 0 at arch/x86/mm/fault.c:320 vmalloc_fault+0x220/0x230 > > >> > > > >> > This triggers because with PTI enabled on an PAE kernel the > > >> > PMDs are no longer shared between the page-tables, so the > > >> > vmalloc changes do not propagate automatically. > > >> > > >> It seems like it would be much more robust to fix the vmalloc_fault() > > >> code instead. > > > > > > Right, but now the obvious fix for the issue at hand is this. We surely > > > should revisit this. > > > > If you commit this under this reasoning, then please at least make it say: > > > > /* XXX: The vmalloc_fault() code is buggy on PTI+PAE systems, and this > > is a workaround. */ > > > > Let's not have code in the kernel that pretends to make sense but is > > actually voodoo magic that works around bugs elsewhere. It's no fun > > to maintain down the road. > > Fair enough. Lemme amend it. Joerg is looking into it, but I surely want to > get that stuff some exposure in next ASAP. Delta patch below. Thanks. tglx 8<------------- --- a/kernel/events/ring_buffer.c +++ b/kernel/events/ring_buffer.c @@ -815,8 +815,12 @@ static void rb_free_work(struct work_str vfree(base); kfree(rb); - /* Make sure buffer is unmapped in all page-tables */ - vmalloc_sync_all(); + /* + * FIXME: PAE workaround for vmalloc_fault(): Make sure buffer is + * unmapped in all page-tables. + */ + if (IS_ENABLED(CONFIG_X86_PAE)) + vmalloc_sync_all(); } void rb_free(struct ring_buffer *rb) @@ -844,11 +848,13 @@ struct ring_buffer *rb_alloc(int nr_page goto fail_all_buf; /* - * The buffer is accessed in NMI handlers, make sure it is - * mapped in all page-tables in the system so that we don't - * fault on the range in an NMI handler. + * FIXME: PAE workaround for vmalloc_fault(): The buffer is + * accessed in NMI handlers, make sure it is mapped in all + * page-tables in the system so that we don't fault on the range in + * an NMI handler. */ - vmalloc_sync_all(); + if (IS_ENABLED(CONFIG_X86_PAE)) + vmalloc_sync_all(); rb->user_page = all_buf; rb->data_pages[0] = all_buf + PAGE_SIZE;