From patchwork Thu Mar 2 23:27:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 63657 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp127079wrd; Thu, 2 Mar 2023 15:45:02 -0800 (PST) X-Google-Smtp-Source: AK7set8YGv5+xotLLXrmFzESHxtDD+SuCPEpTTMpISkPUgOJ1YPKy7ycs/klw1p45sxy5gvMhBw2 X-Received: by 2002:a17:90b:3912:b0:234:e3f:f53b with SMTP id ob18-20020a17090b391200b002340e3ff53bmr13179914pjb.21.1677800702053; Thu, 02 Mar 2023 15:45:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677800702; cv=none; d=google.com; s=arc-20160816; b=a4kzB44aKE7qh/c90Jao+C8PrHG5QmGS0mkTaoXvQJ+D021Ha2lch1QcdlCOq2tWQS FltrFtCTbgaYu2FV19bSBVMWrdJSD0KV2v+bwxsxQ/eNsHCrxdMAQoqEsAIzSVezzlJt 7myyovH4kl716pyXhIUkIVoSAJIGA4iwF6jL8wCdl03OEu65rGW0xpgxV2BCqM+nf3nn 1MB3xZYUmSX0o6dsrHjxCRfwitQpSQEPlu2Mi+eSTDl3p/9eay2m6nyKTcVQTlq5F19J utHCU4DsORKzPdZLvy9qoNG0fXUsPItDn6LKolE5hIAl04HqMJ+GGLHyqRVdm6fDfSP0 Z7Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qG5U0uWPFmEbIzb8qGwDd3VP74J/BRogOkPK92T1eiw=; b=U9JldxxzqjHfWyQC+dAqYPVYqQz+ZSy3gJ+ERuoT3bgIv9I13OztstavoodctQrc1v iBAIwe6Cyj7fPs6ehpDUhs1YEn679pGo0EoMRKErhFjjXcAetj6Ulaw4oUhSYPD0AZtK nR5EC7hYjYaSKzwUYDrWjgjxf0FEPI0i6MC2xMCFidlZqJOZ1ejzkUt2aUwZNHixfziQ xld46X/H6/0BYPRyWGZqKdAQbmm7LcR/G1O5Z4zzRvGc7zAAgh8mRbavumipcmvQBgUU aKzQTBhZS3ZWG53WrhS0VXGEckT3n3RLmLR1kR3b0C4nGy4F7mrkPJM9MLU8gu6Bp7Mj rOVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=4Mn4cSCA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lb3-20020a17090b4a4300b00233e4acc8d5si731436pjb.170.2023.03.02.15.44.46; Thu, 02 Mar 2023 15:45:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=4Mn4cSCA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229947AbjCBX2M (ORCPT + 99 others); Thu, 2 Mar 2023 18:28:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229458AbjCBX2L (ORCPT ); Thu, 2 Mar 2023 18:28:11 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAC5212598 for ; Thu, 2 Mar 2023 15:28:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=qG5U0uWPFmEbIzb8qGwDd3VP74J/BRogOkPK92T1eiw=; b=4Mn4cSCAgRAwfc+ofEk7syFvU4 lgI+PixYXC7I6rMVPFt85Y4M8oB/dWwp5q6YY7j/3hgM2uh2P7ZtiZ22ho1zzeWefT3wd+huLJpxd mvGW2hfn1RtW61xAcyyeVfH9HN8JlRi29H3roFcGHcEC+b/G8QXX5LxaV7GoFHadburRxTnA/MMf9 +OPgxbeXJdcEcdQlRLQ0xbxT//SyOp14A7a7SO3dbpZWiKOO2+0j1sd9qtehWMvQZKVPoRxZhSOC9 XOO9h5XjMa5XF91JikH0HlR1tccdHYPW2mUwbxqK+PvPIFK+WTgqQha6vzzE6HKxjq0hmzN8pLejD /ppNx6LQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pXsL9-003j3O-BB; Thu, 02 Mar 2023 23:27:59 +0000 From: Luis Chamberlain To: hughd@google.com, akpm@linux-foundation.org, willy@infradead.org, brauner@kernel.org Cc: linux-mm@kvack.org, p.raghav@samsung.com, da.gomez@samsung.com, a.manzanares@samsung.com, dave@stgolabs.net, yosryahmed@google.com, keescook@chromium.org, mcgrof@kernel.org, patches@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] shmem: skip page split if we're not reclaiming Date: Thu, 2 Mar 2023 15:27:56 -0800 Message-Id: <20230302232758.888157-5-mcgrof@kernel.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230302232758.888157-1-mcgrof@kernel.org> References: <20230302232758.888157-1-mcgrof@kernel.org> MIME-Version: 1.0 Sender: Luis Chamberlain X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759301549041746379?= X-GMAIL-MSGID: =?utf-8?q?1759301549041746379?= In theory when info->flags & VM_LOCKED we should not be getting shem_writepage() called so we should be verifying this with a WARN_ON_ONCE(). Since we should not be swapping then best to ensure we also don't do the folio split earlier too. So just move the check early to avoid folio splits in case its a dubious call. We also have a similar early bail when !total_swap_pages so just move that earlier to avoid the possible folio split in the same situation. Signed-off-by: Luis Chamberlain Acked-by: David Hildenbrand Reviewed-by: Yosry Ahmed --- mm/shmem.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index a5a6da51087e..6006dbb7dbcb 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1352,6 +1352,12 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) goto redirty; } + if (WARN_ON_ONCE(info->flags & VM_LOCKED)) + goto redirty; + + if (!total_swap_pages) + goto redirty; + /* * If /sys/kernel/mm/transparent_hugepage/shmem_enabled is "always" or * "force", drivers/gpu/drm/i915/gem/i915_gem_shmem.c gets huge pages, @@ -1367,10 +1373,6 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) } index = folio->index; - if (info->flags & VM_LOCKED) - goto redirty; - if (!total_swap_pages) - goto redirty; /* * This is somewhat ridiculous, but without plumbing a SWAP_MAP_FALLOC