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;
From:   Mike Kravetz <mike.kravetz@oracle.com>
To:     linux-mm@kvack.org, linux-kernel@vger.kernel.org
Cc:     Naoya Horiguchi <naoya.horiguchi@linux.dev>,
        David Hildenbrand <david@redhat.com>,
        Axel Rasmussen <axelrasmussen@google.com>,
        Mina Almasry <almasrymina@google.com>,
        Michal Hocko <mhocko@suse.com>, Peter Xu <peterx@redhat.com>,
        Andrea Arcangeli <aarcange@redhat.com>,
        Shuah Khan <shuah@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Mike Kravetz <mike.kravetz@oracle.com>
Subject: [PATCH v2 1/3] mm: enable MADV_DONTNEED for hugetlb mappings
Date:   Tue,  1 Feb 2022 17:40:32 -0800
Message-Id: <20220202014034.182008-2-mike.kravetz@oracle.com>
In-Reply-To: <20220202014034.182008-1-mike.kravetz@oracle.com>
References: <20220202014034.182008-1-mike.kravetz@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eJzh8fpveZa/MRBux/+ii6gTEcTNZP8Z+84CuEoK05Q+rfB8SS/NLhtAeeCV?=
 =?us-ascii?Q?KauiEF8iDbM9vow/Mf7JdAesPzvfDCWpQazfzQo0FR0QAILX3c76sBra3WDt?=
 =?us-ascii?Q?MB8bQ+WeMUisoKHEin6xzodusoDoJf92V3eCh4A468hD9gMHADzYzP1Bqb8/?=
 =?us-ascii?Q?01TxO60DxLhzXP6fZA0TBQZDsyw4hMWsiQJVqWukE8nyzFr4qL5VQiEEZjkL?=
 =?us-ascii?Q?X3F4/G/lYb1MAvELV46nf3gRLWWjH2jrK/DhJJ/NzZj2dtTfy+CEgBwvQZGF?=
 =?us-ascii?Q?PL3XkrNW9J6WV2KXe+9Li3i/Wh1jhADbpx5YEX2giZcNXrjCyzUNMkwaezfk?=
 =?us-ascii?Q?CCV6MgGz44KtKykClYb/qxjG2H8f7Avbgjm03lKCYkksEZ0ZNCVfe7vBT9Jy?=
 =?us-ascii?Q?lv5WbGTSAhnCMBr+BcuyBBmxuBkoXL3LDyfzwHOLJCr7ML5+3smtU2QRLlqi?=
 =?us-ascii?Q?EI2BM4MCANF+hTRrIO0aquwet7V9z3w/zS6zSBxbUhLjnulg7t7dC28kUJ+n?=
 =?us-ascii?Q?PdEP+N/cPnknn/FdSrpbivV+35QonNG9DqU6auvNwiH67zrae/ctx9h5kV+v?=
 =?us-ascii?Q?g/LcHDjGEVXOcYbzIiiYJWvBDRsY5VgB2iMqIY4kQGBGnezJLYYoBZ096Lls?=
 =?us-ascii?Q?zAqk7uuqsFp0ewpsqkRtgnYB2tupb3zfrsbQUsaZPFJwRj3MlEbDSO5eI/ld?=
 =?us-ascii?Q?HjyjoIoaPcppTHWi+PqI7LS7oEI1XiKiaBpbv0SlhZXMIgSk5PkCE9TRIy4i?=
 =?us-ascii?Q?+MZxYiq4pJ66n1ZG1xDDhgL6Zv7DA0iHPonB0/6ut8XppKdOIwRV8VScPGSN?=
 =?us-ascii?Q?2EHYKBrdKGi65EOILIEbQhjTRSu6wMsR4hC76xVUZ+nS8YnPlgLDqmtJeSN3?=
 =?us-ascii?Q?2Ob4ThXagscGnUDwwG6OWLWoLlbOMzLSy2yTSD1zQ9kPD9EWX6j3gboOEYBF?=
 =?us-ascii?Q?WJDs11XDLUfUcB0ZLpXskdTUdYyf51uUdx6I3Hc7B11Dhek+6ucnCHMb0mWO?=
 =?us-ascii?Q?IjO/TvfcEl3jEHeKXMICTqMHQgJVroXxbl0OKyraRx6mf5s41mm9BShx4M8A?=
 =?us-ascii?Q?gdsP3+yiwY92/CgD3NWeBSf9sCg2wyRX4csdR5iYrcfyBGhHYGUgVa3ARhni?=
 =?us-ascii?Q?PbhaUUwlH9oJHJgNpXCdKJeyRN1XBJREUhbdcaUHlw6TRMRB+9SSpnDP29VX?=
 =?us-ascii?Q?rE9CwM6G4sxXv5PxZkoKn2PN6qm5hw0aKOvXhbNptUoeDU3emB7f9HbO6fA8?=
 =?us-ascii?Q?tO9jIQ7oLTL9sstepKl3Fas0EF80UXhScgBJBRBgTXrc2LFR6zFjselGMGWG?=
 =?us-ascii?Q?UQG5qE5SL29yF/eQt3jxa5mlipOyU68luwCjz/DQV5UY8iFXTf3Gafv4jouR?=
 =?us-ascii?Q?JYFA2P2SxBaYH4AP1lUZijDNcm4NJswPBfKObuWImh0rI7q7YrHOpWGDaWTR?=
 =?us-ascii?Q?awy6EKpTwHq+5zU7ayBR+QtPpHYiufY1+zvwmRgrfGE3WvBWM0nmwOuzP7On?=
 =?us-ascii?Q?r6F56O+Ofn4G2bAkxawwaXDYKrWrXrh4GDK1/aHJ2RhqCZUUHEJHLkELz7K1?=
 =?us-ascii?Q?Ua03vyJdC9zIqFchgNjToA681bfVoVsr8GQl7NnTKIu+GPc1RVzpH4Ods/B5?=
 =?us-ascii?Q?ujpiMnZcoLQEcTcD3hSjQUI=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 63c47189-2d8b-451c-5648-08d9e5ed129c
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4201.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2022 01:41:03.3130
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: A6om8MX0LGt2DlaRyVpCXXc8C8pZDIQL215JN763o7hUuBSIlaUCoCmMcq+3QLRh5mwJjCu3FZ3CXzNeCsrYVw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3433
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10245 signatures=673430
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxscore=0 spamscore=0
 bulkscore=0 adultscore=0 mlxlogscore=918 phishscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2202020004
X-Proofpoint-ORIG-GUID: 6gTJYGYbgXd2uZTpWJST8zAVIS9xH3QQ
X-Proofpoint-GUID: 6gTJYGYbgXd2uZTpWJST8zAVIS9xH3QQ
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

MADV_DONTNEED is currently disabled for hugetlb mappings.  This
certainly makes sense in shared file mappings as the pagecache maintains
a reference to the page and it will never be freed.  However, it could
be useful to unmap and free pages in private mappings.

The only thing preventing MADV_DONTNEED from working on hugetlb mappings
is a check in can_madv_lru_vma().  To allow support for hugetlb mappings
create and use a new routine madvise_dontneed_free_valid_vma() that will
allow hugetlb mappings.  Also, before calling zap_page_range in the
DONTNEED case align start and size to huge page size for hugetlb vmas.
madvise only requires PAGE_SIZE alignment, but the hugetlb unmap routine
requires huge page size alignment.

Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
---
 mm/madvise.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/mm/madvise.c b/mm/madvise.c
index 5604064df464..7ae891e030a4 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -796,10 +796,30 @@ static int madvise_free_single_vma(struct vm_area_struct *vma,
 static long madvise_dontneed_single_vma(struct vm_area_struct *vma,
 					unsigned long start, unsigned long end)
 {
+	/*
+	 * start and size (end - start) must be huge page size aligned
+	 * for hugetlb vmas.
+	 */
+	if (is_vm_hugetlb_page(vma)) {
+		struct hstate *h = hstate_vma(vma);
+
+		start = ALIGN_DOWN(start, huge_page_size(h));
+		end = ALIGN(end, huge_page_size(h));
+	}
+
 	zap_page_range(vma, start, end - start);
 	return 0;
 }
 
+static bool madvise_dontneed_free_valid_vma(struct vm_area_struct *vma,
+						int behavior)
+{
+	if (is_vm_hugetlb_page(vma))
+		return behavior == MADV_DONTNEED;
+	else
+		return can_madv_lru_vma(vma);
+}
+
 static long madvise_dontneed_free(struct vm_area_struct *vma,
 				  struct vm_area_struct **prev,
 				  unsigned long start, unsigned long end,
@@ -808,7 +828,7 @@ static long madvise_dontneed_free(struct vm_area_struct *vma,
 	struct mm_struct *mm = vma->vm_mm;
 
 	*prev = vma;
-	if (!can_madv_lru_vma(vma))
+	if (!madvise_dontneed_free_valid_vma(vma, behavior))
 		return -EINVAL;
 
 	if (!userfaultfd_remove(vma, start, end)) {
@@ -830,7 +850,7 @@ static long madvise_dontneed_free(struct vm_area_struct *vma,
 			 */
 			return -ENOMEM;
 		}
-		if (!can_madv_lru_vma(vma))
+		if (!madvise_dontneed_free_valid_vma(vma, behavior))
 			return -EINVAL;
 		if (end > vma->vm_end) {
 			/*
-- 
2.34.1