From patchwork Thu Jun 13 00:07:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Barry Song <21cnbao@gmail.com> X-Patchwork-Id: 13695693 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 427CFC27C53 for ; Thu, 13 Jun 2024 00:08:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C9D076B0098; Wed, 12 Jun 2024 20:08:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C4D376B0099; Wed, 12 Jun 2024 20:08:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AC6BE6B009A; Wed, 12 Jun 2024 20:08:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 8C99D6B0098 for ; Wed, 12 Jun 2024 20:08:03 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 4C8651A09BE for ; Thu, 13 Jun 2024 00:08:03 +0000 (UTC) X-FDA: 82223927646.16.D5A8FD7 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf04.hostedemail.com (Postfix) with ESMTP id 74F5A40008 for ; Thu, 13 Jun 2024 00:08:01 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=XuqLNeCM; spf=pass (imf04.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718237280; a=rsa-sha256; cv=none; b=u9bXKcgejXqYdPYMWYyxvlMSZjV2yV8CvRfnvA6/7duL8d0vQvvOb6XtT0An0xY5qZ25Bi s0NrGZD2j2aRvVze5SmFqPN5kxEYm8FnSdUEV5AUH2K3gtl4ZCx4HHDyRKzL63FB30rJWX YMIC2HWwPuIkHCcdF2EsrXic81oWI5s= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=XuqLNeCM; spf=pass (imf04.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718237280; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=oOir94itApCcnCYgLiAuZL5MLif6sFkW68CX2FRT/Do=; b=dCOTt639gJT+aN6wLzfHX8nwVgIHadV2W1T2bLufY68MRyPiw3AbOdP8c7fqE1dbT8wvbW FeiTNKzo6svr2SQbkQ27esUNjX9lNu5+KxJXhJ1oYtX1dfK0Tw7xVRAb5IP+D38TqNdNA/ 8ytmKSW7TpujBZGteraJ+gOORcXb84s= Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1f7274a453bso4117565ad.2 for ; Wed, 12 Jun 2024 17:08:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718237280; x=1718842080; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oOir94itApCcnCYgLiAuZL5MLif6sFkW68CX2FRT/Do=; b=XuqLNeCMZGzxm2RR4g/SiiqhJ8L/BdWH02gdGobGjS0hQme6GauXra6c8XCBIykkpv PiDcPaVsgjRYQ9ZcyYeo0Hw+2puAPVYmj6uK5wrar8ZWOIQPVLI7uxL8xkO1KkKFNbaR SOOcj4gDpiU4+ucywHYXlaschjExHUYFHwpijgveEQEcjV8xileWNWZueL72QhVFrU70 A1NcqK94bmzu7M+1/txoot9PsdU+xF5nT2zh2ihFbtknM4e+GoB6/eM1EX+gzC7P3i+O mQMPvT5APGmDTbYOrcM/09CCIg9y0en0uS6iMPLXIBcV1oXEd+a74qepYS8RH16tyTue uLYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718237280; x=1718842080; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oOir94itApCcnCYgLiAuZL5MLif6sFkW68CX2FRT/Do=; b=EokNyQpJenXea7DNnw1dca4PoIyDiqDCYsehxfJKH6s5bOMAqnDvdkh+B1+/PR44Et 0e78dxRer2BUIW1TQLqqlaryZIlg7NhEi+K4pOvCl8zRpYlWBJMRvPvSHevteC9HhUpP DML0pcRDfyoKBwNl/DdTISfONHfmTXHSOArfwvmkYilicFEAnm1iOvq0UXrh9lAZHSU/ MSU0mLZjyM4HAEGiQpuIU1kcD0CilVWAyssUn4GEMUBa2tdkDWT9reukOPJL8YR4lxI8 vxEtneIO3mkfsM8l9/HjE2rwq51Ma8SLaUakvsjLbdntv9HlhEnEZ/27Oncy8iyU79vn tjuw== X-Forwarded-Encrypted: i=1; AJvYcCWSntu16F/IMLOEpFmggXGtmVNztHJRhELy5RoTtQHVjSJ0jF/iRqePUPZuByI1eieWApwwmhh1hSx/iZxnkFrBFzc= X-Gm-Message-State: AOJu0YxtKbYCuF52l71tnRiR0b8F9SkPUHa1L0eh3UGA4syf6Thsd1Ba YfQCQdkIZDhcfnGIYE1jB+qoScc6WoQYChIioMjtqszpSb9h0Tyo X-Google-Smtp-Source: AGHT+IF6Dwth/q4utPM0FRywSk8vwXXsQspGeBZ4bBzg0jTpx0YsRNhvhNn2CVgfUyqsr9q7gfvTsQ== X-Received: by 2002:a17:902:db11:b0:1f7:3042:9727 with SMTP id d9443c01a7336-1f83b522f7emr36687645ad.4.1718237280269; Wed, 12 Jun 2024 17:08:00 -0700 (PDT) Received: from localhost.localdomain ([2407:7000:8942:5500:aaa1:59ff:fe57:eb97]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f855f1af16sm525515ad.246.2024.06.12.17.07.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jun 2024 17:07:59 -0700 (PDT) From: Barry Song <21cnbao@gmail.com> To: david@redhat.com, akpm@linux-foundation.org, linux-mm@kvack.org Cc: chrisl@kernel.org, linux-kernel@vger.kernel.org, mhocko@suse.com, ryan.roberts@arm.com, baolin.wang@linux.alibaba.com, yosryahmed@google.com, shy828301@gmail.com, surenb@google.com, v-songbaohua@oppo.com, willy@infradead.org, ying.huang@intel.com, yuzhao@google.com Subject: [PATCH RFC 2/3] mm: do_swap_page: use folio_add_new_anon_rmap() if folio_test_anon(folio)==false Date: Thu, 13 Jun 2024 12:07:20 +1200 Message-Id: <20240613000721.23093-3-21cnbao@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240613000721.23093-1-21cnbao@gmail.com> References: <20240613000721.23093-1-21cnbao@gmail.com> MIME-Version: 1.0 X-Stat-Signature: o7ommx19eugudxiayxrsewd34uaw6pf7 X-Rspamd-Queue-Id: 74F5A40008 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1718237281-189405 X-HE-Meta: U2FsdGVkX19lKVIvRyFK1yKTGmpaeVNwGK6BLJdaDL7H64bHtYxn/2863kMwSeohJh+SfaldBFU62QcrZ8FUE5CXVKqcCBwdLGpyyO/INlcWNukGmUjknb2RJmBqnWUxQTE5cKL43gY4mBftYoZkHx/7Ke6N7mUW4k6/FSRFJAacNS5YYsJRcnvw35TA7OBMylIhSIgfmO1/bjPyu5rzHa7XeouFoIEfhJJRjriUKMYke8PfG73KW+koidYxCfEEjJzJ01WVLey3HUHQTpPFYDNlSt6Ggr1RHExScVMNm5nkZwUaEytWg9XelQaafVPClVgeH6jiMHcaAZiijZ5s0QMh1qTe3gDcmBESEi0QV/Q9NNi8wXW4xa8JRXePQhiBHb0ibmKSq/uwySbQKpXSRw2DbK1BmI1VhipJgaRPSXkTGwsWSFV4Xs55R+uYRVT+gvEhtw6Q7BA/LmUM3te8ADSgL6l7TsPE8iENM4KVISO4WOhZpXw+oJKkOX0KWeh4plOIYLBSl/TY2aVbOgrmNcvWc8VoM9vU2h9Xsw0GkZyxXVfzfR8lWVVhHAUbM8TAdi0I1pqpGU3NEniEwcsl0zPA728KnbkF3FvUdLRtlgkfnDlPjvRFCK7fxiN0s4MC9kEazu4/dJquIS605eqYDukjB/0CZiDx8vxdJPcwDUcAHhdo10JD4tasLMmb9VYfKJpTjqVJT/NO9tExCNrzRKemiRWY/u/slSh/Ol2rWI/9wju6zGkvFVf0CSO/Ib7cFH7yY6HIBvyArOmUT1anq+2Q7wIdQmTxd2DsFwGAez/x4MjKPJ6XIQPhKJHOvrHvhV6Y2U9LxWVVbW8EeWki92OVM2IfxJxJTjNDMxsVuEOXzWrnnkr3d3mf0NkKBfN/i63MD+WhJI5I/ANXlSYqJ1y8BjiUcfgpABtv2bxhLV2E9NDHum0NppZ3VelqhYi7NrU2FqghcJPFxmPCg/T CjYtmkRm 1bkdH87usgQLwA0vQtdGElDaQkSUSdNSok2CM+Bwog5NdtrPoCekn6eA1Erk0jJAXoAWf0ZepUnrL396iHbPAcZ8JLjRz2xG+pySITRKFFwQRgKembtxlzbfF2WVS5cM/ik1h+qVKOFEuOCc2RdDjnii/iEVhmobwlFPYM6mgN4rRrYzl5Stiz1oWuAP/BQtX+rZbhyXNlXZO3KAmjJjlbjTRfhCaHFrOd/EyjCXgz6Zi2KovxuWoL8BDQrY9QxlwUivve00l36MVpS6xxGPo1XujdRFmQuXuQr6ccHwqjbEe2LDTH/rmyCQlUeUA7m2kO9UfrpZpB3OPxKbV9mvkfmA0DbZ+ieRsAVC37RSlQyAomRps1fy15x74skzo1hTxqdcYhSTeGygOgGCwrKa09Nhr2lwmIWmtWBCWbatC5bZQC4Lm+NvrpuACw4IqqsjoMMrLevGFmdCh05DpvsC0jXKhnj5rPssC8hb4P/UV0JLGGydCo+vVLy+S8zNWEydi6XsbW+N+apmgryC4eECOWD36FPuJNnKUvmcv 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: List-Subscribe: List-Unsubscribe: From: Barry Song For the !folio_test_anon(folio) case, we can now invoke folio_add_new_anon_rmap() with the rmap flags set to either EXCLUSIVE or non-EXCLUSIVE. This action will suppress the VM_WARN_ON_FOLIO check within __folio_add_anon_rmap() while initiating the process of bringing up mTHP swapin. static __always_inline void __folio_add_anon_rmap(struct folio *folio, struct page *page, int nr_pages, struct vm_area_struct *vma, unsigned long address, rmap_t flags, enum rmap_level level) { ... if (unlikely(!folio_test_anon(folio))) { VM_WARN_ON_FOLIO(folio_test_large(folio) && level != RMAP_LEVEL_PMD, folio); } ... } It also enhances the code’s readability. Suggested-by: David Hildenbrand Signed-off-by: Barry Song --- mm/memory.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/memory.c b/mm/memory.c index 2f94921091fb..9c962f62f928 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4339,6 +4339,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) if (unlikely(folio != swapcache && swapcache)) { folio_add_new_anon_rmap(folio, vma, address, RMAP_EXCLUSIVE); folio_add_lru_vma(folio, vma); + } else if (!folio_test_anon(folio)) { + folio_add_new_anon_rmap(folio, vma, address, rmap_flags); } else { folio_add_anon_rmap_ptes(folio, page, nr_pages, vma, address, rmap_flags);