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 42206C43334 for ; Thu, 30 Jun 2022 22:33:50 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NEqw6qM++H7z90D6zykc9eb2TAipU7vhOjXA/DUbSd8=; b=kAi+Kcv4ZpaptL JI2XofClD70UinfUCa5Tji567xUwVcF3H+xvZzzD57c669jBd2+TLDs58Q5u6XxwI2ShNuD181XAe 0A2HH0ls8Sdg+wC2l/E3Jz9aBmlG6zYjyEXnJfkDPgw0ErGyl2Bd8AcJue5EqFLIjrZXGlrOdcl4R OpIr4jlYruuQM+G1e/B5KMnsmIt6EW2AolwLWtrFDUL+5DZzbMPd1h1cEAKSQpNqNJiQrJeThVdOz Ymu8NMTX52vRt3lA14NMaCCbhYDb3i7zg/f7he2oUG6v4cxxuVyzgMLM05FIsyP/Hvt3gm5xiTjdB 8pEJ8iO/T/xJrSmjpLjg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o72jI-001rPI-Ck; Thu, 30 Jun 2022 22:33:44 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o72ip-001rBe-Md for kexec@lists.infradead.org; Thu, 30 Jun 2022 22:33:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656628392; 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=M7KwLoH0d9jahqdN5gAGjp/0Ed77DbKf9u/QbOUdSiM=; b=MBLWWPugP3QXPEuzN8dzFxiXAMrfusG0vOXPXzW0qoJzGMKLNMvVS7jjhx0TXcxMbWnL/8 OKddoWt9zmN2EyDBUl/1O2sV9VHhDxVy7E6VfbOB/ThHra6OAvmS4eBSmPELFmJCkfTWKH dhT2mdfOz+VEJ8V/nj7hcA0Njb00u4E= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-596-LZ-OwvC9PCiQi7YEg57nKA-1; Thu, 30 Jun 2022 18:33:11 -0400 X-MC-Unique: LZ-OwvC9PCiQi7YEg57nKA-1 Received: by mail-wm1-f70.google.com with SMTP id i184-20020a1c3bc1000000b003a026f48333so134217wma.4 for ; Thu, 30 Jun 2022 15:33:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M7KwLoH0d9jahqdN5gAGjp/0Ed77DbKf9u/QbOUdSiM=; b=k4zFrG7CSwF2JL/nbWoTIi3L+ZDIZW6Vz54ie02Ka+mU+PSjgzqE3mTIzrH3QRio4W V642UfLxytMFHBRPAOlI1zRhVKNR8PCxCGD3VxuI9SpDgE3mT1fuN2jUVVOhwarZ7zyx Rq5tT5UDcSJAvNC7N6MuakFAo+sQuSG2+gxMauymFipyWQdwiX57eo2yeR9MyyW9Dvs5 Pfi4DGhe60nPaIH6qvUxU6BtG5DSxgtJ8y6NuyBsq6OpCaQFLt4+YZWQRIk2bSbKiZar niuBqCPmSVEImUEEMHHgGYjeSFkdZ2U8ss/+uqEPbRW6cvUpwzHoqd8dxUFWnhOsQMCn NnEw== X-Gm-Message-State: AJIora8fpfwfJCKm8lgh4sn9WMxykrzU0wMO5fE9u30V0sHQwedW3lHw dufq2uQV1P7tnJBd6R06xdbgu0Mt9SxIXI9/MgDFvJ4htl2Hn9WB66mhK/G2YMkK/SHFWS+LeAH CzD+5TKtoNxGMSbL4eLKpk0rRCZu1BKmZ3vBpE/d4H1AYa9543VzKVE9wOmITfCvIGLc1sj65 X-Received: by 2002:a05:600c:2049:b0:3a0:536b:c01b with SMTP id p9-20020a05600c204900b003a0536bc01bmr12804858wmg.151.1656628389780; Thu, 30 Jun 2022 15:33:09 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s0NtFXC0FlUaliXhCXoOcENAR69+spVwYicuXfWxSDj9OAt+BI6mrAcCGFYu+NNT4zLgABNw== X-Received: by 2002:a05:600c:2049:b0:3a0:536b:c01b with SMTP id p9-20020a05600c204900b003a0536bc01bmr12804822wmg.151.1656628389367; Thu, 30 Jun 2022 15:33:09 -0700 (PDT) Received: from vschneid.remote.csb ([185.11.37.247]) by smtp.gmail.com with ESMTPSA id m9-20020a056000024900b0020c5253d907sm4308387wrz.83.2022.06.30.15.33.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 15:33:08 -0700 (PDT) From: Valentin Schneider To: kexec@lists.infradead.org, linux-rt-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Eric Biederman , Arnd Bergmann , Petr Mladek , Miaohe Lin , Thomas Gleixner , Sebastian Andrzej Siewior , Juri Lelli , "Luis Claudio R. Goncalves" Subject: [PATCH v4 1/2] kexec: Turn all kexec_mutex acquisitions into trylocks Date: Thu, 30 Jun 2022 23:32:57 +0100 Message-Id: <20220630223258.4144112-2-vschneid@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220630223258.4144112-1-vschneid@redhat.com> References: <20220630223258.4144112-1-vschneid@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=vschneid@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220630_153315_857879_67E171D2 X-CRM114-Status: GOOD ( 15.98 ) X-BeenThere: kexec@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: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org Most acquistions of kexec_mutex are done via mutex_trylock() - those were a direct "translation" from: 8c5a1cf0ad3a ("kexec: use a mutex for locking rather than xchg()") there has however been two additions since then that use mutex_lock(): crash_get_memory_size() and crash_shrink_memory(). A later commit will replace said mutex with an atomic variable, and locking operations will become atomic_cmpxchg(). Rather than having those mutex_lock() become while (atomic_cmpxchg(&lock, 0, 1)), turn them into trylocks that can return -EBUSY on acquisition failure. This does halve the printable size of the crash kernel, but that's still neighbouring 2G for 32bit kernels which should be ample enough. Signed-off-by: Valentin Schneider --- include/linux/kexec.h | 2 +- kernel/kexec_core.c | 12 ++++++++---- kernel/ksysfs.c | 7 ++++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/include/linux/kexec.h b/include/linux/kexec.h index ce6536f1d269..54d7030d3c41 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -390,7 +390,7 @@ extern int kexec_load_disabled; extern bool kexec_in_progress; int crash_shrink_memory(unsigned long new_size); -size_t crash_get_memory_size(void); +ssize_t crash_get_memory_size(void); void crash_free_reserved_phys_range(unsigned long begin, unsigned long end); void arch_kexec_protect_crashkres(void); diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index 4d34c78334ce..16370926b21a 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -1009,13 +1009,16 @@ void crash_kexec(struct pt_regs *regs) } } -size_t crash_get_memory_size(void) +ssize_t crash_get_memory_size(void) { - size_t size = 0; + ssize_t size = 0; + + if (!mutex_trylock(&kexec_mutex)) + return -EBUSY; - mutex_lock(&kexec_mutex); if (crashk_res.end != crashk_res.start) size = resource_size(&crashk_res); + mutex_unlock(&kexec_mutex); return size; } @@ -1036,7 +1039,8 @@ int crash_shrink_memory(unsigned long new_size) unsigned long old_size; struct resource *ram_res; - mutex_lock(&kexec_mutex); + if (!mutex_trylock(&kexec_mutex)) + return -EBUSY; if (kexec_crash_image) { ret = -ENOENT; diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c index b1292a57c2a5..65dba9076f31 100644 --- a/kernel/ksysfs.c +++ b/kernel/ksysfs.c @@ -105,7 +105,12 @@ KERNEL_ATTR_RO(kexec_crash_loaded); static ssize_t kexec_crash_size_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { - return sprintf(buf, "%zu\n", crash_get_memory_size()); + ssize_t size = crash_get_memory_size(); + + if (size < 0) + return size; + + return sprintf(buf, "%zd\n", size); } static ssize_t kexec_crash_size_store(struct kobject *kobj, struct kobj_attribute *attr, -- 2.31.1 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec