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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D7323C27C76 for ; Wed, 25 Jan 2023 23:41:36 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4P2L2l2JcQz3fGP for ; Thu, 26 Jan 2023 10:41:35 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20210112 header.b=mIcpdtGt; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=flex--surenb.bounces.google.com (client-ip=2607:f8b0:4864:20::1149; helo=mail-yw1-x1149.google.com; envelope-from=36bzrywykdm4ceby7v08805y.w86527eh99w-xyf52cdc.8j5uvc.8b0@flex--surenb.bounces.google.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20210112 header.b=mIcpdtGt; dkim-atps=neutral Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4P2KwW5pnKz3cQV for ; Thu, 26 Jan 2023 10:36:11 +1100 (AEDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5073cf66299so1267967b3.17 for ; Wed, 25 Jan 2023 15:36:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=uFNiofQkx8EGkioLCgUuZFMgiu7EagxK9ILw1Sow0vM=; b=mIcpdtGtTptlXBa8kzPRiZ4LQeL8L4qFSrls4nVpFeCNpMiSotY6f+paMy+LghZ8V6 e9l5UcyWL072m000YU0+L04zrVr4EhWAwoZTx/p7MV2c+3YkTz0Vc17xg7GsN6zD4Z9R fONlZs10IIrOred9HnpC0C3EFZJdB0XAfbhzeR0ZgQ/dkYvIT6XW43EAfnRvkqq66q3g TyPxEoXRoXVo+FH/WvNzfXLvwh7J86Ui+UKVO/3Scbbi/do79F5NcZ+HTnfVO2bahnkQ 86T/MKLgW1x3swE+dFhZ6o7oKt9I4CYoHoHaBYMQWqHMdLwEjkwoM3UIGDBmnlaN/XJj pP8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uFNiofQkx8EGkioLCgUuZFMgiu7EagxK9ILw1Sow0vM=; b=jl0XHRMK7eWFzrAGd40ecFPllNSVlMU+vg7JpuoIH2/5NmOXQehsK2cJ1hrc93FrDC oivGJZaefzJfvwFqQ+p9W0/H8/gtCFFVZanxP6YrO+gKrj8WzkxpuSLdFzJT+Zp9dgxj Mgl7yuie7E7jfI5fDTvIKBOYaR8RC9G6zF2Guu6WPFVv15FtXlwLd4VCdrAsZeNIP1o3 oU0TIHaL9Lmk4qCSfJtphZIq0vWo6sbaOJx6nESjQvg+j1pqrG+lWoLCzsELMIIBIqWq GPQJlmInJgac/XjGpZ+C9H+IrgVY0y/B6wVFMmSlKfJXjitp5P7lLkKYCWmEp0Fwlb4Z IR+A== X-Gm-Message-State: AFqh2koyclGqAMD6sYPOV0aa9XINDdJdhybKoy2gmaP2oyDC1liqZKg/ +3aanKO+6nCSM0EqZcbIJHMVbgjg5AM= X-Google-Smtp-Source: AMrXdXvMdRhk8RmJeZj9msjjVduAuvJeB5wZmXR/kRnEPyHhZJwnM0jGg8ZrEwM+ym7wuYAnXhndpOMqpaU= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:200:f7b0:20e8:ce66:f98]) (user=surenb job=sendgmr) by 2002:a0d:e582:0:b0:4df:96d1:f67a with SMTP id o124-20020a0de582000000b004df96d1f67amr4204399ywe.246.1674689769324; Wed, 25 Jan 2023 15:36:09 -0800 (PST) Date: Wed, 25 Jan 2023 15:35:52 -0800 In-Reply-To: <20230125233554.153109-1-surenb@google.com> Mime-Version: 1.0 References: <20230125233554.153109-1-surenb@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Message-ID: <20230125233554.153109-6-surenb@google.com> Subject: [PATCH v3 5/7] mm: replace vma->vm_flags indirect modification in ksm_madvise From: Suren Baghdasaryan To: akpm@linux-foundation.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: michel@lespinasse.org, joelaf@google.com, songliubraving@fb.com, mhocko@suse.com, leewalsh@google.com, david@redhat.com, peterz@infradead.org, bigeasy@linutronix.de, peterx@redhat.com, dhowells@redhat.com, linux-mm@kvack.org, edumazet@google.com, jglisse@google.com, punit.agrawal@bytedance.com, will@kernel.org, arjunroy@google.com, dave@stgolabs.net, minchan@google.com, x86@kernel.org, hughd@google.com, willy@infradead.org, gurua@google.com, mingo@redhat.com, linux-arm-kernel@lists.infradead.org, rientjes@google.com, axelrasmussen@google.com, kernel-team@android.com, soheil@google.com, paulmck@kernel.org, jannh@google.com, liam.howlett@oracle.com, shakeelb@google.com, luto@kernel.org, gthelen@google.com, ldufour@linux.ibm.com, surenb@google.com, vbabka@suse.cz, posk@google.com, lstoakes@gmail.com, peterjung1337@gmail.com, linuxppc-dev@lists.ozlabs.org, kent.overstreet@linux.dev, hughlynch@google.com, linux-kernel@vger.kernel.org, hannes@cmpxchg.org, tatashin@google.com, mgorman@t echsingularity.net Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Replace indirect modifications to vma->vm_flags with calls to modifier functions to be able to track flag changes and to keep vma locking correctness. Signed-off-by: Suren Baghdasaryan Acked-by: Michal Hocko --- arch/powerpc/kvm/book3s_hv_uvmem.c | 5 ++++- arch/s390/mm/gmap.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c b/arch/powerpc/kvm/book3s_hv_uvmem.c index 1d67baa5557a..325a7a47d348 100644 --- a/arch/powerpc/kvm/book3s_hv_uvmem.c +++ b/arch/powerpc/kvm/book3s_hv_uvmem.c @@ -393,6 +393,7 @@ static int kvmppc_memslot_page_merge(struct kvm *kvm, { unsigned long gfn = memslot->base_gfn; unsigned long end, start = gfn_to_hva(kvm, gfn); + unsigned long vm_flags; int ret = 0; struct vm_area_struct *vma; int merge_flag = (merge) ? MADV_MERGEABLE : MADV_UNMERGEABLE; @@ -409,12 +410,14 @@ static int kvmppc_memslot_page_merge(struct kvm *kvm, ret = H_STATE; break; } + vm_flags = vma->vm_flags; ret = ksm_madvise(vma, vma->vm_start, vma->vm_end, - merge_flag, &vma->vm_flags); + merge_flag, &vm_flags); if (ret) { ret = H_STATE; break; } + reset_vm_flags(vma, vm_flags); start = vma->vm_end; } while (end > vma->vm_end); diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c index 3a695b8a1e3c..d5eb47dcdacb 100644 --- a/arch/s390/mm/gmap.c +++ b/arch/s390/mm/gmap.c @@ -2587,14 +2587,17 @@ int gmap_mark_unmergeable(void) { struct mm_struct *mm = current->mm; struct vm_area_struct *vma; + unsigned long vm_flags; int ret; VMA_ITERATOR(vmi, mm, 0); for_each_vma(vmi, vma) { + vm_flags = vma->vm_flags; ret = ksm_madvise(vma, vma->vm_start, vma->vm_end, - MADV_UNMERGEABLE, &vma->vm_flags); + MADV_UNMERGEABLE, &vm_flags); if (ret) return ret; + reset_vm_flags(vma, vm_flags); } mm->def_flags &= ~VM_MERGEABLE; return 0; -- 2.39.1 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7D0C3C27C76 for ; Thu, 26 Jan 2023 00:03:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=TfiL6eTA175wkpgy5DdGkeMwzxkkiY/sEIz28gQzlyc=; b=BuhIhz9QBwgTIZ6LrR3U0WSLhA 4y7D5bpol9MVthzqXI6ckVnYF61kcBpAXHhHZuVUJhvve2eYFJP89F1zhmJW+que9M08TaQ/h3Erq 8XxiZPqiKx9ftPSq/Wpoq2mWn5IiVnE1xRiOGF6Xm5UkVHsiYSHxFoY4o17QGL7dYnCgxq5bVdzXZ ptr+tzuivtuRxDcXgduEp6QuLTAfRpoxwHj87kTy/Am6qfg3EQX2cx9ivq+ASaXK2SoXyZU80OoMW bXu2118wj4KBZyg41PQknIkvAH65MwRUFUVyIgIqSQkiyKmFht3KNvGrhl+NP8G1kEnj0VSsBIOku xA/164tA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKpj0-0097tK-9g; Thu, 26 Jan 2023 00:02:42 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKpin-0097pD-Ki for linux-arm-kernel@bombadil.infradead.org; Thu, 26 Jan 2023 00:02:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Cc:To:From:Subject: Message-ID:References:Mime-Version:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=uFNiofQkx8EGkioLCgUuZFMgiu7EagxK9ILw1Sow0vM=; b=IDfvhbtdEJ2OdA/Lx8bW2r8EnB I4WsX5Obl+3/g7cSkisNsuOiQCEaceXr3hFPpaN3ipkW1AaXAQoegIDUxNkv8wHlYHN+houjemMRM 1QIYsTUIL8O3Hx+ZE9z3qAq5EvGPY/4Z15K8QzRSznCAKzYFtS2pJYImDnoo9+Fe/uspoP9E/GPSe N3+BVMgdtNX3u57p74AA2P/gbkVOoLrUt+URZ9GdSw/efBpqH755LaMWXjvAnAGnwxCfLx97o3h0t xeKvq4n7oxeUtZO/aWbhlXSFJPWm6QvlPCC9ZEGENkIOIyZR91LaJorDAEPcSEtCObyBlt65OPGgp /pDzp6Kw==; Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pKpIy-002Gm0-2k for linux-arm-kernel@lists.infradead.org; Wed, 25 Jan 2023 23:35:50 +0000 Received: by mail-yb1-xb49.google.com with SMTP id c2-20020a25a2c2000000b008016611ca77so107271ybn.9 for ; Wed, 25 Jan 2023 15:36:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=uFNiofQkx8EGkioLCgUuZFMgiu7EagxK9ILw1Sow0vM=; b=mIcpdtGtTptlXBa8kzPRiZ4LQeL8L4qFSrls4nVpFeCNpMiSotY6f+paMy+LghZ8V6 e9l5UcyWL072m000YU0+L04zrVr4EhWAwoZTx/p7MV2c+3YkTz0Vc17xg7GsN6zD4Z9R fONlZs10IIrOred9HnpC0C3EFZJdB0XAfbhzeR0ZgQ/dkYvIT6XW43EAfnRvkqq66q3g TyPxEoXRoXVo+FH/WvNzfXLvwh7J86Ui+UKVO/3Scbbi/do79F5NcZ+HTnfVO2bahnkQ 86T/MKLgW1x3swE+dFhZ6o7oKt9I4CYoHoHaBYMQWqHMdLwEjkwoM3UIGDBmnlaN/XJj pP8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uFNiofQkx8EGkioLCgUuZFMgiu7EagxK9ILw1Sow0vM=; b=wOghXrbLrqRhqi5WsQp4wWTYFitHi7YO8MJuprfQ6I5z3AG1wdXm4mQr/9mjAkYC6c XOE6Ra4bcj1ZMukFcY1quGkrK234ZqFqu3weOD1BjdnVQi3Q8qweZ2l6ucyAQ4QONc5m 9f2l2k0aBkKU6W+C75OMN7fjmuklCW8TtqbWtU2ZuGfKkpr1/fokGcGXpFpg6bi+mqWy UZr8RCmVX+476sU4j2Q4555x6ZdZgnniR8FbEVcDzvdp2Lt7385pSXZZf9oscGRi1suI zBxsyQGw9U2vNOdEgmyaD6KpOnyVjOKyeReYJA+Xa74tJ+lxSOlp94kz8RZaAGK6yuLy nedg== X-Gm-Message-State: AFqh2kpzoDUN8xqAngnkDkUsa4my3G2wbIjY2reztvbaT9UomTaudYPs KYVv0Om9+mRJp8JL90T8dHqJA1swoFg= X-Google-Smtp-Source: AMrXdXvMdRhk8RmJeZj9msjjVduAuvJeB5wZmXR/kRnEPyHhZJwnM0jGg8ZrEwM+ym7wuYAnXhndpOMqpaU= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:200:f7b0:20e8:ce66:f98]) (user=surenb job=sendgmr) by 2002:a0d:e582:0:b0:4df:96d1:f67a with SMTP id o124-20020a0de582000000b004df96d1f67amr4204399ywe.246.1674689769324; Wed, 25 Jan 2023 15:36:09 -0800 (PST) Date: Wed, 25 Jan 2023 15:35:52 -0800 In-Reply-To: <20230125233554.153109-1-surenb@google.com> Mime-Version: 1.0 References: <20230125233554.153109-1-surenb@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Message-ID: <20230125233554.153109-6-surenb@google.com> Subject: [PATCH v3 5/7] mm: replace vma->vm_flags indirect modification in ksm_madvise From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: michel@lespinasse.org, jglisse@google.com, mhocko@suse.com, vbabka@suse.cz, hannes@cmpxchg.org, mgorman@techsingularity.net, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, peterz@infradead.org, ldufour@linux.ibm.com, paulmck@kernel.org, mingo@redhat.com, will@kernel.org, luto@kernel.org, songliubraving@fb.com, peterx@redhat.com, david@redhat.com, dhowells@redhat.com, hughd@google.com, bigeasy@linutronix.de, kent.overstreet@linux.dev, punit.agrawal@bytedance.com, lstoakes@gmail.com, peterjung1337@gmail.com, rientjes@google.com, axelrasmussen@google.com, joelaf@google.com, minchan@google.com, jannh@google.com, shakeelb@google.com, tatashin@google.com, edumazet@google.com, gthelen@google.com, gurua@google.com, arjunroy@google.com, soheil@google.com, hughlynch@google.com, leewalsh@google.com, posk@google.com, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, x86@kernel.org, linux-kernel@vger.kernel.org, kernel-team@android.com, surenb@google.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230125_233549_052109_1E78CFB3 X-CRM114-Status: GOOD ( 13.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Replace indirect modifications to vma->vm_flags with calls to modifier functions to be able to track flag changes and to keep vma locking correctness. Signed-off-by: Suren Baghdasaryan Acked-by: Michal Hocko --- arch/powerpc/kvm/book3s_hv_uvmem.c | 5 ++++- arch/s390/mm/gmap.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c b/arch/powerpc/kvm/book3s_hv_uvmem.c index 1d67baa5557a..325a7a47d348 100644 --- a/arch/powerpc/kvm/book3s_hv_uvmem.c +++ b/arch/powerpc/kvm/book3s_hv_uvmem.c @@ -393,6 +393,7 @@ static int kvmppc_memslot_page_merge(struct kvm *kvm, { unsigned long gfn = memslot->base_gfn; unsigned long end, start = gfn_to_hva(kvm, gfn); + unsigned long vm_flags; int ret = 0; struct vm_area_struct *vma; int merge_flag = (merge) ? MADV_MERGEABLE : MADV_UNMERGEABLE; @@ -409,12 +410,14 @@ static int kvmppc_memslot_page_merge(struct kvm *kvm, ret = H_STATE; break; } + vm_flags = vma->vm_flags; ret = ksm_madvise(vma, vma->vm_start, vma->vm_end, - merge_flag, &vma->vm_flags); + merge_flag, &vm_flags); if (ret) { ret = H_STATE; break; } + reset_vm_flags(vma, vm_flags); start = vma->vm_end; } while (end > vma->vm_end); diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c index 3a695b8a1e3c..d5eb47dcdacb 100644 --- a/arch/s390/mm/gmap.c +++ b/arch/s390/mm/gmap.c @@ -2587,14 +2587,17 @@ int gmap_mark_unmergeable(void) { struct mm_struct *mm = current->mm; struct vm_area_struct *vma; + unsigned long vm_flags; int ret; VMA_ITERATOR(vmi, mm, 0); for_each_vma(vmi, vma) { + vm_flags = vma->vm_flags; ret = ksm_madvise(vma, vma->vm_start, vma->vm_end, - MADV_UNMERGEABLE, &vma->vm_flags); + MADV_UNMERGEABLE, &vm_flags); if (ret) return ret; + reset_vm_flags(vma, vm_flags); } mm->def_flags &= ~VM_MERGEABLE; return 0; -- 2.39.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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 D412FC27C76 for ; Wed, 25 Jan 2023 23:36:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 395FD6B007E; Wed, 25 Jan 2023 18:36:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 344A26B0080; Wed, 25 Jan 2023 18:36:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 170C96B0081; Wed, 25 Jan 2023 18:36:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 069CB6B007E for ; Wed, 25 Jan 2023 18:36:12 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id E0D21A0274 for ; Wed, 25 Jan 2023 23:36:11 +0000 (UTC) X-FDA: 80394932142.06.A1CB4FD Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf22.hostedemail.com (Postfix) with ESMTP id 3076FC000A for ; Wed, 25 Jan 2023 23:36:09 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=mIcpdtGt; spf=pass (imf22.hostedemail.com: domain of 36bzRYwYKCM4CEBy7v08805y.w86527EH-664Fuw4.8B0@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=36bzRYwYKCM4CEBy7v08805y.w86527EH-664Fuw4.8B0@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674689770; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=uFNiofQkx8EGkioLCgUuZFMgiu7EagxK9ILw1Sow0vM=; b=O2QAVbffGfZqw6YSNU1eXEtX4oQWL0FLBvQ50vTUqleelrVB1J5FKQV8f6YVfUuxbiBBFt bG/0SMCI9Qb7Bg7X9IC9tfmV6h1f5HwvcqDpC6qaOMreiZGylbL7tuT3Bl7UBlwa14azYu bxfADO6FfT6U5YRMd93EsfwSqK4M09g= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=mIcpdtGt; spf=pass (imf22.hostedemail.com: domain of 36bzRYwYKCM4CEBy7v08805y.w86527EH-664Fuw4.8B0@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=36bzRYwYKCM4CEBy7v08805y.w86527EH-664Fuw4.8B0@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674689770; a=rsa-sha256; cv=none; b=a+r27WpbeGHjHSSStjG+0i48JZodTs15Q6XuJO1tk0Ogf7VJyi46onaHvZ7WVe84nG3n8w 29PsvBPd/T3CzgURRmrK/zJ0S6KfD6UJDR2nzWedxDkCgroCmMNXlX7yy1/GEmvbBT9nMj xQX5XyhH7zg0dog9I7LuGbJsY32weD4= Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-507aac99fdfso1422087b3.11 for ; Wed, 25 Jan 2023 15:36:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=uFNiofQkx8EGkioLCgUuZFMgiu7EagxK9ILw1Sow0vM=; b=mIcpdtGtTptlXBa8kzPRiZ4LQeL8L4qFSrls4nVpFeCNpMiSotY6f+paMy+LghZ8V6 e9l5UcyWL072m000YU0+L04zrVr4EhWAwoZTx/p7MV2c+3YkTz0Vc17xg7GsN6zD4Z9R fONlZs10IIrOred9HnpC0C3EFZJdB0XAfbhzeR0ZgQ/dkYvIT6XW43EAfnRvkqq66q3g TyPxEoXRoXVo+FH/WvNzfXLvwh7J86Ui+UKVO/3Scbbi/do79F5NcZ+HTnfVO2bahnkQ 86T/MKLgW1x3swE+dFhZ6o7oKt9I4CYoHoHaBYMQWqHMdLwEjkwoM3UIGDBmnlaN/XJj pP8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uFNiofQkx8EGkioLCgUuZFMgiu7EagxK9ILw1Sow0vM=; b=PPqW5H/lkOT5IPI6NJQc5/aoLHHgXlXieti+6UKUtjUdw8vJfD87toAt2mCHEwMP9f +Rlv3wpKwqAQtNUjxIg497OLz4zzgKcykZHsIoa7/zQ9DcNF0zsAj/hIDpMUvxES1/sN th0mh9HQl/MV1aai8fcNi8RMhF1lfcWNuHzVCkAPMG2wCxzo0DLDWqmVXYgQqv3hmv9t akgj51fCAAuqxmpvod+bOq3AGm4sczZvAFIOEtTj6m0ESn4UQzH7GU/Y3sxq7Z/SyOPx 8s5HKhoz7WNbSqQSQAP73EGmvBNoWZKpdi8EHG8eeGCHUWYBCpF0Q7ezPMOsLFC+17eV Ec0w== X-Gm-Message-State: AFqh2koricBJKzAfanYTo/4NaznRHiMPx5tDzcC2PdS2MhN0yjHhdh37 4p9B0KHqkg5ICF4Cyh3O7zyOSZar6tA= X-Google-Smtp-Source: AMrXdXvMdRhk8RmJeZj9msjjVduAuvJeB5wZmXR/kRnEPyHhZJwnM0jGg8ZrEwM+ym7wuYAnXhndpOMqpaU= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:200:f7b0:20e8:ce66:f98]) (user=surenb job=sendgmr) by 2002:a0d:e582:0:b0:4df:96d1:f67a with SMTP id o124-20020a0de582000000b004df96d1f67amr4204399ywe.246.1674689769324; Wed, 25 Jan 2023 15:36:09 -0800 (PST) Date: Wed, 25 Jan 2023 15:35:52 -0800 In-Reply-To: <20230125233554.153109-1-surenb@google.com> Mime-Version: 1.0 References: <20230125233554.153109-1-surenb@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Message-ID: <20230125233554.153109-6-surenb@google.com> Subject: [PATCH v3 5/7] mm: replace vma->vm_flags indirect modification in ksm_madvise From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: michel@lespinasse.org, jglisse@google.com, mhocko@suse.com, vbabka@suse.cz, hannes@cmpxchg.org, mgorman@techsingularity.net, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, peterz@infradead.org, ldufour@linux.ibm.com, paulmck@kernel.org, mingo@redhat.com, will@kernel.org, luto@kernel.org, songliubraving@fb.com, peterx@redhat.com, david@redhat.com, dhowells@redhat.com, hughd@google.com, bigeasy@linutronix.de, kent.overstreet@linux.dev, punit.agrawal@bytedance.com, lstoakes@gmail.com, peterjung1337@gmail.com, rientjes@google.com, axelrasmussen@google.com, joelaf@google.com, minchan@google.com, jannh@google.com, shakeelb@google.com, tatashin@google.com, edumazet@google.com, gthelen@google.com, gurua@google.com, arjunroy@google.com, soheil@google.com, hughlynch@google.com, leewalsh@google.com, posk@google.com, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, x86@kernel.org, linux-kernel@vger.kernel.org, kernel-team@android.com, surenb@google.com Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 3076FC000A X-Stat-Signature: j6858ewqufnwo546jxjb4o36r7q8hzob X-HE-Tag: 1674689769-319444 X-HE-Meta: U2FsdGVkX19GGX6xoXYRroQDw/v4SxRm5WfepwKelMy67GaVHyu6XhDeg7X5GdiWhFNfkpyvpACz7qtZY7PfF7ZPjq6wm0rHFh9wXMDaRdOJjJemCC7EG+mc0DgUG4sXEAqh2zZqM8SbFIUjpeSScWmCtgmip7J90N0i6vcek918PQnGvN1W4nzYSbDqtoR63RaGH3ofa9QX6xBsO2WceqbRdyAM4/MGz6gr1F0Wm481ZbuNqFepWVSW/erzVsdIJkHS2jyTg1ZugljGPfgbbtuVwbQfNld1mqshnMBG5HmYl824rkYbGG+c4Cqb4kZEz+lxSHY+HXqLxoEhp1fKNnEFt6hJIG54N3jz5a9LZSI1mt29heTcC7pHJeb7mi2dHHuf/ti9+lCsiuFzW+b61AtYY4GoORv7DL4uR74iIT7yCyM60avC8TfVqc9nd4MFmlHrx8YXgaeVX+GdMGy6UGq3ZLmJPV3853NE7d6LaDOP5IB6k0INDpkCDzw1cBlfTDh80zqG1rl4WUmWn1Ue/ACvV3YV+1+zpL8g8r/+CTem0TzBMWFr7rOz62UJNyuZeV5uslOjff3vW6rua+qBD1lsa6y1sne+pZw+kT+1c2OGbbV4A55ng2hdJ2LO2NMULFXUXB57IVtr3Zp7M78Ye27b4NytBoVn7R94soOt9FWW30Y8xufJk5eTFi7Ed/qlYm5lZ5GXqlZ+eEj6ukmf3qi4ffGn689aLV7hH74JA0JPY91QYYTL76TBIq/zjJFaHLfJaQ+Mn9JnjEvRWnsc8YoYBv+0zeMlDb0ca/siWj8T5UoT7c0Pf546eaHioUMNfQI5rXJ6kXFSN4rFICin73kScpiu7Nqz+vtSmm974SzfJaw/HJ2AG42BDCwUMPlXmf2CqzbxwAbNW70JGkCf+gFHs3Bs8fkPXRr7FDFqx2cQel70lpoK6srZAdQfDq6r5BE9aUcVPfjQgpqK8WU PVgOU+BH rOJHdPwpJhkdFcP9TLxfSKALG3Wy8abrrKurn8itPfiJjmULm9TF4FQ/ib4Thxr5N7EoQZOvk+ePAFx6f5Y5tGSN/AH8B+6rsvGhl7gFCVPyJx96nCk8cKbPugrBJ/RQW+Oeq4mhiPyv0w51+CloWi2ZJboVG2Y+ajet3aAAkGkKzo3sO7oiutgBF2hKgYO3XYXxVs+aJB9dwESHnNXStsoLQ7rSyEz3xWBC2Gle+GLOMubBJoymNChsZUYVUJDDnMO7xSnPAbEvoJXJiAg6fNw7CO0+pQ+nQm7cu1rR1kLXOb36DIicpdMoDWgTKlyruWI0UdrL3h9ehjXKdBxOpVS2y6VijnGsd3OiSSqIURC6c/miEZdvNksuYJk7Y87MRc++QcXKqrikslrNbSv+kGPpHTSNn0H1pnyL/RKLWxQYOPlR55PH43QEEaDdkewgtqBVhF3Pxl47wUcEVAeHjqzxc39a8+VReWLfDntWskYuU4KyowHT6VJxTa06Hj81L9BDbMEjVoF6Pot0ax9ZXXgcNIGP9CkiyzublHwKTW4Wtd8mtLXaylm+BGaWdyjOLkkclD35emRbFsi5bDB9Tv5vbS/Pto+7Yi1eAra6rx7xk7bw728diO+B2MwDX5mIRaLsx9oGFvCsSifDAAfIpAIFu/dbU6m7KttRs6jtJKFtMY8PHctKY346xXIVcfWxWkFs1IQ/D4ydpo6rctdqLYtt/gO+EEb0kB5VWMAfjT9Zr4qg= 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: Replace indirect modifications to vma->vm_flags with calls to modifier functions to be able to track flag changes and to keep vma locking correctness. Signed-off-by: Suren Baghdasaryan Acked-by: Michal Hocko --- arch/powerpc/kvm/book3s_hv_uvmem.c | 5 ++++- arch/s390/mm/gmap.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c b/arch/powerpc/kvm/book3s_hv_uvmem.c index 1d67baa5557a..325a7a47d348 100644 --- a/arch/powerpc/kvm/book3s_hv_uvmem.c +++ b/arch/powerpc/kvm/book3s_hv_uvmem.c @@ -393,6 +393,7 @@ static int kvmppc_memslot_page_merge(struct kvm *kvm, { unsigned long gfn = memslot->base_gfn; unsigned long end, start = gfn_to_hva(kvm, gfn); + unsigned long vm_flags; int ret = 0; struct vm_area_struct *vma; int merge_flag = (merge) ? MADV_MERGEABLE : MADV_UNMERGEABLE; @@ -409,12 +410,14 @@ static int kvmppc_memslot_page_merge(struct kvm *kvm, ret = H_STATE; break; } + vm_flags = vma->vm_flags; ret = ksm_madvise(vma, vma->vm_start, vma->vm_end, - merge_flag, &vma->vm_flags); + merge_flag, &vm_flags); if (ret) { ret = H_STATE; break; } + reset_vm_flags(vma, vm_flags); start = vma->vm_end; } while (end > vma->vm_end); diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c index 3a695b8a1e3c..d5eb47dcdacb 100644 --- a/arch/s390/mm/gmap.c +++ b/arch/s390/mm/gmap.c @@ -2587,14 +2587,17 @@ int gmap_mark_unmergeable(void) { struct mm_struct *mm = current->mm; struct vm_area_struct *vma; + unsigned long vm_flags; int ret; VMA_ITERATOR(vmi, mm, 0); for_each_vma(vmi, vma) { + vm_flags = vma->vm_flags; ret = ksm_madvise(vma, vma->vm_start, vma->vm_end, - MADV_UNMERGEABLE, &vma->vm_flags); + MADV_UNMERGEABLE, &vm_flags); if (ret) return ret; + reset_vm_flags(vma, vm_flags); } mm->def_flags &= ~VM_MERGEABLE; return 0; -- 2.39.1