From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0AE7EC43461 for ; Wed, 9 Sep 2020 14:29:04 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7E9C32224F for ; Wed, 9 Sep 2020 14:29:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=shutemov-name.20150623.gappssmtp.com header.i=@shutemov-name.20150623.gappssmtp.com header.b="kAiKPvkr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7E9C32224F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=shutemov.name Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id DA48F6B0073; Wed, 9 Sep 2020 10:29:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D54A36B0074; Wed, 9 Sep 2020 10:29:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C6BD46B007D; Wed, 9 Sep 2020 10:29:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0113.hostedemail.com [216.40.44.113]) by kanga.kvack.org (Postfix) with ESMTP id AFE3E6B0073 for ; Wed, 9 Sep 2020 10:29:02 -0400 (EDT) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 6E2E01EFF for ; Wed, 9 Sep 2020 14:29:02 +0000 (UTC) X-FDA: 77243754924.28.moon87_180aa3c270de Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin28.hostedemail.com (Postfix) with ESMTP id 388DE6C11 for ; Wed, 9 Sep 2020 14:29:02 +0000 (UTC) X-HE-Tag: moon87_180aa3c270de X-Filterd-Recvd-Size: 4277 Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Wed, 9 Sep 2020 14:29:01 +0000 (UTC) Received: by mail-lf1-f65.google.com with SMTP id z19so1704362lfr.4 for ; Wed, 09 Sep 2020 07:29:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shutemov-name.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=pCk4S+5ES85c/McJ/LmXrb8HyrZogT7EgTtK640OFhY=; b=kAiKPvkrZOS0Ste5162AU6aicJTc6hGeQHKlvjNuoKxs50TcdF2yoNFShoRoongT7L tFiyJX+/e3SEIjPAgMbKZR71gt+wyrdKRWrUn7eWCi6wMprQP9YATVTLmURqfUcXPiia U2jdEAOvDsR5NHqY7As9jWm/eQUYRixMNWbw2uFS7b7cujALEuCQzZI59q+uF1Zavm9z wA1R3CrjQRW26ojleXKW2vMF4/hm1/EkpQ0l9OG1uFDFMRAOR4hMBi8OJA2TuAj0iV3b z7CXv/q9hZ2JgUyw/J2uoy4jX9l5xMh9SYodXnRbFJ/0VWOv/DxKTgMVRACco88WaExg I1rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=pCk4S+5ES85c/McJ/LmXrb8HyrZogT7EgTtK640OFhY=; b=O1emIz3gsCMnoEodKRC7xvvFyYD0srfQVu8a7LJfkT304kjIcCFizJXg3spUWWzsun PqIVEdrgC2exPLNUYMA7yzTWPmmdbR11D/X4iDUAOQiSNKBrZt5bKtUDBIfsx1L4URFZ 8B6dfspncF0PS9021vChoJck8VkEa0OLRkKT2LvRqRQLeDkLmFhP3uKaiM/TFeYR9a9K 6/yM1MWBuoa1xh9zV/B0q7euErIzwL5+LZ+b5Zbl0h/884rE2jDb3ckTRVeT4TMpJmFY 1oflbbOiBzjqI2i1XQmUoP/1vXC8LFM/fBMItCMPrZV4ImUxII9azJqufe1CW5hbUgFd nHvA== X-Gm-Message-State: AOAM533zgYliXEr1tI9qA2c8Zo9r2gv0i2kDx6G7W2XgO2kDcFc4lxzm aF1XrrvBPaufginVbvij2Y2Ncg== X-Google-Smtp-Source: ABdhPJxZMvJEGkWj6e5Za07yRzs8UL7rvTYH+T4BNXB8WA5ghkkaQZxDNF1G4H/UnBLCYakwU1Gkaw== X-Received: by 2002:a19:7e02:: with SMTP id z2mr2013000lfc.130.1599661740268; Wed, 09 Sep 2020 07:29:00 -0700 (PDT) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id j8sm438129lji.91.2020.09.09.07.28.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 07:28:59 -0700 (PDT) Received: by box.localdomain (Postfix, from userid 1000) id CB25B1036AE; Wed, 9 Sep 2020 17:29:04 +0300 (+03) Date: Wed, 9 Sep 2020 17:29:04 +0300 From: "Kirill A. Shutemov" To: "Matthew Wilcox (Oracle)" Cc: linux-mm@kvack.org, Andrew Morton , Huang Ying Subject: Re: [PATCH 02/11] mm/memory: Remove page fault assumption of compound page size Message-ID: <20200909142904.acca6gthbffk3jwq@box> References: <20200908195539.25896-1-willy@infradead.org> <20200908195539.25896-3-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200908195539.25896-3-willy@infradead.org> X-Rspamd-Queue-Id: 388DE6C11 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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: On Tue, Sep 08, 2020 at 08:55:29PM +0100, Matthew Wilcox (Oracle) wrote: > A compound page in the page cache will not necessarily be of PMD size, > so check explicitly. > > Signed-off-by: Matthew Wilcox (Oracle) > --- > mm/memory.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/mm/memory.c b/mm/memory.c > index 602f4283122f..4b35b4e71e64 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -3562,13 +3562,14 @@ static vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page) > unsigned long haddr = vmf->address & HPAGE_PMD_MASK; > pmd_t entry; > int i; > - vm_fault_t ret; > + vm_fault_t ret = VM_FAULT_FALLBACK; > > if (!transhuge_vma_suitable(vma, haddr)) > - return VM_FAULT_FALLBACK; > + return ret; > > - ret = VM_FAULT_FALLBACK; > page = compound_head(page); > + if (page_order(page) != HPAGE_PMD_ORDER) > + return ret; Maybe also VM_BUG_ON_PAGE(page_order(page) > HPAGE_PMD_ORDER, page)? Just in case. > > /* > * Archs like ppc64 need additonal space to store information > -- > 2.28.0 > -- Kirill A. Shutemov