From mboxrd@z Thu Jan 1 00:00:00 1970 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 76EF3C6FD1F for ; Wed, 22 Mar 2023 20:19:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D99C36B007D; Wed, 22 Mar 2023 16:19:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CFD416B0081; Wed, 22 Mar 2023 16:19:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BC2426B0082; Wed, 22 Mar 2023 16:19:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id AD70B6B007D for ; Wed, 22 Mar 2023 16:19:10 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 7D709AACF9 for ; Wed, 22 Mar 2023 20:19:10 +0000 (UTC) X-FDA: 80597648460.06.9B4D3AD Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by imf09.hostedemail.com (Postfix) with ESMTP id A652D14001F for ; Wed, 22 Mar 2023 20:19:08 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=ZQ6Pceej; spf=pass (imf09.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679516348; a=rsa-sha256; cv=none; b=el3wD4KkZn5T19yd+yoIxpyrz8PzN1cKwnvv2PwNVXyam7BEe4KqUcyNIhyBmVN3QfBLaQ yh3FhnOHNGOEPtF6/qH/azWrBLrjXNdKz208qbFrpWvloRUxacVxRetRDqBRdqdJaD1yON QoLZKOVM+1oVA9R1x9b9FYQpBx5W3ms= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=ZQ6Pceej; spf=pass (imf09.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=lstoakes@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=1679516348; 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=RY15Fh9kVTomLumjnxR3TB6ZLQ5YugEBgBi/gOE3sug=; b=zoek+iirBKeiex0Z2oAr/THZ0mxDxt8blYqKTauBfpOXQ/1qXurmTffR8BiMQetxvU+69P eih1+ZHTyU6VnDqCcynhl0wWJNokqeGArVkdKOM0g/+X7iERQ8t+ZIgQPUikmeWHlNCGd/ yVMt2j4BDRrq5WtZOB2YxQKHBjGrcJI= Received: by mail-wr1-f48.google.com with SMTP id y14so18352728wrq.4 for ; Wed, 22 Mar 2023 13:19:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679516347; 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=RY15Fh9kVTomLumjnxR3TB6ZLQ5YugEBgBi/gOE3sug=; b=ZQ6PceejuylFAZeuWprGOFSoRDVt0Iwj0nUsFklSXWKCRwXvK1cUrXL/yzWQmnjwIn UsqZpRbd5923H0NMAm7+A7U5N6kHp3t2BXNw8SC9cJEQWD0gkcM97TQhZKCfKYSUQn1T wG0MZXb9BHtfKctHehr2f7LcZKeCGruNh2Gm6/YXFUgPkOlg9dTJqo6TMayiqyAl5u+v f1To7VuIkEMcA4pUamUWWXEcuo8STCn8hIgVWmXUSBiOclE1dhsVfHjCADWsqYePiNOm AGA0+B349DQV2hdKN8o9a+dDst5P/Aqo1cRaXKsmKd4vlsFJnsOh7RvrWkbEFd7Q7iIj dg5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679516347; 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=RY15Fh9kVTomLumjnxR3TB6ZLQ5YugEBgBi/gOE3sug=; b=wXJdesLH9btJmjlDOtPbl5Bz0huVY8SDULMQtew823vmKlQVzK8zKWiFdjsovrEzwn EdJUozzC/2fVlnmo31+T02KDA5c4Z3EKtJuyt3zYwG0xyxBHDWo3VDQc4Z0aDJMzqn8C 61JwL2QII996Yg81OK/3LSvtcBZed55j4z3v48aX7ibqdLXMll8Hnbh7JUoozdbTc8an 4j5jbqQam8Xecbj/hjNiUb8Qo3Hxeqe71qiq6ocTqK0EdOsz6HsvIz/CK1IPa3u0Aiv+ QWI2dRsAfCZpjjNxUWI8HGnCOru3MM9rI8IJCp3gpm7bcKP6C5Nb3XY6BzunVvtVF4Y0 nDfg== X-Gm-Message-State: AAQBX9ePxBsyI4CnxcUc41ua0HT2mCVFyvfILPZdDI8xOGhCRxoGNdAe lhjS89QmwC57I64LKPH5GygahS+PGa4= X-Google-Smtp-Source: AKy350Z5g0xenT3KiCNPHUDl44KA69rJ6VJV0MowkeC8iAVBhljpy06Ixf24x7DC4V2Tem2gpJYoOA== X-Received: by 2002:a5d:5083:0:b0:2ce:a0e1:f2bb with SMTP id a3-20020a5d5083000000b002cea0e1f2bbmr810767wrt.22.1679516347721; Wed, 22 Mar 2023 13:19:07 -0700 (PDT) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id e4-20020a5d4e84000000b002ceac2ccc4asm14570690wru.23.2023.03.22.13.19.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 13:19:06 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton Cc: David Hildenbrand , Matthew Wilcox , Vlastimil Babka , "Liam R . Howlett" , maple-tree@lists.infradead.org, Vernon Yang , Lorenzo Stoakes Subject: [PATCH v5 3/4] mm/mmap/vma_merge: explicitly assign res, vma, extend invariants Date: Wed, 22 Mar 2023 20:18:59 +0000 Message-Id: <83938bed24422cbe5954bbf491341674becfe567.1679516210.git.lstoakes@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: A652D14001F X-Rspamd-Server: rspam01 X-Stat-Signature: aewdhprwcop5cmcwb47jbahisus7wdj1 X-HE-Tag: 1679516348-545376 X-HE-Meta: U2FsdGVkX18GWM9+0hvPJAMvMeaJNzDeV3pTiQZ1CwdVC6uF3oFM2bCX+Nq307nMBS+CT0WDTf4DhlJq7qrex77rVFXGg0EwxkazqMt/N9CWZ6w4/v/G5UCCUydiy5UJZcBvgOn+1V62jQZnmRiry3SGCCaAJ+2Uu5/q5+zD3Zw3pedeFySM5N+0/venYa/RXP+8+4UtxE/PqtBkIKu1/g9MazoC41uid2cuZm/7C6zH1yxsnj7FbTjEuMHobe87HxhhnfmdesUB62epkqxyuRGss/pQTMisAmlsYtrfoPuQTeHmnmAcdy+EDxRE/TuP57txrhkr/k3uV0CzgfjHmCwCynWGSw1DRSE4cV3CJEv6d4VAGszb7vroPgalDyBRG1LqbFhf3w5fOH8s8K46aCIJMZDQNDZ9oOMPaNWjELNYxvFXIvyFT0p0GqDRk59n0Loex2rmimn6Yg5ZPQ2csAGeM0lrZ4DZlg/make5FYMvlXpQdRXjJEE4oZ4Ipccn5aYcgbsZrzXsKivnjik3EZhKTCZJwsENufxMfEQ44Pj0uqua2ojEOnSSgLSAGHUOXjF3y4h0bhl0FOHRQgBZT3VPj3W7Y3hYUEtd8cGahGWgr0hXxWKhphUvDGW+b6f3+5EPREcgskE6mVzlkUJ/k9meMK191hqQ8h/ggECqjVS4ysdxEqv50kYVKZF/wh9YgS+DvfrspXfCBINKnWSM+ORPy1vfo2Etibmulhve6cBsz6XQ/FLhRGg39pRA2OqED7kB6E56xWfMxvd8hNcj3cROc2JuiCtbuTjFFbe1KQ7H3A//E9tE38CjSrH8lelYTQse6XrjJ3JJMLHRd3S23py4c1Amum8vxOFU76yEZ8hSHtl5mhKeAGDceXFP8ujuudQ23CLZOUSA19qVaoHgf1A88QhvHzkx1TGugFnI6VoOaJOTnADPZdOMBRc8ThKdjd4dQ+F20qDVcJYOG/l Eb6F6Rx/ tcfRVdZ9mIYm9N8wO6Gy0ZaMlJ72tyj+g2rL3Rgre/Ne56ju6aHjXPO3Ws86tbCx4IsV+FUiVadUMrQnyRkVs8HDjhfuxom5xfQEoZkkBPSDRk9EiIkBHx0WpGa73fIZJw03KNYweURqMOBrStdKgfW5LY2b6xkYyUP8oVpgcXA0rOFeVzB+p93tZRX0Dhne379syh2tGuZF2R9PfH32cKxmn+HZBHUePNIiFlZTL/iaNq56rJS2bBwgc7rATjOATpYn8KKSYlTRF1Z2sA+laatR3fGeDXd/GcILBhm56LjIxcJ+njGcmdDsed8iIsRrhMpQCLTqd42FtlMrL0lUfl4vuftPpV0+RDx4G/b8mQ5hdh8wadwKthotjdUzU75ihvTApVEzvAIQcV5zMBz0cURXTxalzhtAgNI9BQ4PKLvaOoirIVab6BXLrF8nvKD/to4geyvHM9Z2GfJXQszmGxmx5f/CmCGMwcqx9XvN9s8WsMrTgKFbk6DyXaKjcQZgt4Ev3 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: Previously, vma was an uninitialised variable which was only definitely assigned as a result of the logic covering all possible input cases - for it to have remained uninitialised, prev would have to be NULL, and next would _have_ to be mergeable. The value of res defaults to NULL, so we can neatly eliminate the assignment to res and vma in the if (prev) block and ensure that both res and vma are both explicitly assigned, by just setting both to prev. In addition we add an explanation as to under what circumstances both might change, and since we absolutely do rely on addr == curr->vm_start should curr exist, assert that this is the case. Signed-off-by: Lorenzo Stoakes Reviewed-by: Vlastimil Babka Reviewed-by: Liam R. Howlett --- mm/mmap.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index dbdbb92493b2..2a4f63716231 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -911,7 +911,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, { pgoff_t pglen = (end - addr) >> PAGE_SHIFT; pgoff_t vma_pgoff; - struct vm_area_struct *curr, *next, *res = NULL; + struct vm_area_struct *curr, *next, *res; struct vm_area_struct *vma, *adjust, *remove, *remove2; int err = -1; bool merge_prev = false; @@ -939,14 +939,18 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, else next = NULL; /* case 5 */ - /* verify some invariant that must be enforced by the caller */ + /* + * By default, we return prev. Cases 3, 4, 8 will instead return next + * and cases 3, 8 will also update vma to point at next. + */ + res = vma = prev; + + /* Verify some invariant that must be enforced by the caller. */ VM_WARN_ON(prev && addr <= prev->vm_start); - VM_WARN_ON(curr && end > curr->vm_end); + VM_WARN_ON(curr && (addr != curr->vm_start || end > curr->vm_end)); VM_WARN_ON(addr >= end); if (prev) { - res = prev; - vma = prev; vma_start = prev->vm_start; vma_pgoff = prev->vm_pgoff; /* Can we merge the predecessor? */ @@ -957,6 +961,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, vma_prev(vmi); } } + /* Can we merge the successor? */ if (next && mpol_equal(policy, vma_policy(next)) && can_vma_merge_before(next, vm_flags, @@ -997,6 +1002,10 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, adj_start = -(prev->vm_end - addr); err = dup_anon_vma(next, prev); } else { + /* + * Note that cases 3 and 8 are the ONLY ones where prev + * is permitted to be (but is not necessarily) NULL. + */ vma = next; /* case 3 */ vma_start = addr; vma_end = next->vm_end; -- 2.39.2