From patchwork Thu Feb 6 06:15:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 13962281 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 8E3AAC02196 for ; Thu, 6 Feb 2025 06:15:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2F98C6B0095; Thu, 6 Feb 2025 01:15:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2A9336B0098; Thu, 6 Feb 2025 01:15:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 14CC76B0099; Thu, 6 Feb 2025 01:15:29 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id E001C6B0095 for ; Thu, 6 Feb 2025 01:15:28 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 89F551A0EA2 for ; Thu, 6 Feb 2025 06:15:28 +0000 (UTC) X-FDA: 83088507936.03.1C673E6 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf17.hostedemail.com (Postfix) with ESMTP id 059B34000B for ; Thu, 6 Feb 2025 06:15:26 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=AeS+zBDr; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf17.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738822527; a=rsa-sha256; cv=none; b=J6aP/q9rEm8TpohrqUmo49YidQ14dKO6mZn7E9UQ+301vPvzpt9Iuu13Qqysx++O63gr1U /aUWaxH8AIXSEV/YXI5LkmN6YJXrBzlY4/HX8OTSfyjY366Uzht8yKE/pUrB1BzxzoWtB5 9GxrWoWP4ov4nj1td6QinsckSYGMLtY= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=AeS+zBDr; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf17.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738822527; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=kl7TKXcbTcFj5iJ+BH+SzL4FJu2WVjds3yDj1decLNQ=; b=C02rYSA3oTWGGrUhz/LGxR/elVGueobI0N0ltQznCNAnOyx3wkWP8ukLsWUfXuSj78hkpr KYNnTueB9jj0YqcsgUmqIVIk2xPMVsLbq3YGfWzOOy742516+tt4JVTohk4SRj92uz1OC0 I52z6b/k9/A9V4hOeQDdk9kd8DT2FEA= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 70191A43D8A; Thu, 6 Feb 2025 06:13:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5517C4CEE7; Thu, 6 Feb 2025 06:15:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738822526; bh=MP/17pf09yAFjnq6HfK1rSNsdKEXlrcNK/A1rjmLh9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AeS+zBDrcocIE5whSD/5gWTiHktVgl4p1z2AIiKeTcCh7xmQYLD+OXL/RaZfFtNcu hV1sCJcNigWgqPbttaPV4aOO1TIGzB6zT9MtTB+m3BwqfA2+u4O+xc8GLeo8W9DGds x/93/07bnlYUuqh3x8jnyxl6WwwrXLZigIC2mljeqwpA2HmsX3TgbDO+Cm91Gdq4C+ cBU/LRxPoRAAuv426uEieDoORu6nhMXi7jb0qNlNssLt7jWZwV6J4rVPBQ5G9ittRh Sb1TCC8ZuELFpKY3xHwi1CO6RGRYiv1weim8TPZB9h22iVgvfa+V83ScIn6iNEVS0V URqSXH8iKa+hg== From: SeongJae Park To: Andrew Morton Cc: SeongJae Park , "Liam R. Howlett" , David Hildenbrand , Davidlohr Bueso , Lorenzo Stoakes , Shakeel Butt , Vlastimil Babka , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 4/4] mm/madvise: remove redundant mmap_lock operations from process_madvise() Date: Wed, 5 Feb 2025 22:15:17 -0800 Message-Id: <20250206061517.2958-5-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250206061517.2958-1-sj@kernel.org> References: <20250206061517.2958-1-sj@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 059B34000B X-Rspamd-Server: rspam10 X-Stat-Signature: omh6j4595o8ocpgm37che9bzu1s35bpg X-HE-Tag: 1738822526-403723 X-HE-Meta: U2FsdGVkX1+1n4yCr9V8D5n95++yiJnIFRSqbhVFJlaGIvO1QOLUNmr+voB1coWiiFy7ZiyiSwipEsYAhfzDfz4FAVlzADZQNWF5s+8rXjZFCXCJ8jTq1foqPfoJUPFXskWsqP+GKOduhiTLTNOhma3gLCsOWQZOBZab5cqVBbA/VDI2UvatCMR+dd01gjEtR5+lKq3+ajkkcC/3rQ6IcfeeJWY8ib53tApWHetMe1PLkXNYQllNvXUzijUcFB+XKkmzcoL77qKcHa2tzBgJvbrK6bxCnRIYvghwYU7U/ffWQURzujYI9zum0jstNF0+6/UunDWnc7BfHJCwCFXvQ24qDrkDl8txiHdIcWa73V6StB5OhJbuRAyoeen5e9J/8MgC5puPj16HR3CsgtplK1ttAPSJNZNSPlLRIS4gPvCU0kWjL0KmWQ4QIiXcHs8XoQCmRbQY55Hect8mgAiPJ6/0Ou9mPiHv+JtOquHR+AMCoXLfbuEfLnhvxgxx/k2erBpEnE+Iz/aRJPhRwxFHOA2fo3fDJAG/12rrJQh1Lb8U8+E21yA/gVgRcIyBHy16u32hwdeCQM2nERyL86cuOQOBBshsjqs/EKhsDAz97AJljDa7y7tubTcIb6pAr/mfAdwbIZ8WpKxt6hRE77Rj4wHHqKVC1qsS7AhAa8wmSc8Xvx7vQ4oU8b3Q8sVsotCxpS6RMk+tEA+8Nb/jIuYoZIBiWP0NXmEc5Ztpwob2xc6VLH7oAtzZNskbpoL3lcnT+c70cRMn3sRHKEFwLzJyHWehw3c36VF9+DOPAKZ2Yuv8ThPR68eCR/RIKmSX72ZQLQhOou24VGRJZaIwyRkAsXhMQngeEBN7ARD87qV0IaTN8wPhClyAGJiipiung24bhznQ/buUfr/FGj3Pv0K0LlgL92DMYYQxMFrBr9s3GV7ccK0fvaLk9g+PqSYKQGRvAlUmVR5fqRdcdcLQyBT bTXVV3Ym 0uVAaBGjZVO/b2okB4TCDcYh0FwwD0vVYjr62FC1LbXy5TiOa07hEv7RedieNvHcWPtTy8/xwk96o4wy+AvpCDBYLtBLI8zbr0IZlO2Jrk42IBlkGL/BwPg890auwev72fYtrTOlKAWQm3gou69fwTvQvaMh2fLlKcPqQkdjYPBjXawQ8WotU60k1UibfL3GZKQgXEO2IILfv3h3KDIbazW5gndoaOMcatc3DZydgFBLyez7UYkVUKmv2DjTlPgRwOVcmLUlgfDHr8pLPxbT7ingCFg== 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: Optimize redundant mmap lock operations from process_madvise() by directly doing the mmap locking first, and then the remaining works for all ranges in the loop. Reviewed-by: Shakeel Butt Signed-off-by: SeongJae Park Reviewed-by: Lorenzo Stoakes Reviewed-by: Liam R. Howlett --- mm/madvise.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 31e5df75b926..5a0a1fc99d27 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1754,9 +1754,26 @@ static ssize_t vector_madvise(struct mm_struct *mm, struct iov_iter *iter, total_len = iov_iter_count(iter); + ret = madvise_lock(mm, behavior); + if (ret) + return ret; + while (iov_iter_count(iter)) { - ret = do_madvise(mm, (unsigned long)iter_iov_addr(iter), - iter_iov_len(iter), behavior); + unsigned long start = (unsigned long)iter_iov_addr(iter); + size_t len_in = iter_iov_len(iter); + size_t len; + + if (!is_valid_madvise(start, len_in, behavior)) { + ret = -EINVAL; + break; + } + + len = PAGE_ALIGN(len_in); + if (start + len == start) + ret = 0; + else + ret = madvise_do_behavior(mm, start, len_in, len, + behavior); /* * An madvise operation is attempting to restart the syscall, * but we cannot proceed as it would not be correct to repeat @@ -1772,12 +1789,17 @@ static ssize_t vector_madvise(struct mm_struct *mm, struct iov_iter *iter, ret = -EINTR; break; } + + /* Drop and reacquire lock to unwind race. */ + madvise_unlock(mm, behavior); + madvise_lock(mm, behavior); continue; } if (ret < 0) break; iov_iter_advance(iter, iter_iov_len(iter)); } + madvise_unlock(mm, behavior); ret = (total_len - iov_iter_count(iter)) ? : ret;