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=-16.6 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1, USER_IN_DEF_DKIM_WL 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 92779C433E2 for ; Tue, 1 Sep 2020 17:39:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 569E02071B for ; Tue, 1 Sep 2020 17:39:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="L8WxnfzL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 569E02071B Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D639D6B00BD; Tue, 1 Sep 2020 13:39:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D153C900009; Tue, 1 Sep 2020 13:39:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C2AE76B00C7; Tue, 1 Sep 2020 13:39:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0130.hostedemail.com [216.40.44.130]) by kanga.kvack.org (Postfix) with ESMTP id AC6EC6B00BD for ; Tue, 1 Sep 2020 13:39:51 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 74EA73635 for ; Tue, 1 Sep 2020 17:39:51 +0000 (UTC) X-FDA: 77215205382.10.pie72_1d0c8492709a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin10.hostedemail.com (Postfix) with ESMTP id 46E1D16A4A1 for ; Tue, 1 Sep 2020 17:39:51 +0000 (UTC) X-HE-Tag: pie72_1d0c8492709a X-Filterd-Recvd-Size: 6112 Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Tue, 1 Sep 2020 17:39:50 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id t20so1553674qtr.8 for ; Tue, 01 Sep 2020 10:39:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=dTH+bNJOVXEV4YAgVROsUKTRXuusFobQPV2qEAjExjo=; b=L8WxnfzL7AjVEPVEFFYMhuzTTkiy3cDiPoU3L2Qm/DwRsWLOONreXcS5pbwCFBPy9t l232tfTWNlOovA89iItN4WS+KqrH0dkAPc/ZO4mxd/XN254aNdNQLahXJlNSOMc37OPD WzZyBgEjJQpR+gbV2KOho/F5+Ds+Z7jQ78iQ4zuk+DLkN1NEqTh1F1XYK6DKzRLr/Dri 7MjcbfodXNLn+OzaCxbc3YSERJyn8DPM+441qKvnU1o41Ciq/g1tOxewxljvDIGwcv0J OoLWUzaG1JE0NXtgbP2a6sUJb+y9FVosAAK2oFkPrgQ2tmt7Oj6rK9+feBIwDxqL+fHm NbSA== 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:in-reply-to:message-id :references:user-agent:mime-version; bh=dTH+bNJOVXEV4YAgVROsUKTRXuusFobQPV2qEAjExjo=; b=tJd1KqzjtMxkWvhK7TO1Qir+bfcMt8gA3FLgz/i14vHSbBrTDxs/ZXh6F9ru2eIxfH 8uTA4UMoEgQIAGKxXdyNsUQTERwT7SdwaAqQdTaslaxn/7wOSyaNAoib1bDYpWoXAGVK QEiTWZE3ljS3WPbl02qQNyKCmYxCKabvCJnPpSj2NuwwCQLsM/wSeTqHKNhC9r3YprnA 8iJtqOfpNw+W2XEU3oaypcl8Al8l4nAUt+IDX95aVytKlznP48uerjFufmb4TSA21h2o wp2j2kzUpv2Cy10n2nwODpaDWJy6+d/8Ju1qdRy/M16S+V60sslTZTjK8da0e4GDgFV3 DAzA== X-Gm-Message-State: AOAM5305dxFjr0hN78nRl5gAUb2JacMoGNwOSji5dRXzn1sQypvZuVRK ug09U4TmpbnO2EIM1CGv0KRvoQ== X-Google-Smtp-Source: ABdhPJzvQHBl6Chcsv/zF6psJYIrXB7fxj1CAXvQqzy+08HzZ3fbAc7sQwPmZbAF4Qmn+KshYyci5w== X-Received: by 2002:aed:26a7:: with SMTP id q36mr2892127qtd.57.1598981989480; Tue, 01 Sep 2020 10:39:49 -0700 (PDT) Received: from eggly.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id g14sm2323619qkk.38.2020.09.01.10.39.46 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Tue, 01 Sep 2020 10:39:47 -0700 (PDT) Date: Tue, 1 Sep 2020 10:39:34 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@eggly.anvils To: Yang Shi cc: Hugh Dickins , Andrew Morton , Alex Shi , Johannes Weiner , Michal Hocko , Mike Kravetz , Shakeel Butt , Matthew Wilcox , Qian Cai , Chris Wilson , Kuo-Hsin Yang , Linux Kernel Mailing List , Linux MM Subject: Re: [PATCH 3/5] shmem: shmem_writepage() split unlikely i915 THP In-Reply-To: Message-ID: References: User-Agent: Alpine 2.11 (LSU 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Rspamd-Queue-Id: 46E1D16A4A1 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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, 1 Sep 2020, Yang Shi wrote: > On Sun, Aug 30, 2020 at 2:04 PM Hugh Dickins wrote: > > > > drivers/gpu/drm/i915/gem/i915_gem_shmem.c contains a shmem_writeback() > > which calls shmem_writepage() from a shrinker: that usually works well > > enough; but if /sys/kernel/mm/transparent_hugepage/shmem_enabled has > > been set to "force" (documented as "Force the huge option on for all - > > very useful for testing"), shmem_writepage() is surprised to be called > > with a huge page, and crashes on the VM_BUG_ON_PAGE(PageCompound) (I > > did not find out where the crash happens when CONFIG_DEBUG_VM is off). > > > > LRU page reclaim always splits the shmem huge page first: I'd prefer not > > to demand that of i915, so check and split compound in shmem_writepage(). > > > > Fixes: 2d6692e642e7 ("drm/i915: Start writeback from the shrinker") > > Signed-off-by: Hugh Dickins > > Cc: stable@vger.kernel.org # v5.3+ > > --- > > I've marked this for stable just for the info, but the number of users > > affected is very probably 1, so please feel free to delete that marking. > > > > mm/shmem.c | 9 +++++++++ > > 1 file changed, 9 insertions(+) > > > > --- 5.9-rc2/mm/shmem.c 2020-08-16 17:32:50.693507198 -0700 > > +++ linux/mm/shmem.c 2020-08-28 17:35:08.326024349 -0700 > > @@ -1362,7 +1362,15 @@ static int shmem_writepage(struct page * > > swp_entry_t swap; > > pgoff_t index; > > > > - VM_BUG_ON_PAGE(PageCompound(page), page); > > + /* > > + * If /sys/kernel/mm/transparent_hugepage/shmem_enabled is "force", > > + * then drivers/gpu/drm/i915/gem/i915_gem_shmem.c gets huge pages, > > + * and its shmem_writeback() needs them to be split when swapping. > > + */ > > + if (PageTransCompound(page)) > > + if (split_huge_page(page) < 0) > > + goto redirty; > > The change looks good to me. Acked-by: Yang Shi Thanks. > > Just a nit: it may be better to move the spilte after the !PageLocked > assertion? Split needs page locked too. I hadn't considered that, but I think it's best left as is: split_huge_page_to_list() has its own VM_BUG_ON_PAGE(!PageLocked(head), head); to enforce its needs: think of the old BUG_ON(!PageLocked(page)) below as enforcing shmem's needs, checking that split_huge_page() did not unlock it :) > > > + > > BUG_ON(!PageLocked(page)); > > mapping = page->mapping; > > index = page->index; > >