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 3E6E3E7716B for ; Wed, 4 Dec 2024 12:55:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C6E8A6B0088; Wed, 4 Dec 2024 07:54:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C1DC26B0089; Wed, 4 Dec 2024 07:54:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A970B6B008A; Wed, 4 Dec 2024 07:54:59 -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 8B3216B0088 for ; Wed, 4 Dec 2024 07:54:59 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 3060A1A093D for ; Wed, 4 Dec 2024 12:54:59 +0000 (UTC) X-FDA: 82857270846.01.2FF8D3E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf02.hostedemail.com (Postfix) with ESMTP id 7350180008 for ; Wed, 4 Dec 2024 12:54:29 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GunmxSy9; spf=pass (imf02.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733316886; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=EkAK23ba+nOdc62V3txwBduSNZiyWl3c9gCUE/mLOOA=; b=IznWpz7Uq5yjyOpdIQHT+x0g1ZIdkZJX0pPmMj0JfU8GwKBu+n3WRg2naGjCKijH6pZ4/v wEP8wJ2dEePgaZri4XMqv9EGM8fK0I/tzvabTOKoMvt+tESim1z6rj4UyAA56n1UudKqZk ppPPNxcRarUrHHC9DXVPhprHAt/07r4= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GunmxSy9; spf=pass (imf02.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733316886; a=rsa-sha256; cv=none; b=P3VVi6bIUqUbmbdvWkub8s/qe6ieJqEjN4ymXCYdXqwnVeJx5t9nrEU62e4Zu2Hmqn5vPx ibpJlBp0BDdmS/cRgRGDJ6Sf3VVp55J9drgs/J9iCuByBrwhYMMVVSwHo3KF1TTCH97jgQ wggfX5Wm761sslnEn1M0fZa6D3OYbgs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1733316896; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EkAK23ba+nOdc62V3txwBduSNZiyWl3c9gCUE/mLOOA=; b=GunmxSy90/g6QePWMgtggml73as1tWEu180Cbn8AQmHvZ6Rz1eCZ6Oq2R9fGFcbgf2Swe1 t+sQFoCP9O27BX5VgG5LyQNjsOVN6bmfLHjv2VjWyQd47WWPqz6SPaE9YK62Au29s9nbyA 6cewNXD9bJ+wDleyZPwpITZc2Y3Wmaw= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-56-hMo7VIA5No-Hk1sj11BEyg-1; Wed, 04 Dec 2024 07:54:55 -0500 X-MC-Unique: hMo7VIA5No-Hk1sj11BEyg-1 X-Mimecast-MFC-AGG-ID: hMo7VIA5No-Hk1sj11BEyg Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-385e0f3873cso2818184f8f.0 for ; Wed, 04 Dec 2024 04:54:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733316894; x=1733921694; 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=EkAK23ba+nOdc62V3txwBduSNZiyWl3c9gCUE/mLOOA=; b=NZfPyybIQYSQ7guUBsdJTqhYHe7cNHvVRsyvE5G5jOiEVRq6eMEzfao3zqsqy1KbS5 5X4vQrTtVJbKx9mj/Td+2qRABKQFrh8en1FayhbjJD4s80lI2fA/9uPAOYR1LPkSOBzB osfLO4H8Tt2nHKtA+PC2OLpmCW/+uuHqO6ICypj+6ekxBEm0RR3gFSMtsZoCKD4vvaOc 4UNOeVWm8xhn6fr+iSvzy1tQYGRjAMcjNhaYadB5IVyJkd/YjLoCm+ptt7/klhVckF7A bb9tM+T8MbPcjVSVzrlsX6KoP2DR2Z6MgmeLq18Gt9DGAIAH8NUi/aNs6xZk93L6B3yZ 5CVA== X-Gm-Message-State: AOJu0YzjTG0HA1dbsnzCA8NElLdP6LqMlJVpF+Nw3TJ9L+5gYjf+64HG KBk/f8sephBh0GNyVzeu0gYHAWhkgLtT14hzWodhdeWmPBR40+vbLPoAIiSgUCIvheJbfYwRK6Z xapmsmWTJ7xSrC3ItvuzXyXhzQEk8oVRct9c1YA1PghBE2Ld2k7hn7KlCA0Y= X-Gm-Gg: ASbGncsUCk+ze7eKEN2vGWW8gyJLi74L9Yw+mPpx+hp2hFWL6t9aqGPQIOlN6POE6KY wZOQGoLRDB/uF2ed05Dnl8A04SHJlHQTTE7d71UahG9vXAa9mdG9BMaFSvzXvGzFc20qhBaDlXH OOMz36/RWX0z7qr6REbWeVjMaEVb7Oyau5I+x41aCw5+/1eLPTUqt64Bs3DCIeMe40d9rZWcWiO O7s5HIdYe1oBPeHesocrFuLEXwZZUUW8e3BA+tS8e2RLNwVw+cQeVytoZ3DiMCShk3KYJCopmPO tgs1kwksUzR2+p1MrdKtY9OtRUYraBEVJms= X-Received: by 2002:a05:6000:1847:b0:385:ecdf:a30a with SMTP id ffacd0b85a97d-385fd3ee334mr5400373f8f.33.1733316893948; Wed, 04 Dec 2024 04:54:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IFvdtkWkEwxi8mpcTLDx5Tk+eqhyWjoc+BX5ypLCUE7CH8mOKCeowIphEqt4hXFtq1npl/2WQ== X-Received: by 2002:a05:6000:1847:b0:385:ecdf:a30a with SMTP id ffacd0b85a97d-385fd3ee334mr5400356f8f.33.1733316893544; Wed, 04 Dec 2024 04:54:53 -0800 (PST) Received: from localhost (p200300cbc70be10038d68aa111b0a20a.dip0.t-ipconnect.de. [2003:cb:c70b:e100:38d6:8aa1:11b0:a20a]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-434d52c12a4sm23880495e9.30.2024.12.04.04.54.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 04 Dec 2024 04:54:52 -0800 (PST) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linux-s390@vger.kernel.org, virtualization@lists.linux.dev, kvm@vger.kernel.org, linux-fsdevel@vger.kernel.org, kexec@lists.infradead.org, David Hildenbrand , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Baoquan He , Vivek Goyal , Dave Young , Thomas Huth , Cornelia Huck , Janosch Frank , Claudio Imbrenda , Eric Farman , Andrew Morton Subject: [PATCH v2 02/12] fs/proc/vmcore: replace vmcoredd_mutex by vmcore_mutex Date: Wed, 4 Dec 2024 13:54:33 +0100 Message-ID: <20241204125444.1734652-3-david@redhat.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241204125444.1734652-1-david@redhat.com> References: <20241204125444.1734652-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: O7eCnxnp2jgfvjyVoLJH1c5vnqgHYR3_MD60zY8MGc0_1733316894 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Queue-Id: 7350180008 X-Rspamd-Server: rspam12 X-Stat-Signature: jksj3wfkzp7ddrsu3ii7m9ycx88ksyhi X-Rspam-User: X-HE-Tag: 1733316869-805824 X-HE-Meta: U2FsdGVkX1+LP1nme4AZCTeOCs6exRReSmMppuetXqRoXUHGZyLgad5Ms3pJNL2gQ03tKw6ttZn7aeeQ6gjQ2EF0oekyiB//eD8uxYKBYekQLQvgcjZrKZZaq7mH8e+bMyGMHgOZaEQdgJavLgeCh6U3+hWCr/sz4FrI0DuU76/LcrHA6+q5XA0HqSKxtE8eEa4tsVDJOvDBZDnN0p2wiocFutmeN4Q9qidmFyWu+9WsliG/8O8kTjc+9E7IKTO4UCOPSFDDHsUpflrOBHsoa+pLDabvXxuRBuGA+SQj0XHiOEVik8kTJS0i540iylt3Y/7I1RAZ3FlgLby+T1DFRfFeTNu7EvYjwKzX1OFXKK9fLaQdrwvlL39Yh5ExJriItQcoPFOiotSMkcvNhVdrZ/wGS4QeU/SLWI0NxtzY7y4I6R8gKKbFIJvv4dhDD2GloYbaVFF1ifkt672TK+ugXYc+35rh1P4vetkFpy6M05yO84CLZD3vEQorlsspuebQST4E1w/DJOPlKNySiMaCMe0damowkdxbwZ7ROAXcN8IPq8xmGkjOt65uOZqWdSQ1jV1VrMPYHBrbR1mjaYJYHU2RFOmz4UVrtVi4OYQIICV2a0WpdufgGedNAK8QBpwTPmhGBehDYbFulhZQxncvOugpbteYCW4vaTBVw7uzHIahnufXq6+8h2atY0JK/fppWw39PiB0KtXCHLieTYx5yLzoo1JtAEq4myI1AiA2hcoDTcn20+roN8fpbpgF5ric5W6H+UfLMhooXI7cL/6AF3MXg0lIOVCBYIm1u3IGyR6XR6C1Jpb0rJ5XZ/LOqW/JREMUhF96r9OEfom551PHC+4og3hfbrtg35YhPB7sOVFsfbtaDGHx6mGz/t4t/GEBMDrw8wHjS6jpKKDpux8DTZf0btkt5fq2dswKGT/PkCa38n1JE0ngUqnAG9YjrBTnVZtNqCBD9ERCMq7k9ko jsvjO9Wq +pTBNmB828eZX8wkzfcINrzJuHOyH6J5UfoFqe2dfqTwmRxuQGTv19BNBZq7MI8G8rwq+oeTtuJ7c47pMwupxQRbV2aGqfCFtoIYnSTLwfchcbL23VPanJPlS/1fkP0cUAnfZPb+Oi7q5qqU7NZcla+PhJvBM8TgJAZa99YU98mETS/eixB1sB+UPUedb/DBiE2c2IYz8eZrs6YmDQNoTWMlDX0gtDC9+KtzgfAbIBoI4UftPq2AqQ3Ef5pgsqpfflQw05cbV0uVzaGomATvXwzVLmbumLQ92E7LOxnot3jniwM/GYzzkX1jOEMhfMceSrWvy7DlQyVEg+kLvn197KI7x4rrS0a5VQcbbIdki+m/H+Wdad7c/zPXnQmwQNur4U+o5wOHMua+WwMQd4rQthnlQbHKrY40JhREooVMJohhIes+aD0MYOaupdZw4DN08Xuj7v1N14VufChgxGsW1gp3OYVD8INcIoKEq 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: Now that we have a mutex that synchronizes against opening of the vmcore, let's use that one to replace vmcoredd_mutex: there is no need to have two separate ones. This is a preparation for properly preventing vmcore modifications after the vmcore was opened. Signed-off-by: David Hildenbrand --- fs/proc/vmcore.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c index 586f84677d2f..e5a7e302f91f 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c @@ -53,7 +53,6 @@ static struct proc_dir_entry *proc_vmcore; #ifdef CONFIG_PROC_VMCORE_DEVICE_DUMP /* Device Dump list and mutex to synchronize access to list */ static LIST_HEAD(vmcoredd_list); -static DEFINE_MUTEX(vmcoredd_mutex); static bool vmcoredd_disabled; core_param(novmcoredd, vmcoredd_disabled, bool, 0); @@ -248,7 +247,7 @@ static int vmcoredd_copy_dumps(struct iov_iter *iter, u64 start, size_t size) size_t tsz; char *buf; - mutex_lock(&vmcoredd_mutex); + mutex_lock(&vmcore_mutex); list_for_each_entry(dump, &vmcoredd_list, list) { if (start < offset + dump->size) { tsz = min(offset + (u64)dump->size - start, (u64)size); @@ -269,7 +268,7 @@ static int vmcoredd_copy_dumps(struct iov_iter *iter, u64 start, size_t size) } out_unlock: - mutex_unlock(&vmcoredd_mutex); + mutex_unlock(&vmcore_mutex); return ret; } @@ -283,7 +282,7 @@ static int vmcoredd_mmap_dumps(struct vm_area_struct *vma, unsigned long dst, size_t tsz; char *buf; - mutex_lock(&vmcoredd_mutex); + mutex_lock(&vmcore_mutex); list_for_each_entry(dump, &vmcoredd_list, list) { if (start < offset + dump->size) { tsz = min(offset + (u64)dump->size - start, (u64)size); @@ -306,7 +305,7 @@ static int vmcoredd_mmap_dumps(struct vm_area_struct *vma, unsigned long dst, } out_unlock: - mutex_unlock(&vmcoredd_mutex); + mutex_unlock(&vmcore_mutex); return ret; } #endif /* CONFIG_MMU */ @@ -1518,9 +1517,9 @@ int vmcore_add_device_dump(struct vmcoredd_data *data) dump->size = data_size; /* Add the dump to driver sysfs list */ - mutex_lock(&vmcoredd_mutex); + mutex_lock(&vmcore_mutex); list_add_tail(&dump->list, &vmcoredd_list); - mutex_unlock(&vmcoredd_mutex); + mutex_unlock(&vmcore_mutex); vmcoredd_update_size(data_size); return 0; @@ -1538,7 +1537,7 @@ EXPORT_SYMBOL(vmcore_add_device_dump); static void vmcore_free_device_dumps(void) { #ifdef CONFIG_PROC_VMCORE_DEVICE_DUMP - mutex_lock(&vmcoredd_mutex); + mutex_lock(&vmcore_mutex); while (!list_empty(&vmcoredd_list)) { struct vmcoredd_node *dump; @@ -1548,7 +1547,7 @@ static void vmcore_free_device_dumps(void) vfree(dump->buf); vfree(dump); } - mutex_unlock(&vmcoredd_mutex); + mutex_unlock(&vmcore_mutex); #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */ } -- 2.47.1