From patchwork Mon Feb 10 19:37:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13968586 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 6834DC021A4 for ; Mon, 10 Feb 2025 19:38:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 00C18280008; Mon, 10 Feb 2025 14:38:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id ED677280001; Mon, 10 Feb 2025 14:38:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D2A07280008; Mon, 10 Feb 2025 14:38:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id AD061280001 for ; Mon, 10 Feb 2025 14:38:32 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 6C966C0508 for ; Mon, 10 Feb 2025 19:38:32 +0000 (UTC) X-FDA: 83105046864.24.31E04C3 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf03.hostedemail.com (Postfix) with ESMTP id 3C98720008 for ; Mon, 10 Feb 2025 19:38:30 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=L3pjQWRh; spf=pass (imf03.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739216310; a=rsa-sha256; cv=none; b=18FfhvfZAjeg+3DroJtV9ClbEFPw9p1cOlqtjc/aLEoDkJBAkFZOWmliNdN3Q5gzmr4lac oeYOk26puCXb7oQXkmNdOsUdKT4fKl2Avs36W4xh4qUiWKCLbMwtgsm0zH5A7Wc8BbqKJ6 1dQeOIrmrjs9tL11c6R2eP9QGInYvDI= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=L3pjQWRh; spf=pass (imf03.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739216310; 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=fLiFHA5Aiy4k7pcGr1QPi7NyoGcLfJYJaAk0JBe4xM8=; b=1oSLKE/shAHExVo7nDYgOXcczqbjgcqsi4Sqxi7XqXXJNBsoS6s5cfTKa1XpiBCt3HLoG5 P6WNihwy+GSxSKROYkRkI/w7r3E27x4TA81+5Q8RXQ+BiT5jLlaD8Zf/biGMwgWgjyh+Yk uIRFxD+K+dWcX89HK40u5w5YN9GTL68= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739216309; h=from:from: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; bh=fLiFHA5Aiy4k7pcGr1QPi7NyoGcLfJYJaAk0JBe4xM8=; b=L3pjQWRhh3BsZDDLXrPjOxLWOO/HCflNIsa1vUTIVh1+ke2RU0Kiu5uE7bCacpq454GToh rVwqEIA/WSLT3GDqAZOn6xP+ojn57Ad1BOPmGdiRF+rjr0DJ1wFl4JDTkqTd1gKoqHeJuh JpCfuTB4epolwqzGum9In0oBSJRCfgg= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-447-9IEjIixsMiKAfjhWZoZGqg-1; Mon, 10 Feb 2025 14:38:28 -0500 X-MC-Unique: 9IEjIixsMiKAfjhWZoZGqg-1 X-Mimecast-MFC-AGG-ID: 9IEjIixsMiKAfjhWZoZGqg Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4388eee7073so27031045e9.0 for ; Mon, 10 Feb 2025 11:38:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739216307; x=1739821107; 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=fLiFHA5Aiy4k7pcGr1QPi7NyoGcLfJYJaAk0JBe4xM8=; b=C4+mV7xzpkJN2/2nrtNwte71peYENDIZUwq5KwLHreGb4r4q5tV84eU5FEC4fofgwd 3zSCbyPSele0Xj09e7a0Rp6gWPk/1OcA2cJL9a3y/vYHS6bm/Nab+LcZ+sFAF0jpNPwi C9cIUJ6SGAoTSsHToVwlRsbq2pBicl1OcKRIIysYfTGx2dWZSKaAKnJY/P35I6ZlWYnY F4jOA4k/069CRkBdu26PS38bOX8y7WfadxQNCZ4ZMuVF4HbBY8fmAeWwy9o7IXwKErm5 PZh40F3HRPZFGPKj+3xENicl9uOIuK31MTyE8s+4stbClZ1GwaZ3zlbmJwVCePULPefF HO7Q== X-Forwarded-Encrypted: i=1; AJvYcCXk7lAKAy84EeiTAA2FkkpQ1QNbxsyXcv3aBzLYjH8ZPsdSKnSljvBf/7sIhYnW74GpTajxBNIhAg==@kvack.org X-Gm-Message-State: AOJu0YxyAFpYH9I2/VBWIwd7HBmQYJLhOxnDThBenoegcFdVUW/pGINQ a1moXQnnSsbA/Io8huVLyG8wAO347siu5TuxA1ojNw//81NkCX2aR7Sq/LwTrXZSit0d0mP6eoq G4OeaPeYjkYqUNGH4H3eAbRrBZf+kC9E49AFyy4rkA/0LiXoJ X-Gm-Gg: ASbGncsLUcS9EewCutn2UTuvqfsbFoG5yyNiDC8SLLxlgfj0e2ONb/Aa7KnlyQVJo0u 7710ch1mpDan2oCMVSiLzqDNpsS+kB7a2R6GtH+vOhrfY+hz2txRgOyDOI7Akoik560wnbbLXxp znAiUFS1JmjsTRhRiH/WXwfXJ2IFq58qevyEFhU1XQv0kRCX3wkzZo5BwHNj5bMWLFGLz2tHefK uqAzM/zsZ18TnAxmVmPryiMDBiIFF/ZS5glgAVmIGSd1oAsvkuvGf1hKCFWG0C97kvMdGqMgJpP Mc/FjC+bLWtnVlE+F1VK0cP2pxDerS3RnGLQ2tMKOgyAqQRO78r8U9/5pfCL2Zxa5g== X-Received: by 2002:a05:6000:2ab:b0:38d:e3fd:1a1c with SMTP id ffacd0b85a97d-38de43b38d8mr568326f8f.23.1739216307218; Mon, 10 Feb 2025 11:38:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IGsdgSvAB5qD8mlN6AGjEYvBbSJNfBUob/X5TfyCrhv/WAdQoby+DEB/v6QRZcPR+eQm0f2lQ== X-Received: by 2002:a05:6000:2ab:b0:38d:e3fd:1a1c with SMTP id ffacd0b85a97d-38de43b38d8mr568308f8f.23.1739216306759; Mon, 10 Feb 2025 11:38:26 -0800 (PST) Received: from localhost (p200300cbc734b80012c465cd348aaee6.dip0.t-ipconnect.de. [2003:cb:c734:b800:12c4:65cd:348a:aee6]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38dc2f6aeafsm11911098f8f.20.2025.02.10.11.38.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Feb 2025 11:38:25 -0800 (PST) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-doc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org, nouveau@lists.freedesktop.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, damon@lists.linux.dev, David Hildenbrand , Andrew Morton , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , Jonathan Corbet , Alex Shi , Yanteng Si , Karol Herbst , Lyude Paul , Danilo Krummrich , David Airlie , Simona Vetter , Masami Hiramatsu , Oleg Nesterov , Peter Zijlstra , SeongJae Park , "Liam R. Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn , Pasha Tatashin , Peter Xu , Alistair Popple , Jason Gunthorpe , Simona Vetter Subject: [PATCH v2 06/17] mm: use single SWP_DEVICE_EXCLUSIVE entry type Date: Mon, 10 Feb 2025 20:37:48 +0100 Message-ID: <20250210193801.781278-7-david@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250210193801.781278-1-david@redhat.com> References: <20250210193801.781278-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: FI46hNkC42djEBkXMoH4Eo4eLZxDrt_dFktWTB7kPVo_1739216307 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: hmbpcsnetab3hno5r7mo4w4kxumo96ma X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 3C98720008 X-Rspam-User: X-HE-Tag: 1739216310-745505 X-HE-Meta: U2FsdGVkX18j6Ayt4ksnk7IUbyzBe5N6pwsdzFja21zf9J8b1h1ypqSn41cplMN/R00Lk5NE4J33R/XQCDul2A1teaZe5Evcq3zpndyACzad5KB7O6oLMrIGuF8X8px5M9g96iaz63h0oRgW4pDlQ0pbBBA7tOfl8eqOzWMyfRHnUuYTVe67WLVsgkVw+1UAXf0CsFQMGDPzLYz6poz6phKTcDCQZ35+ACIiIy4mX6OjOHX7IGIR9G0qRxj8lWg/qum2vgXvjNh+B7ZFsEKAIvSlit+MiYzibAr5RJL21hrS3SiMDBChPSF3UrWb37Vr82IYB/Mmwk1vx0xcsICIDyjWpLULjk3m/AZMFUpYCQECiXNNtaVWaxHOqbOHxd80q47MyiNC5aPSs1lq6GRA4gHjErYEbq59d/G6NHlihRPwKt9kAZTpcG/PFkIKsVCDYK/tDuTwK/2jIyMlJirRVSldv86Yw+ijaDEhRBZi+6A5KL0wozIInojsXKwGLaKMsg1jhTQCHuJJl5fJAMt9xkk9+eRFBwmlwrgBY/ekmYqMYNVwpqyu0JBMqySwqHz00LwjcOFsW0VnSPcedOcmhZnS4l8WaJCgndpgiDU5tB4r79Bsv4rhsOSC1Y8WQn5xC8FdDZc8xL9bO650NSV3bkLPnOWe7pV7LCQdafJIHW25ao32bidHvv4Z23/FnTCjkmT5qd3vQWRw4BQzJVO2rqFQSV8+6n+KdWODRgskqUdmjm6tO5lLe+pBlw796zvEjoYBiFiJNxr6aeGQ6LsQx8XU0bo3iOxsNPIzoHUtj8dzxBmJnK6Ci4yw630nh2mLEan4BS4ZBpXB5iVfdljME8pBaZsA6t6qYEqcfNSXpfnxsCEBUBawdQ0+WsOEmCdNzvJg6GyVrrhcpH5b9fiK4K737x1ErKJlQ2hZAdVHs5jzLTc2GJlITn68KGsu3kwu8HEul8lcCEGOh8Ufc8p D5YR9nHe lMpPV8gq4brqSqbjoadJz2b/TKPAXpUOwN6KfCXbcwKsBhhhPuRYbZCgqT3hPWzpQKkLzXf91Nu4sawiIMHCaK1kGRWF02PI6DS+PKOmN0yUzo12XBgKQdb4Qe+26ZmRFgTGkVzbRufkBAtvaUcHgAwW8EQyGRA+uEyIpm8M1XTi95yTDAb0vWHm7ziwY4KvM3InFVhjBRgvz0leDf6MP3DmX0zYhZAAi4oKlD9hzJ5UU7N7sT/IsILwhu77eMML1dUcwEVIFJba/9A+RxrlzYhpgd1mhe4bARYe/BjKRqXLWyvk1GLBr7JZRJwFp6oKyjHWsgwfD2593s5tqYGSOMMbFpmDgUybVvfVdavYusj+fTG4cXHQO0/zuqW4mk2wXWLWUWnarrrxaGO5j7HcG88+ZPLHYDJ52Qbup7EoGGGq0ec3mjh9goGZn+EJBIDEItuMpHYP9ARqY8NX+MC4XHZvolwFqIdEo53zTTx/XIRYOs38WBt3sulybN25lbN3KzlD6UzjJ37MkA4pTT6LxbsoDmcoXR/3ix8FdF2o/ob5fNf8= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: There is no need for the distinction anymore; let's merge the readable and writable device-exclusive entries into a single device-exclusive entry type. Acked-by: Simona Vetter Reviewed-by: Alistair Popple Signed-off-by: David Hildenbrand --- include/linux/swap.h | 7 +++---- include/linux/swapops.h | 27 ++++----------------------- mm/mprotect.c | 8 -------- mm/page_table_check.c | 5 ++--- mm/rmap.c | 2 +- 5 files changed, 10 insertions(+), 39 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index b13b72645db33..26b1d8cc5b0e7 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -74,14 +74,13 @@ static inline int current_is_kswapd(void) * to a special SWP_DEVICE_{READ|WRITE} entry. * * When a page is mapped by the device for exclusive access we set the CPU page - * table entries to special SWP_DEVICE_EXCLUSIVE_* entries. + * table entries to a special SWP_DEVICE_EXCLUSIVE entry. */ #ifdef CONFIG_DEVICE_PRIVATE -#define SWP_DEVICE_NUM 4 +#define SWP_DEVICE_NUM 3 #define SWP_DEVICE_WRITE (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM) #define SWP_DEVICE_READ (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+1) -#define SWP_DEVICE_EXCLUSIVE_WRITE (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+2) -#define SWP_DEVICE_EXCLUSIVE_READ (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+3) +#define SWP_DEVICE_EXCLUSIVE (MAX_SWAPFILES+SWP_HWPOISON_NUM+SWP_MIGRATION_NUM+2) #else #define SWP_DEVICE_NUM 0 #endif diff --git a/include/linux/swapops.h b/include/linux/swapops.h index 96f26e29fefed..64ea151a7ae39 100644 --- a/include/linux/swapops.h +++ b/include/linux/swapops.h @@ -186,26 +186,16 @@ static inline bool is_writable_device_private_entry(swp_entry_t entry) return unlikely(swp_type(entry) == SWP_DEVICE_WRITE); } -static inline swp_entry_t make_readable_device_exclusive_entry(pgoff_t offset) +static inline swp_entry_t make_device_exclusive_entry(pgoff_t offset) { - return swp_entry(SWP_DEVICE_EXCLUSIVE_READ, offset); -} - -static inline swp_entry_t make_writable_device_exclusive_entry(pgoff_t offset) -{ - return swp_entry(SWP_DEVICE_EXCLUSIVE_WRITE, offset); + return swp_entry(SWP_DEVICE_EXCLUSIVE, offset); } static inline bool is_device_exclusive_entry(swp_entry_t entry) { - return swp_type(entry) == SWP_DEVICE_EXCLUSIVE_READ || - swp_type(entry) == SWP_DEVICE_EXCLUSIVE_WRITE; + return swp_type(entry) == SWP_DEVICE_EXCLUSIVE; } -static inline bool is_writable_device_exclusive_entry(swp_entry_t entry) -{ - return unlikely(swp_type(entry) == SWP_DEVICE_EXCLUSIVE_WRITE); -} #else /* CONFIG_DEVICE_PRIVATE */ static inline swp_entry_t make_readable_device_private_entry(pgoff_t offset) { @@ -227,12 +217,7 @@ static inline bool is_writable_device_private_entry(swp_entry_t entry) return false; } -static inline swp_entry_t make_readable_device_exclusive_entry(pgoff_t offset) -{ - return swp_entry(0, 0); -} - -static inline swp_entry_t make_writable_device_exclusive_entry(pgoff_t offset) +static inline swp_entry_t make_device_exclusive_entry(pgoff_t offset) { return swp_entry(0, 0); } @@ -242,10 +227,6 @@ static inline bool is_device_exclusive_entry(swp_entry_t entry) return false; } -static inline bool is_writable_device_exclusive_entry(swp_entry_t entry) -{ - return false; -} #endif /* CONFIG_DEVICE_PRIVATE */ #ifdef CONFIG_MIGRATION diff --git a/mm/mprotect.c b/mm/mprotect.c index 516b1d847e2cd..9cb6ab7c40480 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -225,14 +225,6 @@ static long change_pte_range(struct mmu_gather *tlb, newpte = swp_entry_to_pte(entry); if (pte_swp_uffd_wp(oldpte)) newpte = pte_swp_mkuffd_wp(newpte); - } else if (is_writable_device_exclusive_entry(entry)) { - entry = make_readable_device_exclusive_entry( - swp_offset(entry)); - newpte = swp_entry_to_pte(entry); - if (pte_swp_soft_dirty(oldpte)) - newpte = pte_swp_mksoft_dirty(newpte); - if (pte_swp_uffd_wp(oldpte)) - newpte = pte_swp_mkuffd_wp(newpte); } else if (is_pte_marker_entry(entry)) { /* * Ignore error swap entries unconditionally, diff --git a/mm/page_table_check.c b/mm/page_table_check.c index 509c6ef8de400..c2b3600429a0c 100644 --- a/mm/page_table_check.c +++ b/mm/page_table_check.c @@ -196,9 +196,8 @@ EXPORT_SYMBOL(__page_table_check_pud_clear); /* Whether the swap entry cached writable information */ static inline bool swap_cached_writable(swp_entry_t entry) { - return is_writable_device_exclusive_entry(entry) || - is_writable_device_private_entry(entry) || - is_writable_migration_entry(entry); + return is_writable_device_private_entry(entry) || + is_writable_migration_entry(entry); } static inline void page_table_check_pte_flags(pte_t pte) diff --git a/mm/rmap.c b/mm/rmap.c index 0cd2a2d3de00d..1129ed132af94 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -2492,7 +2492,7 @@ struct page *make_device_exclusive(struct mm_struct *mm, unsigned long addr, * do_swap_page() will trigger the conversion back while holding the * folio lock. */ - entry = make_writable_device_exclusive_entry(page_to_pfn(page)); + entry = make_device_exclusive_entry(page_to_pfn(page)); swp_pte = swp_entry_to_pte(entry); if (pte_soft_dirty(fw.pte)) swp_pte = pte_swp_mksoft_dirty(swp_pte);