From patchwork Tue Apr 10 02:33:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Minchan Kim X-Patchwork-Id: 10332227 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 A1B126037F for ; Tue, 10 Apr 2018 02:34:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9181526E73 for ; Tue, 10 Apr 2018 02:34:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8664428AB2; Tue, 10 Apr 2018 02:34:02 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1652B26E73 for ; Tue, 10 Apr 2018 02:34:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751635AbeDJCds (ORCPT ); Mon, 9 Apr 2018 22:33:48 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:42228 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751543AbeDJCdr (ORCPT ); Mon, 9 Apr 2018 22:33:47 -0400 Received: by mail-pf0-f195.google.com with SMTP id o16so6976598pfk.9; Mon, 09 Apr 2018 19:33:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=KbEZfEseePy0WEtoMxwDI6gc7J+R8EmqLc5aegS+bNU=; b=KGvRDbXqyFwJQmgsBgfdVIWwkAZhbkY+XKVzRkNvqeCaEvmn4ejni1nK70ghMbUEaW TB5jUXRCLI8lykURgmnuG/2E+8CyFzCg08Rq2oj3yWULlyE/egQI13UxPKbDMJtcFmkM qGLD1btxesse2GH8mAT0/QVKz9NUWJdBPn8K2SDmdH8Wenzw0m0dwHUWmFh/WtQtrkfV WOQKCou/pIX0Q/rVr/h6vHXiTQGPzP4tYw+ONWlJ/Xa4UooPI+dWKTjzM0OC4c3PnV1z sE63PeoOYJbW1IjerG1nfB8oOwxcGZOqI2K1wvHJnJfb2D+e0qqfbrnfipHvC6/qrs1B UGLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=KbEZfEseePy0WEtoMxwDI6gc7J+R8EmqLc5aegS+bNU=; b=IPjf9+HzTLGrG69Oggk9+mA6op1we3RszSPbIgEd6P4uhG4dI7TgbcD3DbfuIWfGmm n7JL/CLzx9zqUgXYiXesWM+8MxdLgpIgbxsPnF9o36IF77DmAQQhun96/uvcf655hfi5 SM5vLw9bp7NBndJIiOgAuRX+gLpvaMT08zOLIOmtjl9AmBviJsNtHWGjciXYxNlw2R+H fNyRUUyYsjiQFog05jrEiRHx/2gaooifvrNvB6F88bYcazMJIwN6JZQ/OYFDsVWiLqpO y1VZAUd5luredgSNMR5ojhIZCDVCSM6fSHbdDMkPzCkBEVbYqYG1ybrzrHnxe0c/XT2X 9gVg== X-Gm-Message-State: ALQs6tC1fuNYI0eyUuD9qqVn8SWXF0L2wfR0EcbScNHb7IXvSr0ggAL5 Wy6cZdB/30JdvGo+cF7f3Mc= X-Google-Smtp-Source: AIpwx48wMVDw2q9KKrczA76UGnJuDZvuyY4kCYvKWCPGL8viHyZ6UVwOBceCsI3csBzKWW1UvQn0WA== X-Received: by 10.98.185.15 with SMTP id z15mr1134318pfe.199.1523327626176; Mon, 09 Apr 2018 19:33:46 -0700 (PDT) Received: from rodete-desktop-imager.corp.google.com ([2401:fa00:d:0:7630:de9:f6f2:276f]) by smtp.gmail.com with ESMTPSA id k1sm2572193pff.14.2018.04.09.19.33.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Apr 2018 19:33:44 -0700 (PDT) Date: Tue, 10 Apr 2018 11:33:39 +0900 From: Minchan Kim To: Matthew Wilcox Cc: Chao Yu , Jaegeuk Kim , Christopher Lameter , Andrew Morton , linux-mm , LKML , Johannes Weiner , Jan Kara , Chris Fries , linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH] mm: workingset: fix NULL ptr dereference Message-ID: <20180410023339.GB214542@rodete-desktop-imager.corp.google.com> References: <20180409015815.235943-1-minchan@kernel.org> <20180409024925.GA21889@bombadil.infradead.org> <20180409030930.GA214930@rodete-desktop-imager.corp.google.com> <20180409111403.GA31652@bombadil.infradead.org> <20180409112514.GA195937@rodete-laptop-imager.corp.google.com> <7706245c-2661-f28b-f7f9-8f11e1ae932b@huawei.com> <20180409144958.GA211679@rodete-laptop-imager.corp.google.com> <20180409152032.GB11756@bombadil.infradead.org> <20180409230409.GA214542@rodete-desktop-imager.corp.google.com> <20180410011211.GA31282@bombadil.infradead.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180410011211.GA31282@bombadil.infradead.org> User-Agent: Mutt/1.9.2 (2017-12-15) Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Mon, Apr 09, 2018 at 06:12:11PM -0700, Matthew Wilcox wrote: > On Tue, Apr 10, 2018 at 08:04:09AM +0900, Minchan Kim wrote: > > On Mon, Apr 09, 2018 at 08:20:32AM -0700, Matthew Wilcox wrote: > > > I don't think this is something the radix tree should know about. > > > > Because shadow entry implementation is hidden by radix tree implemetation. > > IOW, radix tree user cannot know how it works. > > I have no idea what you mean. > > > > SLAB should be checking for it (the patch I posted earlier in this > > > > I don't think it's right approach. SLAB constructor can initialize > > some metadata for slab page populated as well as page zeroing. > > However, __GFP_ZERO means only clearing pages, not metadata. > > So it's different semantic. No need to mix out. > > No, __GFP_ZERO is specified to clear the allocated memory whether > you're allocating from alloc_pages or from slab. What makes no sense > is allocating an object from slab with a constructor *and* __GFP_ZERO. > They're in conflict, and slab can't fulfill both of those requirements. It's a stable material. If you really think it does make sense, please submit patch separately. > > > > thread), but the right place to filter this out is in the caller of > > > radix_tree_maybe_preload -- it's already filtering out HIGHMEM pages, > > > and should filter out GFP_ZERO too. > > > > radix_tree_[maybe]_preload is exported API, which are error-prone > > for out of modules or upcoming customers. > > > > More proper place is __radix_tree_preload. > > I could not disagree with you more. It is the responsibility of the > callers of radix_tree_preload to avoid calling it with nonsense flags > like __GFP_DMA, __GFP_HIGHMEM or __GFP_ZERO. How about this? It would fix current problem and warn potential bugs as well. radix_tree_preload already has done such warning and radix_tree_maybe_preload has skipping for misbehaivor gfp. From 27ecf7a009d3570d1155c528c7f08040ede68ed3 Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Tue, 10 Apr 2018 11:20:11 +0900 Subject: [PATCH v2] mm: workingset: fix NULL ptr dereference It assumes shadow entries of radix tree rely on the init state that node->private_list allocated newly is list_empty state for the working. Currently, it's initailized in SLAB constructor which means node of radix tree would be initialized only when *slub allocates new page*, not *slub alloctes new object*. If some FS or subsystem pass gfp_mask to __GFP_ZERO, that means newly allocated node can have !list_empty(node->private_list) by memset of slab allocator. It ends up calling NULL deference at workingset_update_node by failing list_empty check. This patch fixes it. Fixes: 449dd6984d0e ("mm: keep page cache radix tree nodes in check") Cc: Johannes Weiner Cc: Jan Kara Cc: Matthew Wilcox Cc: Jaegeuk Kim Cc: Chao Yu Cc: Christopher Lameter Cc: linux-fsdevel@vger.kernel.org Reported-by: Chris Fries Signed-off-by: Minchan Kim --- lib/radix-tree.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/radix-tree.c b/lib/radix-tree.c index da9e10c827df..9d68f2a7888e 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c @@ -511,6 +511,16 @@ int radix_tree_preload(gfp_t gfp_mask) { /* Warn on non-sensical use... */ WARN_ON_ONCE(!gfpflags_allow_blocking(gfp_mask)); + /* + * New allocate node must have node->private_list as INIT_LIST_HEAD + * state by workingset shadow memory implementation. + * If user pass __GFP_ZERO by mistake, slab allocator will clear + * node->private_list, which makes a BUG. Rather than going Oops, + * just fix and warn about it. + */ + if (WARN_ON(gfp_mask & __GFP_ZERO)) + gfp_mask &= ~GFP_ZERO + return __radix_tree_preload(gfp_mask, RADIX_TREE_PRELOAD_SIZE); } EXPORT_SYMBOL(radix_tree_preload); @@ -522,7 +532,7 @@ EXPORT_SYMBOL(radix_tree_preload); */ int radix_tree_maybe_preload(gfp_t gfp_mask) { - if (gfpflags_allow_blocking(gfp_mask)) + if (gfpflags_allow_blocking(gfp_mask) && !(gfp_mask & __GFP_ZERO)) return __radix_tree_preload(gfp_mask, RADIX_TREE_PRELOAD_SIZE); /* Preloading doesn't help anything with this gfp mask, skip it */ preempt_disable();