{"id":2197308,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2197308/?format=json","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.0/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/"},"msgid":"<20260217163250.2326001-2-surenb@google.com>","date":"2026-02-17T16:32:48","name":"[v2,1/3] mm/vma: cleanup error handling path in vma_expand()","commit_ref":null,"pull_url":null,"state":"handled-elsewhere","archived":false,"hash":"5665d6991456e26427dfada61b048e019b5c6c99","submitter":{"id":74729,"url":"http://patchwork.ozlabs.org/api/1.0/people/74729/?format=json","name":"Suren Baghdasaryan","email":"surenb@google.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260217163250.2326001-2-surenb@google.com/mbox/","series":[{"id":492454,"url":"http://patchwork.ozlabs.org/api/1.0/series/492454/?format=json","date":"2026-02-17T16:32:47","name":"Use killable vma write locking in most places","version":2,"mbox":"http://patchwork.ozlabs.org/series/492454/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2197308/checks/","tags":{},"headers":{"Return-Path":"\n <linuxppc-dev+bounces-16907-incoming=patchwork.ozlabs.org@lists.ozlabs.org>","X-Original-To":["incoming@patchwork.ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256\n header.s=20230601 header.b=tpQ5T3tF;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=2404:9400:21b9:f100::1; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev+bounces-16907-incoming=patchwork.ozlabs.org@lists.ozlabs.org;\n receiver=patchwork.ozlabs.org)","lists.ozlabs.org;\n arc=none smtp.remote-ip=\"2607:f8b0:4864:20::1349\"","lists.ozlabs.org;\n dmarc=pass (p=reject dis=none) header.from=google.com","lists.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256\n header.s=20230601 header.b=tpQ5T3tF;\n\tdkim-atps=neutral","lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=flex--surenb.bounces.google.com\n (client-ip=2607:f8b0:4864:20::1349; helo=mail-dy1-x1349.google.com;\n envelope-from=3n5iuaqykda4685s1pu22uzs.q20zw18b33q-rs9zw676.2dzop6.25u@flex--surenb.bounces.google.com;\n receiver=lists.ozlabs.org)"],"Received":["from lists.ozlabs.org (lists.ozlabs.org\n [IPv6:2404:9400:21b9:f100::1])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1 raw public key)\n server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fFlYm6v1Dz1xwF\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 18 Feb 2026 03:33:00 +1100 (AEDT)","from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4fFlYl3bNhz2yvy;\n\tWed, 18 Feb 2026 03:32:59 +1100 (AEDT)","from mail-dy1-x1349.google.com (mail-dy1-x1349.google.com\n [IPv6:2607:f8b0:4864:20::1349])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 4fFlYk4rNdz2xm3\n\tfor <linuxppc-dev@lists.ozlabs.org>; Wed, 18 Feb 2026 03:32:58 +1100 (AEDT)","by mail-dy1-x1349.google.com with SMTP id\n 5a478bee46e88-2ba66faa692so5801038eec.1\n        for <linuxppc-dev@lists.ozlabs.org>;\n Tue, 17 Feb 2026 08:32:58 -0800 (PST)"],"ARC-Seal":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1771345979;\n\tcv=none;\n b=lfxYzWzUp46wuVEBAgc8OWypVdWnq0biXuZcqPnVnPi4gkEu8rvLUEtXfYXgbAmkbYrj2tcJtquM8zw/anNvFR+52xG554KNn27m6PxmJrhyOPtHXOONeKaRpXMga9RZDim/vM6DmI23Pgd//LPUxxwGfAU5T/l1gj+iQHGvRVqvFIDYlP1LFPqcb+TA1eHDAZC6I8KqYTxsT06MlN6AFBBEM5XaHDd8yLZYigpmEqCt9yNQaiKDpsNht+mQutupYq+AnJTQP4/m3st+Bkd9pO5rSz3iOxBhymyxSO6jpvjAgxoMOhtRjPhHm1Gdmm8ashxQsZfMrdsi33S99sP8fg==","ARC-Message-Signature":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1771345979; c=relaxed/relaxed;\n\tbh=20E8AsSTFCwzOiRhIxVDRmNYTsZqkvgm04spnyQD6co=;\n\th=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From:\n\t To:Cc:Content-Type;\n b=fkJF1F1p2TpIfoXAjQ/vgGfKWkFHT/ReIQuOJmWtexXiBEAODGrlcypnmzJoZG1G6eFwhqsCSD6lhOrJSJbpDV5ERfVUwbFZZHa+fVQeLe47/dOOQDVNgW2DYfPKyN33nmDoNjgGWMpwrDknbWHr9qWxDXwSTUGuNiJtntaPzNlWYs2kriGxX/2sQLQfr8uAXQLTmC7nZwA1wC1ZLKk0KalP4BwtRVLBJ+D1tXG5rcQwKi2l5IRUbsTxLnxZwkaAOf+1OcraY3s/ytvOOUjzllviQkI3b2Q5wLv04xXCaqQHSZvT5hp2QQoTyzGrAYhX3jSYcXESWdTAqoLNCzPYFg==","ARC-Authentication-Results":"i=1; lists.ozlabs.org;\n dmarc=pass (p=reject dis=none) header.from=google.com;\n dkim=pass (2048-bit key;\n unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256\n header.s=20230601 header.b=tpQ5T3tF; dkim-atps=neutral;\n spf=pass (client-ip=2607:f8b0:4864:20::1349; helo=mail-dy1-x1349.google.com;\n envelope-from=3n5iuaqykda4685s1pu22uzs.q20zw18b33q-rs9zw676.2dzop6.25u@flex--surenb.bounces.google.com;\n receiver=lists.ozlabs.org) smtp.mailfrom=flex--surenb.bounces.google.com","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n        d=google.com; s=20230601; t=1771345976; x=1771950776;\n darn=lists.ozlabs.org;\n        h=cc:to:from:subject:message-id:references:mime-version:in-reply-to\n         :date:from:to:cc:subject:date:message-id:reply-to;\n        bh=20E8AsSTFCwzOiRhIxVDRmNYTsZqkvgm04spnyQD6co=;\n        b=tpQ5T3tFuXIU/pq4209qwukudK0eHaFlJSUm85cs2hN4L3UH9RaJhUEOyr6sFBbMIy\n         C9wTGVAV7zDm/o3VSFGJvpbbjjvHVLImmVzjWhXedCSGU65NEy/pifedk4WcGazxZfXc\n         kZNux0CD9P+gMYwhsjIm5ec9zxahiO4JvYzc3NWJX7oN2wGO7IEmf9X9Emb2HIPN9nfV\n         AxsK4d1iIgCRW0DWG9yIzcZ3r8VDLXlpnQSgrrCCN0dAGAmcqP3RanvQbwzs8y43bg68\n         yljHQSpRs5yvtFN+/43ho0tTz9euN0f3QCO64Y9tG/Ynm8yL+2VuYmFOtmSW7b6tSkyH\n         RQkw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n        d=1e100.net; s=20230601; t=1771345976; x=1771950776;\n        h=cc:to:from:subject:message-id:references:mime-version:in-reply-to\n         :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;\n        bh=20E8AsSTFCwzOiRhIxVDRmNYTsZqkvgm04spnyQD6co=;\n        b=dPidNeKW0bXGctUoOvWAcByr2ESj4bablfpItDNQ7RnIy4zpYKnv9e2s2ukpBLPMnp\n         r/jdhohMulGbQFs0u/lU5KQwG7Bdns1QPaA4fNVmWDObKRYe3UWRxa5eFWxASNaJNCI8\n         XRh5STfVTGRPB8KCZCTa3ehNrPwqBlEuiAeLA9wJsCoca4MCgWbKo5eObznx+2IWO6iq\n         +ZJ9JTObDVm4efkIMtDDzk6vZEzNhOtrvLUzYXJPdNUedF1AUbpGmsRaK2mJDR4h9a1b\n         31VGj4ptb4y1nSk6xh2IVqf4oobn1gWDUzlvkaZD7VrJGZ54Qsc8FrEs2VhUex6JDBFT\n         OEOA==","X-Forwarded-Encrypted":"i=1;\n AJvYcCWTjfHfMl4oB9VBabmwdvMGk/18CBg/ukP5E798G6I2RnUmQkihipAgL91g64OdjPAsgrXKTgoe8DcZ9H8=@lists.ozlabs.org","X-Gm-Message-State":"AOJu0YyCEi63P41VdrAQERiX3Usny7B70WcAkVC3cmzQQKg5zpM+kSUW\n\tQhFBBVsWrXTUTbzsPsIIBYTn5WfCuBF1ZYL3Y8GR5rSZToFk5SIBhJeO7CQg1Zve8qUIoxWU+jZ\n\tDastXRQ==","X-Received":"from dybmv5.prod.google.com\n ([2002:a05:7300:cd45:b0:2ba:9f53:8c70])\n (user=surenb job=prod-delivery.src-stubby-dispatcher) by\n 2002:a05:693c:2c8b:b0:2ba:7f8c:6754\n with SMTP id 5a478bee46e88-2bac97ceddbmr4300008eec.37.1771345975648; Tue, 17\n Feb 2026 08:32:55 -0800 (PST)","Date":"Tue, 17 Feb 2026 08:32:48 -0800","In-Reply-To":"<20260217163250.2326001-1-surenb@google.com>","X-Mailing-List":"linuxppc-dev@lists.ozlabs.org","List-Id":"<linuxppc-dev.lists.ozlabs.org>","List-Help":"<mailto:linuxppc-dev+help@lists.ozlabs.org>","List-Owner":"<mailto:linuxppc-dev+owner@lists.ozlabs.org>","List-Post":"<mailto:linuxppc-dev@lists.ozlabs.org>","List-Archive":"<https://lore.kernel.org/linuxppc-dev/>,\n  <https://lists.ozlabs.org/pipermail/linuxppc-dev/>","List-Subscribe":"<mailto:linuxppc-dev+subscribe@lists.ozlabs.org>,\n  <mailto:linuxppc-dev+subscribe-digest@lists.ozlabs.org>,\n  <mailto:linuxppc-dev+subscribe-nomail@lists.ozlabs.org>","List-Unsubscribe":"<mailto:linuxppc-dev+unsubscribe@lists.ozlabs.org>","Precedence":"list","Mime-Version":"1.0","References":"<20260217163250.2326001-1-surenb@google.com>","X-Mailer":"git-send-email 2.53.0.273.g2a3d683680-goog","Message-ID":"<20260217163250.2326001-2-surenb@google.com>","Subject":"[PATCH v2 1/3] mm/vma: cleanup error handling path in vma_expand()","From":"Suren Baghdasaryan <surenb@google.com>","To":"akpm@linux-foundation.org","Cc":"willy@infradead.org, david@kernel.org, ziy@nvidia.com,\n\tmatthew.brost@intel.com, joshua.hahnjy@gmail.com, rakie.kim@sk.com,\n\tbyungchul@sk.com, gourry@gourry.net, ying.huang@linux.alibaba.com,\n\tapopple@nvidia.com, lorenzo.stoakes@oracle.com,\n baolin.wang@linux.alibaba.com,\n\tLiam.Howlett@oracle.com, npache@redhat.com, ryan.roberts@arm.com,\n\tdev.jain@arm.com, baohua@kernel.org, lance.yang@linux.dev, vbabka@suse.cz,\n\tjannh@google.com, rppt@kernel.org, mhocko@suse.com, pfalcato@suse.de,\n\tkees@kernel.org, maddy@linux.ibm.com, npiggin@gmail.com, mpe@ellerman.id.au,\n\tchleroy@kernel.org, borntraeger@linux.ibm.com, frankja@linux.ibm.com,\n\timbrenda@linux.ibm.com, hca@linux.ibm.com, gor@linux.ibm.com,\n\tagordeev@linux.ibm.com, svens@linux.ibm.com, gerald.schaefer@linux.ibm.com,\n\tlinux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, surenb@google.com","Content-Type":"text/plain; charset=\"UTF-8\"","X-Spam-Status":"No, score=-7.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED,\n\tDKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,\n\tUSER_IN_DEF_DKIM_WL autolearn=disabled version=4.0.1 OzLabs 8","X-Spam-Checker-Version":"SpamAssassin 4.0.1 (2024-03-25) on lists.ozlabs.org"},"content":"vma_expand() error handling is a bit confusing with \"if (ret) return ret;\"\nmixed with \"if (!ret && ...) ret = ...;\". Simplify the code to check\nfor errors and return immediately after an operation that might fail.\nThis also makes later changes to this function more readable.\n\nNo functional change intended.\n\nSuggested-by: Jann Horn <jannh@google.com>\nSigned-off-by: Suren Baghdasaryan <surenb@google.com>\n---\n mm/vma.c | 12 ++++++++----\n 1 file changed, 8 insertions(+), 4 deletions(-)","diff":"diff --git a/mm/vma.c b/mm/vma.c\nindex be64f781a3aa..bb4d0326fecb 100644\n--- a/mm/vma.c\n+++ b/mm/vma.c\n@@ -1186,12 +1186,16 @@ int vma_expand(struct vma_merge_struct *vmg)\n \t * Note that, by convention, callers ignore OOM for this case, so\n \t * we don't need to account for vmg->give_up_on_mm here.\n \t */\n-\tif (remove_next)\n+\tif (remove_next) {\n \t\tret = dup_anon_vma(target, next, &anon_dup);\n-\tif (!ret && vmg->copied_from)\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\t}\n+\tif (vmg->copied_from) {\n \t\tret = dup_anon_vma(target, vmg->copied_from, &anon_dup);\n-\tif (ret)\n-\t\treturn ret;\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\t}\n \n \tif (remove_next) {\n \t\tvma_start_write(next);\n","prefixes":["v2","1/3"]}