From patchwork Tue Nov 3 19:46:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 7546691 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 10E0F9F2F7 for ; Tue, 3 Nov 2015 19:51:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3B922205E2 for ; Tue, 3 Nov 2015 19:51:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 49BC020431 for ; Tue, 3 Nov 2015 19:51:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756032AbbKCTvI (ORCPT ); Tue, 3 Nov 2015 14:51:08 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:34977 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932236AbbKCTqv (ORCPT ); Tue, 3 Nov 2015 14:46:51 -0500 Received: by pasz6 with SMTP id z6so27436824pas.2 for ; Tue, 03 Nov 2015 11:46:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt_com.20150623.gappssmtp.com; s=20150623; h=from:to:to:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc :cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:subject :date:message-id:in-reply-to:references; bh=31FQcpK8E0F2ziA3G0PzUA86N4Re+PabF/vQftadghI=; b=Dl7pG+tsTxjb8ISD3bd1ul1R4yc2uPWpVhRqPgH8t6uAcn0ipDvsaDWLj8eczLClYi cCPVXiTWEZGNWvOW/CXr0E1oqWLl1NscoMmuF8wl7G5xP5Svnc57rSdpF43CWPw1tiFA U01wabxGgBVFbeRPzfF3PeeKt7GCPLln6OSJ7Hbhu9osTytaKZuFsMoTy8jRz3rRCdYm weLYpvn+x1gOvdjfJq4XAleUlUKS9F3Q0I4AToeaDlCzkUSipMRTqmBD5OKbD3I2V4Xt xieTuzddk7eCzXt/c/mfVV8I6zom5YJPj/+hiJzQ1YtNP4ZJNYY/D/IEJINgZ6eIUrhG j79g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:to:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc :cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc :cc:cc:cc:cc:subject:date:message-id:in-reply-to:references; bh=31FQcpK8E0F2ziA3G0PzUA86N4Re+PabF/vQftadghI=; b=XNHXOYvS+oo4vSn9X/STFxQutbha/vK06OCvfC5vNezcHzqVCOhvJMX4teFJLN9LoT zWOouAobWeVhSENw0AqlQ8VC6U8kyO6UpS5p04O10O6Vr4VDackQ025/pj9q8XeJvH12 PWpo9/GxOAJuDifBd6cUI81hd3Er3RebyEEPPfT8W1Jik3tRZqgm5KAiQvITaZFOU0KH IR/BaPLrrjTkmJTTNpgWXwBJUofSkV5tSJkiHgJywaq82Tj0f3MSwnWdEcIKSC41fDrS WiO3hjlSt//kNoT9McVEolMGDVzSX1V47fKNxwDKrwiib86EB0v7oDnDrYNyCkU6/G/x Amcw== X-Gm-Message-State: ALoCoQlGmW2vnG8OJal3j38KH5RrSQjERgFygQ5lzTYBRViP6kJfs7q3qIi6HQljFyNQViynybIY X-Received: by 10.68.230.2 with SMTP id su2mr36032499pbc.78.1446580011099; Tue, 03 Nov 2015 11:46:51 -0800 (PST) Received: from localhost (dhcp-39-103.EECS.Berkeley.EDU. [128.32.39.103]) by smtp.gmail.com with ESMTPSA id es4sm30938584pbc.42.2015.11.03.11.46.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Nov 2015 11:46:50 -0800 (PST) From: Palmer Dabbelt To: arnd@arndb.de To: dhowells@redhat.com Cc: viro@zeniv.linux.org.uk Cc: ast@plumgrid.com Cc: aishchuk@linux.vnet.ibm.com Cc: aarcange@redhat.com Cc: akpm@linux-foundation.org Cc: luto@kernel.org Cc: acme@kernel.org Cc: bhe@redhat.com Cc: 3chas3@gmail.com Cc: chris@zankel.net Cc: dave@sr71.net Cc: dyoung@redhat.com Cc: drysdale@google.com Cc: davem@davemloft.net Cc: ebiederm@xmission.com Cc: geoff@infradead.org Cc: gregkh@linuxfoundation.org Cc: hpa@zytor.com Cc: mingo@kernel.org Cc: iulia.manda21@gmail.com Cc: plagnioj@jcrosoft.com Cc: jikos@kernel.org Cc: josh@joshtriplett.org Cc: kexec@lists.infradead.org Cc: linux-api@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-xtensa@linux-xtensa.org Cc: mathieu.desnoyers@efficios.com Cc: jcmvbkbc@gmail.com Cc: paulmck@linux.vnet.ibm.com Cc: a.p.zijlstra@chello.nl Cc: tglx@linutronix.de Cc: tomi.valkeinen@ti.com Cc: vgoyal@redhat.com Cc: x86@kernel.org Cc: Palmer Dabbelt Subject: [PATCH 04/13] Always expose MAP_UNINITIALIZED to userspace Date: Tue, 3 Nov 2015 11:46:25 -0800 Message-Id: <1446579994-9937-5-git-send-email-palmer@dabbelt.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1446579994-9937-1-git-send-email-palmer@dabbelt.com> References: <1442271047-4908-1-git-send-email-palmer@dabbelt.com> <1446579994-9937-1-git-send-email-palmer@dabbelt.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This used to be hidden behind CONFIG_MMAP_ALLOW_UNINITIALIZED, so userspace wouldn't actually ever see it be non-zero. While I had originally hoped to avoid hiding it, it looks like this conflicts with MAP_HUGE_SHIFT so I think it's safer to just keep this 0. Architectures that want to define this can still override it. In fact, the Xtensa port already overrides it in a very similar manner to the previously broken one (but due to lots of conflicting opinions on how to solve this correctly, I'm just taking the easy way out and letting their arch maintainers deal with it -- sorry). Signed-off-by: Palmer Dabbelt Reviewed-by: Andrew Waterman Reviewed-by: Albert Ou --- include/uapi/asm-generic/mman-common.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/uapi/asm-generic/mman-common.h b/include/uapi/asm-generic/mman-common.h index ddc3b36..0ce2a13 100644 --- a/include/uapi/asm-generic/mman-common.h +++ b/include/uapi/asm-generic/mman-common.h @@ -19,9 +19,7 @@ #define MAP_TYPE 0x0f /* Mask for type of mapping */ #define MAP_FIXED 0x10 /* Interpret addr exactly */ #define MAP_ANONYMOUS 0x20 /* don't use a file */ -#ifdef CONFIG_MMAP_ALLOW_UNINITIALIZED -# define MAP_UNINITIALIZED 0x4000000 /* For anonymous mmap, memory could be uninitialized */ -#else +#ifndef MAP_UNINITIALIZED # define MAP_UNINITIALIZED 0x0 /* Don't support this flag */ #endif