From nobody Mon Jun 8 06:38:43 2026 Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACAFF3F20E3 for ; Wed, 3 Jun 2026 03:29:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457350; cv=none; b=sJ/NG3rnusrGCjzFK97LdT92ghTj7QmO0x28zffq8sysHT5aYrn/SZkWKJF7/ML3fX4eOBVBeCf+dOUiJuqcLRIfbTLIgFvvTYkRBiWaVNhHIEdO782Hdz5vvRi/SiKGMKO8dAl85xt6+WeifGe6cvNTvQFTJOsAj+KsWw0D38s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457350; c=relaxed/simple; bh=IMbuGTukyT8IG40YTi+316UrswHf2CnDFbSS3RnRmnE=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CjifWGtoLGwcrPeqhZmtK5fOwnC2Wz3xrekJtWbgmQMvPCrzpZz/p0ik8+XfF4QUhELUxAO49qVPVXsx4Oe7xVDfd95/AmC/5JmTHO9T/lyXu2lof2R2t4F5yDfuAVX1YmL1Gb+L+LgLaQoQq0GU8B9O2msnPeUxNn2yuiK9g78= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b=aeqRda+x; arc=none smtp.client-ip=209.85.219.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="aeqRda+x" Received: by mail-qv1-f49.google.com with SMTP id 6a1803df08f44-8ce9e56f68cso25594216d6.2 for ; Tue, 02 Jun 2026 20:29:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; t=1780457349; x=1781062149; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=yVlCXZe8SHDSOJUkKVBaYBikNvs5G4Pkl6SfmcOaAr0=; b=aeqRda+xv4SFXFn/xsc3EzBdNw8mmBt2KNugRtDIQflCA3NfN6cJoSd51j63O08nnI 0i3ULCo3bA8uNOFTRi03T4lkEQqhxTwbF16EDxYrD7t5tDlmsvtxbG/aKS9l6Jkp92KM 4J1J3hQqu9QtJvybdFfTWzc+1fcwjflbb2EZUxmmsoN5VnREeH7/H0yTHhF+hiei7zj5 CwSTbhjiN4MkXkAhL/AcoS68VdWsW3QfFknDJ1f7Kzs2dlSiFVDEX9oJ/5WDGa9A6I47 wHk5xNIw63gCWOzXzQOJdnumJbAdC75p1cvVW6oYYyWd/gtNQfkejp7x9FOv4nnk4Cf6 3LSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780457349; x=1781062149; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=yVlCXZe8SHDSOJUkKVBaYBikNvs5G4Pkl6SfmcOaAr0=; b=KSXMzf3ReQbEUgP6d+Ubw03vvxUMCQkz8V7eJ225NWfVb3kFGdlvrzCiiq1FEvMy2E L3OKLmksNFIJI6jrpLsxTatx4SKnIQE3mZ+BT/rkDZIdtwxBBnuvOvcFvrimnRwakBXM 7PYkuVZkfBXPQbuBd7v71HNt3Nfzll5+MKJ9SluHZijdafvsZUg2Poo6o6cQTpZ7mLgx x6LCDuNus7fON2vzC+AmA1hS5PJdvFxw0urSQPK9UcCg1V8ktSuuIvk2bvr8VOfeXRhf Q4D8Ifso+Vq6wTHFDi+OeSeCHteLJqyN62sgQ25CgUjLeoevPCprqDG9Z5rqyojhJHry WK7Q== X-Forwarded-Encrypted: i=1; AFNElJ+SIs6xzYCpnZTpAGgih216uf9oBAdoU1e8E2sfuzzseoe+or7hX9VDTEEDUI0xuZeOfWztV87tzLxdQgU=@vger.kernel.org X-Gm-Message-State: AOJu0YwgpaSPJBxyb3XoRNwuc8A6I5PQeiAbrdMWWrzFdMBxtXg+LdZj upATBPALsjsj+yyI1al1yVOkZf8/Lj3b69Og7ABsqXkqEnxZhBbq6sDHL2zwSC5CK+U= X-Gm-Gg: Acq92OGCBFaM1yn41QfSg11F1M49EW44Vxd9LF7f8Aj1v9XUWJbMVSvQXijSHs9CqWv D1XyuxvayhvJzJEHoOxZDvaYgtn7m2mK3tM5YCvouIlnSfzO+bRjg59rWM82pNSje1oLsXUu7un Cg2GeswqCDyFmLcGZws2JGt0GfbCC4eKRjjLdX4wISh2a4Jk2EFovVQb3eVUs99aV3H+J1C0qUh axyX7ny2xgRZFKX9DCXiLi520FA4l7izbqHbI98pA5qJt2XgBXmPXrSPBPsEjpMnXbeeX0deLCL cvUmOgo69BLRCfagndOGw6F1QMD0DwdwIAy9hG/A0O4iX8xbYBZIO+t0sDSdsZUOZl5uNsLtp1f MyynrDetdsq85UNIX38lmSRLuVMNMgVoAFjm0PMCm85MvDnelSaXKlpWwlnIuLMCYJlg+/rTxj4 eA4UGaJW18Zv0Mdthpsi11IrlZhYduDErKK0dZ870sLJv8SB9G/bFRa0DBfZQJRw== X-Received: by 2002:a0c:f09c:0:b0:8cc:dfa6:3333 with SMTP id 6a1803df08f44-8cece028a1amr19783726d6.32.1780457348680; Tue, 02 Jun 2026 20:29:08 -0700 (PDT) Received: from plex ([71.181.43.54]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8cecd26b3b9sm9244566d6.45.2026.06.02.20.29.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 20:29:08 -0700 (PDT) From: Pasha Tatashin To: linux-kselftest@vger.kernel.org, rppt@kernel.org, shuah@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, skhan@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, corbet@lwn.net, pasha.tatashin@soleen.com, dmatlack@google.com, kexec@lists.infradead.org, pratyush@kernel.org, skhawaja@google.com, graf@amazon.com Subject: [PATCH v6 01/13] liveupdate: change file_set->count type to u64 for type safety Date: Wed, 3 Jun 2026 03:28:52 +0000 Message-ID: <20260603032905.344462-2-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260603032905.344462-1-pasha.tatashin@soleen.com> References: <20260603032905.344462-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This improves type safety and aligns the in-memory file_set->count with the serialized count type. It avoids potential truncation or sign conversion mismatch issues. Reviewed-by: Pratyush Yadav (Google) Acked-by: Mike Rapoport (Microsoft) Signed-off-by: Pasha Tatashin --- kernel/liveupdate/luo_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/liveupdate/luo_internal.h b/kernel/liveupdate/luo_inter= nal.h index dd53d4a7277e..ae58206f14ac 100644 --- a/kernel/liveupdate/luo_internal.h +++ b/kernel/liveupdate/luo_internal.h @@ -52,7 +52,7 @@ static inline int luo_ucmd_respond(struct luo_ucmd *ucmd, struct luo_file_set { struct list_head files_list; struct luo_file_ser *files; - long count; + u64 count; }; =20 /** --=20 2.53.0 From nobody Mon Jun 8 06:38:43 2026 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D625D3F0AB6 for ; Wed, 3 Jun 2026 03:29:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457352; cv=none; b=RckNP15Zrb3oHnJZb+OQgUehrX6/xdz9JZ7cOGN3JTsix1kil0qRf3H9DLhAYbeYSbz45Vk249aAoEzVdcGOonuFqgInZm3nEXMTY2ZyratVon0CLxlRwuRed2y2x+0OnNtfoVnuA9FfgvG8OCZW6Z9uInIIG9lgbiP6kbaW+Yo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457352; c=relaxed/simple; bh=jG2redhEjCAzt/rTfg+v2gYbLiDjnuNP6eco1Upctx0=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XrFirPN3raKZKp2AfG24YuF/6lIDKTzXsnJc1l6jsng7z6YYCgQhslx1hfapIlzsVIY0pJP10zEaEJjwPPgOd0J/9FFvoAOT6uFyjQNmEIvTelJiEqxObeqQv03RkFUR3hh3gmmOlg+Q/+X2wfDEJ+D2r3t78f33lu9LjMKrnwY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b=lCflXLcv; arc=none smtp.client-ip=209.85.219.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="lCflXLcv" Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-8ce9df31840so25831966d6.1 for ; Tue, 02 Jun 2026 20:29:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; t=1780457350; x=1781062150; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=EeknQ7K2aMvDWr+2KhWa4BnSPX1nCQezxpcXmui2530=; b=lCflXLcvhzy3ULEDF2l/7xPcmX9O6D0UVGqZJgDOvrnCbQ6PH18DqXZt2JIL5bxmNx l02ccIVVgglDj1+u91/AAgreclkHHEfYMS735D24zwVQOFUDQlEwnhnOmCUGOw9PufJ8 rwFleZViMs1N6rTznEwX8G/MKpHTz/iC60f3nqC+fUozhkBhYzG+A+WD7g3kycFHqE2K /rtSikOYsEj/uUuJ64rmkhCvSDoKqGJle4K9C6lFnzXl9pn8kNjMJurGbXyA4jHdWi1d I2sDiBbmwchzR5w/fvgfEuTOO3/LgbyEzWW73xgQOVuZXev6hmor7frzkiha6m4dmFq0 0NSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780457350; x=1781062150; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=EeknQ7K2aMvDWr+2KhWa4BnSPX1nCQezxpcXmui2530=; b=Gtw+rkbB44Y/2NTkoLCqjAxGa81FMK24Av/9ndXoNC70aU+Y0KLxuNSPoY8DqLS86U QgnK0m+ZhdzEfJSWiRQ9EzY3cji4bgRatWXOi7zLiYmi5dTmBv8OICWhCL58g+GSMzYr LlVfaGASD7OCkJW5H7QuaY7P9S0zJwHtQK/EkIDbX+9L4JE7G34mOnZPrNoUtoCDlQQT xbmy9DsBrUl2qkDIac+L6SPsLv5wb3cQGSFVv9Spk3xKgr4CRBWz/geOXzKSycXF/ws/ qehrlklux7JGZPj9ARhT2NiB3bRxUsvEJUY6Cvci8dcPV7YNEwTnTAeEzSB9E9czZK/3 ZxYA== X-Forwarded-Encrypted: i=1; AFNElJ9AzMXOV68IkySbWkJwnc47I5dOEn8M/T9Rit1f5QTBl4PbPk/Hg+y6pUzxfpQ0vu1Ch5yNCTFpcKCBdKw=@vger.kernel.org X-Gm-Message-State: AOJu0YwC8+It3xtdKFxCmkKHRjuck+MTqIeZ56/Zs4MfZJr1dv9GRFL/ v2e9BsD9DoUyKovMWwnizREz9Kj+EAVqxX24NngtarIrBSCDTi+VFg7b251TyUVjIS62/Ja2mHv 66M2W X-Gm-Gg: Acq92OHNv/eu7HXvX6F/yk0J1FSVAptNcE9AwCXxyCD4q01gT4EllLIF1hhL5yn/Lxg DjWv6gT24qqMDYclR7pDzthWrIM5BFrHS8seyJaswK0m9vfe4mu793MinPt9qUuUypkdfGGLoeU 4Xm8faOwx08PT+cCMGQ6wqrjg3oXqKn/+OAW1P3u7rCW5XifoCWXqEUsqLPvOlmzDK/FoF99+K7 DmmqaapwG8iRabOCckcU8ovOyZ5k/i3bQfhqqhWnJS0CDbK6xeqy8DQiAv2jMQqZnilnvQLbh42 KerfZqoHvbldHNCS5h/KoeVhoM51D2rFo7KAflCOTsoC/Sf1kPEEWVQe0Q0JHEF9q/PlTAtADGi tDPGSvk1cCAHfH17LDoh3e79zGpIGt1o1j+gT+vunNF9Bcnf/7yApxVrONIjzw+SNCMZCrELrgl w2BJ6emK8xT7OYYkWs4S0yhbpODt7Bb0omcaowuCwh7rFkMXB39lioP62Fw44MoQ== X-Received: by 2002:a0c:e086:0:b0:8ce:ade5:e8fd with SMTP id 6a1803df08f44-8cecdf0cdfdmr18753906d6.25.1780457349833; Tue, 02 Jun 2026 20:29:09 -0700 (PDT) Received: from plex ([71.181.43.54]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8cecd26b3b9sm9244566d6.45.2026.06.02.20.29.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 20:29:09 -0700 (PDT) From: Pasha Tatashin To: linux-kselftest@vger.kernel.org, rppt@kernel.org, shuah@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, skhan@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, corbet@lwn.net, pasha.tatashin@soleen.com, dmatlack@google.com, kexec@lists.infradead.org, pratyush@kernel.org, skhawaja@google.com, graf@amazon.com Subject: [PATCH v6 02/13] liveupdate: avoid mixing cleanup guards with goto in luo_session_retrieve_fd Date: Wed, 3 Jun 2026 03:28:53 +0000 Message-ID: <20260603032905.344462-3-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260603032905.344462-1-pasha.tatashin@soleen.com> References: <20260603032905.344462-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Refactoring luo_session_retrieve_fd() to avoid mixing automated cleanup-style guards with goto-based resource release, which is not recommended under the Linux kernel coding style. Reviewed-by: Pratyush Yadav (Google) Signed-off-by: Pasha Tatashin Acked-by: Mike Rapoport (Microsoft) --- kernel/liveupdate/luo_session.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/liveupdate/luo_session.c b/kernel/liveupdate/luo_sessio= n.c index 5c6cebc6e326..47566db64598 100644 --- a/kernel/liveupdate/luo_session.c +++ b/kernel/liveupdate/luo_session.c @@ -291,10 +291,11 @@ static int luo_session_retrieve_fd(struct luo_session= *session, if (argp->fd < 0) return argp->fd; =20 - guard(mutex)(&session->mutex); + mutex_lock(&session->mutex); err =3D luo_retrieve_file(&session->file_set, argp->token, &file); + mutex_unlock(&session->mutex); if (err < 0) - goto err_put_fd; + goto err_put_fd; =20 err =3D luo_ucmd_respond(ucmd, sizeof(*argp)); if (err) --=20 2.53.0 From nobody Mon Jun 8 06:38:43 2026 Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D5263F54BF for ; Wed, 3 Jun 2026 03:29:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457355; cv=none; b=tZEgfHLcyP1CgkKB+e8YaLPQXKIePWa4cV4n2INSs7jqxRDkvq+9fDq7yl4PCQT+oobItHhRNDtRdCdChJ+FnWtILBQl6aC+jdt4QYGVequSM/I2KpIJc3XhfS1O1x6MBlKOB1tezHSJ23MRpHOMCh90l20aqloAm9hJzBT8Hjo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457355; c=relaxed/simple; bh=W7rOWRVNZ8tDZPO4QlJ9UzHIE3BclkVv+K/dzHdlnxE=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RPrbHzDWQS5d6oQSuTnScYYsUmbcMl00+/RYplgNS7kkxvqUBhe2Q0WFot/qFyjwOvfwlg9INeYv3v9T/vk5nbdqWRpW1FqdiXds/mOnNiGocj+yseGtJMZHPjcaSGzpBtvkA0Oyo/bnfBTtcF5uRCQXHNgS73fQQvlLMRDb6B4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b=A1jvDd1N; arc=none smtp.client-ip=209.85.160.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="A1jvDd1N" Received: by mail-qt1-f177.google.com with SMTP id d75a77b69052e-5174a1d78f8so29660961cf.2 for ; Tue, 02 Jun 2026 20:29:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; t=1780457352; x=1781062152; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=i6LuWhhLaRlc8iqtz6v9iQAW1E3tem5Dh4guT6Y5GiY=; b=A1jvDd1N74HVcWnyQyqv7ZclMAfMb7G2HjBUerOUdNAum8x9kIebVMP48Kib5FlP8R bAJTi/1IrKdm3gohJLL5UJks5xiXVOtOcE3is1JjOT/s+O4nATZfUa5BwNVjC8W6hrfM 35y4eCr6ReOETYYU/j02yx2HkwBkamhdUywCtC447mKPvY0Xd4FeMm1DsxR7Ale2oy1A fidZeYlOZXSc5Is64+GbZSYtsfG1ypxORTtrvm3C+dg2gusPDxeniQdJAQgesHqd4sYU Tv4OLxkVj+vVgtWIrgSBwI+AfcBr2XAfj/tA9PPhKbho2E/ZO2d5ugj8uyxJEx6igguj ww9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780457352; x=1781062152; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=i6LuWhhLaRlc8iqtz6v9iQAW1E3tem5Dh4guT6Y5GiY=; b=JTLBUy8EvY3x1onUdQGp+0okKUCEgLwNReo0yWuyugZlmkZtSv12OmUJEXw5eUEQ78 t1jnz0dog7TuCRS6KoV7H/YCFM79+tIN43bCkf+BKbwDqjjuXWiR1uO9ew/UZrSKTgFC FUnZbY9dEHtMwzuQ2dnW0VKpKtEJHnPJyMRjYtqR6OBtSPE9hEGzzRwJNoKY5JWED7zu pxwLMo0KGErMeoA5c7SmGXVia5I9vRTCmQeknh2pihL1VptramxoD2z/+OM5ehcPfJM6 qyWCSfz/fGvixKNOAi/kJEyco1Az+w6iQR8jRVgeq0y2uxz9fWGT/dG2rMEAr0rqVTNc Yxxw== X-Forwarded-Encrypted: i=1; AFNElJ/Dlm/QLF+VPEm1sHXsFNRYhx+Hynz6MBcPPGoCwpH7UpIHKsQ6p6ee0dQqBUe63UJfdfwd748SET/QNgs=@vger.kernel.org X-Gm-Message-State: AOJu0YxOdKJWM+wDpyrmNCuYzVjRpoAyWoNX7iODjWBp6EdvcRHTZCaN +s5P/Wda7RWGwOgXFQMbL/gskCI+tYhte71wppGqErOb/WmG6a8595HrfA6ek2RP2WE= X-Gm-Gg: Acq92OETXpL1jOksb/3ROfLDLvBndLAisfHnoZj6LR0MlX9bGoTczbxkRgr6MYQBfOH cs6x0dx8F+KynQGqqDxwqeniFQAWXa5aiG2fzaDLBUQtRq2A9y7+DLzdYkD1cPYe0jehhWwayiq lOAUI1GTfFMJBo2ndBjid1c1JeHdRznVJj6RbjDpXuglj1tAWfHGSGN9R89IKqkiXRgyqXSoz/H nwig46A9KJt3GMaEpuPlu8tn/zafLcUNUdhWD/dEv9W14k5rWtblZz7QwJQZfiXhTUT+fkLciH1 Js/ytgkCD2/yp/NJSeJuhjFL69Kazl7taqFa1Ev40mUvTNMpDHEMAeK7Z+6avln8/wa+vfo5KFb tr5CuIT1X8Jms7ywc+MJcCsS9v8ohL5Rir3HRuuCkAPn5gsmMdfWUJ9fXsqALBJkzAGdAypUUez GlYO1EO3XKxFvX7PPJ1/7N0DNpuQ9fUfPthPx+Uhmcsw7ivjNcmyxoUEnIjMfgCQ== X-Received: by 2002:a05:622a:428d:b0:516:de58:e4c4 with SMTP id d75a77b69052e-51778655d07mr29403271cf.25.1780457352125; Tue, 02 Jun 2026 20:29:12 -0700 (PDT) Received: from plex ([71.181.43.54]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8cecd26b3b9sm9244566d6.45.2026.06.02.20.29.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 20:29:10 -0700 (PDT) From: Pasha Tatashin To: linux-kselftest@vger.kernel.org, rppt@kernel.org, shuah@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, skhan@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, corbet@lwn.net, pasha.tatashin@soleen.com, dmatlack@google.com, kexec@lists.infradead.org, pratyush@kernel.org, skhawaja@google.com, graf@amazon.com Subject: [PATCH v6 03/13] liveupdate: centralize state management into struct luo_ser Date: Wed, 3 Jun 2026 03:28:54 +0000 Message-ID: <20260603032905.344462-4-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260603032905.344462-1-pasha.tatashin@soleen.com> References: <20260603032905.344462-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Transition the LUO to ABI v2, which centralizes state management into a single struct luo_ser header. Previously, LUO state was spread across multiple FDT properties and subnodes. ABI v2 simplifies this by placing all core state, including the liveupdate number and physical addresses for sessions and FLB headers into a centralized struct luo_ser. Note that this change introduces a semantic difference: the sessions and FLB serialization formats are no longer completely independent of the core LUO. Their metadata (such as physical addresses for sessions and FLB headers) is now coupled to and managed via the centralized struct luo_ser. Reviewed-by: Pratyush Yadav (Google) Signed-off-by: Pasha Tatashin Acked-by: Mike Rapoport (Microsoft) --- include/linux/kho/abi/luo.h | 91 +++++++++++--------------------- kernel/liveupdate/luo_core.c | 64 +++++++++++++++------- kernel/liveupdate/luo_flb.c | 60 +++------------------ kernel/liveupdate/luo_internal.h | 8 +-- kernel/liveupdate/luo_session.c | 64 ++++------------------ 5 files changed, 96 insertions(+), 191 deletions(-) diff --git a/include/linux/kho/abi/luo.h b/include/linux/kho/abi/luo.h index 46750a0ddf88..1b2f865a771a 100644 --- a/include/linux/kho/abi/luo.h +++ b/include/linux/kho/abi/luo.h @@ -30,52 +30,25 @@ * .. code-block:: none * * / { - * compatible =3D "luo-v1"; - * liveupdate-number =3D <...>; - * - * luo-session { - * compatible =3D "luo-session-v1"; - * luo-session-header =3D ; - * }; - * - * luo-flb { - * compatible =3D "luo-flb-v1"; - * luo-flb-header =3D ; - * }; + * compatible =3D "luo-v2"; + * luo-abi-header =3D ; * }; * * Main LUO Node (/): * - * - compatible: "luo-v1" + * - compatible: "luo-v2" * Identifies the overall LUO ABI version. - * - liveupdate-number: u64 - * A counter tracking the number of successful live updates performed. - * - * Session Node (luo-session): - * This node describes all preserved user-space sessions. - * - * - compatible: "luo-session-v1" - * Identifies the session ABI version. - * - luo-session-header: u64 - * The physical address of a `struct luo_session_header_ser`. This str= ucture - * is the header for a contiguous block of memory containing an array = of - * `struct luo_session_ser`, one for each preserved session. - * - * File-Lifecycle-Bound Node (luo-flb): - * This node describes all preserved global objects whose lifecycle is b= ound - * to that of the preserved files (e.g., shared IOMMU state). - * - * - compatible: "luo-flb-v1" - * Identifies the FLB ABI version. - * - luo-flb-header: u64 - * The physical address of a `struct luo_flb_header_ser`. This structu= re is - * the header for a contiguous block of memory containing an array of - * `struct luo_flb_ser`, one for each preserved global object. + * - luo-abi-header: u64 + * The physical address of `struct luo_ser`. * * Serialization Structures: * The FDT properties point to memory regions containing arrays of simpl= e, * `__packed` structures. These structures contain the actual preserved = state. * + * - struct luo_ser: + * The central ABI structure that contains the overall state of the LU= O. + * It includes the liveupdate-number and pointers to sessions and FLBs. + * * - struct luo_session_header_ser: * Header for the session array. Contains the total page count of the * preserved memory block and the number of `struct luo_session_ser` @@ -109,13 +82,26 @@ =20 /* * The LUO FDT hooks all LUO state for sessions, fds, etc. - * In the root it also carries "liveupdate-number" 64-bit property that - * corresponds to the number of live-updates performed on this machine. */ #define LUO_FDT_SIZE PAGE_SIZE #define LUO_FDT_KHO_ENTRY_NAME "LUO" -#define LUO_FDT_COMPATIBLE "luo-v1" -#define LUO_FDT_LIVEUPDATE_NUM "liveupdate-number" +#define LUO_FDT_COMPATIBLE "luo-v2" +#define LUO_FDT_ABI_HEADER "luo-abi-header" + +/** + * struct luo_ser - Centralized LUO ABI header. + * @liveupdate_num: A counter tracking the number of successful live updat= es. + * @sessions_pa: Physical address of the first session block header. + * @flbs_pa: Physical address of the FLB header. + * + * This structure is the root of all preserved LUO state. It is pointed to= by + * the "luo-abi-header" property in the LUO FDT. + */ +struct luo_ser { + u64 liveupdate_num; + u64 sessions_pa; + u64 flbs_pa; +} __packed; =20 #define LIVEUPDATE_HNDL_COMPAT_LENGTH 48 =20 @@ -147,15 +133,6 @@ struct luo_file_set_ser { u64 count; } __packed; =20 -/* - * LUO FDT session node - * LUO_FDT_SESSION_HEADER: is a u64 physical address of struct - * luo_session_header_ser - */ -#define LUO_FDT_SESSION_NODE_NAME "luo-session" -#define LUO_FDT_SESSION_COMPATIBLE "luo-session-v2" -#define LUO_FDT_SESSION_HEADER "luo-session-header" - /** * struct luo_session_header_ser - Header for the serialized session data = block. * @count: The number of `struct luo_session_ser` entries that immediately @@ -165,7 +142,7 @@ struct luo_file_set_ser { * physical memory preserved across the kexec. It provides the necessary * metadata to interpret the array of session entries that follow. * - * If this structure is modified, `LUO_FDT_SESSION_COMPATIBLE` must be upd= ated. + * If this structure is modified, `LUO_FDT_COMPATIBLE` must be updated. */ struct luo_session_header_ser { u64 count; @@ -182,7 +159,7 @@ struct luo_session_header_ser { * session) is created and passed to the new kernel, allowing it to recons= truct * the session context. * - * If this structure is modified, `LUO_FDT_SESSION_COMPATIBLE` must be upd= ated. + * If this structure is modified, `LUO_FDT_COMPATIBLE` must be updated. */ struct luo_session_ser { char name[LIVEUPDATE_SESSION_NAME_LENGTH]; @@ -192,10 +169,6 @@ struct luo_session_ser { /* The max size is set so it can be reliably used during in serialization = */ #define LIVEUPDATE_FLB_COMPAT_LENGTH 48 =20 -#define LUO_FDT_FLB_NODE_NAME "luo-flb" -#define LUO_FDT_FLB_COMPATIBLE "luo-flb-v1" -#define LUO_FDT_FLB_HEADER "luo-flb-header" - /** * struct luo_flb_header_ser - Header for the serialized FLB data block. * @pgcnt: The total number of pages occupied by the entire preserved memo= ry @@ -205,11 +178,9 @@ struct luo_session_ser { * in the memory block. * * This structure is located at the physical address specified by the - * `LUO_FDT_FLB_HEADER` FDT property. It provides the new kernel with the - * necessary information to find and iterate over the array of preserved - * File-Lifecycle-Bound objects and to manage the underlying memory. + * flbs_pa in luo_ser. * - * If this structure is modified, LUO_FDT_FLB_COMPATIBLE must be updated. + * If this structure is modified, `LUO_FDT_COMPATIBLE` must be updated. */ struct luo_flb_header_ser { u64 pgcnt; @@ -231,7 +202,7 @@ struct luo_flb_header_ser { * passed to the new kernel. Each entry allows the LUO core to restore one * global, shared object. * - * If this structure is modified, LUO_FDT_FLB_COMPATIBLE must be updated. + * If this structure is modified, `LUO_FDT_COMPATIBLE` must be updated. */ struct luo_flb_ser { char name[LIVEUPDATE_FLB_COMPAT_LENGTH]; diff --git a/kernel/liveupdate/luo_core.c b/kernel/liveupdate/luo_core.c index 5d5827ced73c..085c0dfc1ef1 100644 --- a/kernel/liveupdate/luo_core.c +++ b/kernel/liveupdate/luo_core.c @@ -61,7 +61,6 @@ #include #include #include -#include =20 #include "kexec_handover_internal.h" #include "luo_internal.h" @@ -86,9 +85,11 @@ early_param("liveupdate", early_liveupdate_param); =20 static int __init luo_early_startup(void) { + struct luo_ser *luo_ser; + int err, header_size; phys_addr_t fdt_phys; - int err, ln_size; const void *ptr; + u64 luo_ser_pa; =20 if (!kho_is_enabled()) { if (liveupdate_enabled()) @@ -119,26 +120,32 @@ static int __init luo_early_startup(void) return -EINVAL; } =20 - ln_size =3D 0; - ptr =3D fdt_getprop(luo_global.fdt_in, 0, LUO_FDT_LIVEUPDATE_NUM, - &ln_size); - if (!ptr || ln_size !=3D sizeof(luo_global.liveupdate_num)) { - pr_err("Unable to get live update number '%s' [%d]\n", - LUO_FDT_LIVEUPDATE_NUM, ln_size); + header_size =3D 0; + ptr =3D fdt_getprop(luo_global.fdt_in, 0, LUO_FDT_ABI_HEADER, &header_siz= e); + if (!ptr || header_size !=3D sizeof(u64)) { + pr_err("Unable to get ABI header '%s' [%d]\n", + LUO_FDT_ABI_HEADER, header_size); =20 return -EINVAL; } =20 - luo_global.liveupdate_num =3D get_unaligned((u64 *)ptr); + luo_ser_pa =3D get_unaligned((u64 *)ptr); + luo_ser =3D phys_to_virt(luo_ser_pa); + + luo_global.liveupdate_num =3D luo_ser->liveupdate_num; pr_info("Retrieved live update data, liveupdate number: %lld\n", luo_global.liveupdate_num); =20 - err =3D luo_session_setup_incoming(luo_global.fdt_in); + err =3D luo_session_setup_incoming(luo_ser->sessions_pa); if (err) - return err; + goto out_free_ser; + + luo_flb_setup_incoming(luo_ser->flbs_pa); =20 - err =3D luo_flb_setup_incoming(luo_global.fdt_in); + err =3D 0; =20 +out_free_ser: + kho_restore_free(luo_ser); return err; } =20 @@ -160,7 +167,8 @@ early_initcall(liveupdate_early_init); /* Called during boot to create outgoing LUO fdt tree */ static int __init luo_fdt_setup(void) { - const u64 ln =3D luo_global.liveupdate_num + 1; + struct luo_ser *luo_ser; + u64 luo_ser_pa; void *fdt_out; int err; =20 @@ -170,27 +178,45 @@ static int __init luo_fdt_setup(void) return PTR_ERR(fdt_out); } =20 + luo_ser =3D kho_alloc_preserve(sizeof(*luo_ser)); + if (IS_ERR(luo_ser)) { + err =3D PTR_ERR(luo_ser); + goto exit_free_fdt; + } + luo_ser_pa =3D virt_to_phys(luo_ser); + err =3D fdt_create(fdt_out, LUO_FDT_SIZE); err |=3D fdt_finish_reservemap(fdt_out); err |=3D fdt_begin_node(fdt_out, ""); err |=3D fdt_property_string(fdt_out, "compatible", LUO_FDT_COMPATIBLE); - err |=3D fdt_property(fdt_out, LUO_FDT_LIVEUPDATE_NUM, &ln, sizeof(ln)); - err |=3D luo_session_setup_outgoing(fdt_out); - err |=3D luo_flb_setup_outgoing(fdt_out); + err |=3D fdt_property(fdt_out, LUO_FDT_ABI_HEADER, &luo_ser_pa, + sizeof(luo_ser_pa)); err |=3D fdt_end_node(fdt_out); err |=3D fdt_finish(fdt_out); if (err) - goto exit_free; + goto exit_free_luo_ser; + + err =3D luo_session_setup_outgoing(&luo_ser->sessions_pa); + if (err) + goto exit_free_luo_ser; + + err =3D luo_flb_setup_outgoing(&luo_ser->flbs_pa); + if (err) + goto exit_free_luo_ser; + + luo_ser->liveupdate_num =3D luo_global.liveupdate_num + 1; =20 err =3D kho_add_subtree(LUO_FDT_KHO_ENTRY_NAME, fdt_out, fdt_totalsize(fdt_out)); if (err) - goto exit_free; + goto exit_free_luo_ser; luo_global.fdt_out =3D fdt_out; =20 return 0; =20 -exit_free: +exit_free_luo_ser: + kho_unpreserve_free(luo_ser); +exit_free_fdt: kho_unpreserve_free(fdt_out); pr_err("failed to prepare LUO FDT: %d\n", err); =20 diff --git a/kernel/liveupdate/luo_flb.c b/kernel/liveupdate/luo_flb.c index 8f5c5dd01cd0..5c27134ce7ba 100644 --- a/kernel/liveupdate/luo_flb.c +++ b/kernel/liveupdate/luo_flb.c @@ -44,13 +44,11 @@ #include #include #include -#include #include #include #include #include #include -#include #include "luo_internal.h" =20 #define LUO_FLB_PGCNT 1ul @@ -551,27 +549,15 @@ int liveupdate_flb_get_outgoing(struct liveupdate_flb= *flb, void **objp) return 0; } =20 -int __init luo_flb_setup_outgoing(void *fdt_out) +int __init luo_flb_setup_outgoing(u64 *flbs_pa) { struct luo_flb_header_ser *header_ser; - u64 header_ser_pa; - int err; =20 header_ser =3D kho_alloc_preserve(LUO_FLB_PGCNT << PAGE_SHIFT); if (IS_ERR(header_ser)) return PTR_ERR(header_ser); =20 - header_ser_pa =3D virt_to_phys(header_ser); - - err =3D fdt_begin_node(fdt_out, LUO_FDT_FLB_NODE_NAME); - err |=3D fdt_property_string(fdt_out, "compatible", - LUO_FDT_FLB_COMPATIBLE); - err |=3D fdt_property(fdt_out, LUO_FDT_FLB_HEADER, &header_ser_pa, - sizeof(header_ser_pa)); - err |=3D fdt_end_node(fdt_out); - - if (err) - goto err_unpreserve; + *flbs_pa =3D virt_to_phys(header_ser); =20 header_ser->pgcnt =3D LUO_FLB_PGCNT; luo_flb_global.outgoing.header_ser =3D header_ser; @@ -579,53 +565,19 @@ int __init luo_flb_setup_outgoing(void *fdt_out) luo_flb_global.outgoing.active =3D true; =20 return 0; - -err_unpreserve: - kho_unpreserve_free(header_ser); - - return err; } =20 -int __init luo_flb_setup_incoming(void *fdt_in) +void __init luo_flb_setup_incoming(u64 flbs_pa) { struct luo_flb_header_ser *header_ser; - int err, header_size, offset; - const void *ptr; - u64 header_ser_pa; - - offset =3D fdt_subnode_offset(fdt_in, 0, LUO_FDT_FLB_NODE_NAME); - if (offset < 0) { - pr_err("Unable to get FLB node [%s]\n", LUO_FDT_FLB_NODE_NAME); - - return -ENOENT; - } - - err =3D fdt_node_check_compatible(fdt_in, offset, - LUO_FDT_FLB_COMPATIBLE); - if (err) { - pr_err("FLB node is incompatible with '%s' [%d]\n", - LUO_FDT_FLB_COMPATIBLE, err); - - return -EINVAL; - } - - header_size =3D 0; - ptr =3D fdt_getprop(fdt_in, offset, LUO_FDT_FLB_HEADER, &header_size); - if (!ptr || header_size !=3D sizeof(u64)) { - pr_err("Unable to get FLB header property '%s' [%d]\n", - LUO_FDT_FLB_HEADER, header_size); =20 - return -EINVAL; - } - - header_ser_pa =3D get_unaligned((u64 *)ptr); - header_ser =3D phys_to_virt(header_ser_pa); + if (!flbs_pa) + return; =20 + header_ser =3D phys_to_virt(flbs_pa); luo_flb_global.incoming.header_ser =3D header_ser; luo_flb_global.incoming.ser =3D (void *)(header_ser + 1); luo_flb_global.incoming.active =3D true; - - return 0; } =20 /** diff --git a/kernel/liveupdate/luo_internal.h b/kernel/liveupdate/luo_inter= nal.h index ae58206f14ac..fe22086bfbeb 100644 --- a/kernel/liveupdate/luo_internal.h +++ b/kernel/liveupdate/luo_internal.h @@ -79,8 +79,8 @@ extern struct rw_semaphore luo_register_rwlock; =20 int luo_session_create(const char *name, struct file **filep); int luo_session_retrieve(const char *name, struct file **filep); -int __init luo_session_setup_outgoing(void *fdt); -int __init luo_session_setup_incoming(void *fdt); +int __init luo_session_setup_outgoing(u64 *sessions_pa); +int __init luo_session_setup_incoming(u64 sessions_pa); int luo_session_serialize(void); int luo_session_deserialize(void); =20 @@ -102,8 +102,8 @@ int luo_flb_file_preserve(struct liveupdate_file_handle= r *fh); void luo_flb_file_unpreserve(struct liveupdate_file_handler *fh); void luo_flb_file_finish(struct liveupdate_file_handler *fh); void luo_flb_unregister_all(struct liveupdate_file_handler *fh); -int __init luo_flb_setup_outgoing(void *fdt); -int __init luo_flb_setup_incoming(void *fdt); +int __init luo_flb_setup_outgoing(u64 *flbs_pa); +void __init luo_flb_setup_incoming(u64 flbs_pa); void luo_flb_serialize(void); =20 #ifdef CONFIG_LIVEUPDATE_TEST diff --git a/kernel/liveupdate/luo_session.c b/kernel/liveupdate/luo_sessio= n.c index 47566db64598..85782c6f3d6c 100644 --- a/kernel/liveupdate/luo_session.c +++ b/kernel/liveupdate/luo_session.c @@ -25,9 +25,8 @@ * * - Serialization: Session metadata is preserved using the KHO framework.= When * a live update is triggered via kexec, an array of `struct luo_session= _ser` - * is populated and placed in a preserved memory region. An FDT node is = also - * created, containing the count of sessions and the physical address of= this - * array. + * is populated and placed in a preserved memory region. The physical ad= dress + * of this array is stored in the centralized `struct luo_ser` structure. * * Session Lifecycle: * @@ -91,13 +90,11 @@ #include #include #include -#include #include #include #include #include #include -#include #include #include "luo_internal.h" =20 @@ -527,75 +524,34 @@ int luo_session_retrieve(const char *name, struct fil= e **filep) return err; } =20 -int __init luo_session_setup_outgoing(void *fdt_out) +int __init luo_session_setup_outgoing(u64 *sessions_pa) { struct luo_session_header_ser *header_ser; - u64 header_ser_pa; - int err; =20 header_ser =3D kho_alloc_preserve(LUO_SESSION_PGCNT << PAGE_SHIFT); if (IS_ERR(header_ser)) return PTR_ERR(header_ser); - header_ser_pa =3D virt_to_phys(header_ser); - - err =3D fdt_begin_node(fdt_out, LUO_FDT_SESSION_NODE_NAME); - err |=3D fdt_property_string(fdt_out, "compatible", - LUO_FDT_SESSION_COMPATIBLE); - err |=3D fdt_property(fdt_out, LUO_FDT_SESSION_HEADER, &header_ser_pa, - sizeof(header_ser_pa)); - err |=3D fdt_end_node(fdt_out); =20 - if (err) - goto err_unpreserve; + *sessions_pa =3D virt_to_phys(header_ser); =20 luo_session_global.outgoing.header_ser =3D header_ser; luo_session_global.outgoing.ser =3D (void *)(header_ser + 1); luo_session_global.outgoing.active =3D true; =20 return 0; - -err_unpreserve: - kho_unpreserve_free(header_ser); - return err; } =20 -int __init luo_session_setup_incoming(void *fdt_in) +int __init luo_session_setup_incoming(u64 sessions_pa) { struct luo_session_header_ser *header_ser; - int err, header_size, offset; - u64 header_ser_pa; - const void *ptr; - - offset =3D fdt_subnode_offset(fdt_in, 0, LUO_FDT_SESSION_NODE_NAME); - if (offset < 0) { - pr_err("Unable to get session node: [%s]\n", - LUO_FDT_SESSION_NODE_NAME); - return -EINVAL; - } =20 - err =3D fdt_node_check_compatible(fdt_in, offset, - LUO_FDT_SESSION_COMPATIBLE); - if (err) { - pr_err("Session node incompatible [%s]\n", - LUO_FDT_SESSION_COMPATIBLE); - return -EINVAL; - } - - header_size =3D 0; - ptr =3D fdt_getprop(fdt_in, offset, LUO_FDT_SESSION_HEADER, &header_size); - if (!ptr || header_size !=3D sizeof(u64)) { - pr_err("Unable to get session header '%s' [%d]\n", - LUO_FDT_SESSION_HEADER, header_size); - return -EINVAL; + if (sessions_pa) { + header_ser =3D phys_to_virt(sessions_pa); + luo_session_global.incoming.header_ser =3D header_ser; + luo_session_global.incoming.ser =3D (void *)(header_ser + 1); + luo_session_global.incoming.active =3D true; } =20 - header_ser_pa =3D get_unaligned((u64 *)ptr); - header_ser =3D phys_to_virt(header_ser_pa); - - luo_session_global.incoming.header_ser =3D header_ser; - luo_session_global.incoming.ser =3D (void *)(header_ser + 1); - luo_session_global.incoming.active =3D true; - return 0; } =20 --=20 2.53.0 From nobody Mon Jun 8 06:38:43 2026 Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C3903F5BD8 for ; Wed, 3 Jun 2026 03:29:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457356; cv=none; b=A9DYNBxg+3DjK5HE7thyJu6BTii+FBwqz3GGfpsrfqRLVPD6MDlVeGhFHaHgEY+QgTIE6U1T0YlWPQ5vCdyFNNFmMLu7YKQwLfVLEFvaiNasg5C1jNq5Kbu2KAli7cTspw3Oq7GU3fs1Z7J1BLdfEyXAi7WUB8yVVTcFsTuqigo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457356; c=relaxed/simple; bh=wbPvJ6zLEMPEBQmI480sC62H/gokkzXNQLojRPu46g4=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P/SY7VsEe61qnnAvELxVfMWANj9wJdAa+vP7dBpHzl7sVKJm7w1DecznAak/n1t5KCkmurpvOVl+eEf+yAfDYATX13mFX1NuVZ6k0ckJ3lhXqeCunOzzQPI0iYYVrloFkX2wwRzJ+S4odaaTiuB0S4czMseocHMxw2DxCApYWaM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b=if1xgr7u; arc=none smtp.client-ip=209.85.219.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="if1xgr7u" Received: by mail-qv1-f51.google.com with SMTP id 6a1803df08f44-8ce9ddeddefso34728506d6.0 for ; Tue, 02 Jun 2026 20:29:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; t=1780457353; x=1781062153; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=6dIvXcFtnsq21AdbL6IuUE0knwOnoW1aNxCP2lCoxdM=; b=if1xgr7uw4OdW+oxyjnzZgledw4qnYGzP17SmhjnK6QE6No915o+40c0p3hyabHh6i 84cPayBjLYTjWxM/dp6GP6X3S/BYbTrmtvTfMYMgjtPCM+/6+dbNF7iRNSDSZErMrCnT He1YcdPB9IOaRVvJLH8VCM6ZHl8cE3SBlpWxPhJ+o86nwMWM6mmx9k9KI48vkeL0s55G QbB/zfc2ivO6OfMayxb/FPtvp1624C8Xp9S6mTkkM1bV2QDAPwdRDhx3Kxvyi55l+XyL Fq1hJrCH0zvdux4tInH7wsIDVhveTbbYN/eTlwQSz9tcBR3AzuZzNqw3iKGc5dLxbWzm tRoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780457353; x=1781062153; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=6dIvXcFtnsq21AdbL6IuUE0knwOnoW1aNxCP2lCoxdM=; b=gO/OGIjdmrvs+2Iqso/Rh6XmRCTPbz40kUeiQqxa2UfxJCdVbaLjO7eH/MGzwRy5Ry IozFEj0gF7Tgvd9E/HAl7icV4JB3CtDkJEEB3tMExT3I+1pVZSsM+9z04El9veWiaexI HRCGzMqgdYkYvUpj9XFgD3rvB72/8ZBR3kuRlmWRHkrv6i+LMQjB/0kV08/5Ey3JHEDt Wwk1LNtCHIKvCLXgwOiOYXk6bnIMKdOT19be0f8wF0GG8WDYdFP9nuynqEkjWrGK3EK/ BEzgTiNkDFiQkt13ovf7IsJUVaUbOgJo0TAlS7PaZ3YF1PXyBOy2CVsrtThD39oGmN+g R1SA== X-Forwarded-Encrypted: i=1; AFNElJ/N+rVWBjKXrw9eYvyFuIHm+dvlDIzxhVqhdZ37jTsAP+R9XOM13LQ+Qz0P+QqXY7nex4kgxe3nOFxgASc=@vger.kernel.org X-Gm-Message-State: AOJu0Ywkb+U/QpnS9XlCCo0U4qQ7ETGJJYiVLaduzqXbEu1UzJ7r9nM3 KliLjJ1/vq8yN5+wLhv4o1HqMd+UyPUGAUHXBpHPCXfrcMdCgOUrVEidOw39J6VKDEI= X-Gm-Gg: Acq92OHV+hXxfh8PTX3ymYxDq2K2ikczpOf4V8sDz71Tp+nW6Is5Jlt6HzNPvtTL0Bt in2+Pw2hkizGoChMOAl23b5r+PSx0pjJdkm8hQkMTvR0XlL541LR7uqXJP3jzSVedWcIj10rK+2 KlC+3OVkK4PveXYx40isamjG+CsYK7xssyKyAKsOcF9XdfynxJ0CA/d+QvEbROykcPFQR59VrOb PZpPZaPU/QcLRNLiDrXkd/pOhQtKY6Lltn0xBn3zpSWmFffdwYhpBa9mCpK0QO8eNBSp5IrcIeK TniNOJDzB5bOmyR01fLwiXue2hJEq24O7yOI2gTlC8nkVrq41nD9r1ZQYLuISxDTr86FJ+bBtg/ Uu2Kuktv2pYWNIzfhvoETsC2bZyU4cor1Onn1FUyPH5CsKfA+d4Qh74rPov+bMw8SxE3LRZ6vr+ PbO0/+HRNCvfBVn1UIXLpzbr6yC/fjv/ePig5Q7fJWMn5crHMeEQZfnvRWHKPGLA== X-Received: by 2002:a05:6214:3d10:b0:8ce:b018:89e1 with SMTP id 6a1803df08f44-8cecdcbfd20mr21165026d6.32.1780457353365; Tue, 02 Jun 2026 20:29:13 -0700 (PDT) Received: from plex ([71.181.43.54]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8cecd26b3b9sm9244566d6.45.2026.06.02.20.29.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 20:29:12 -0700 (PDT) From: Pasha Tatashin To: linux-kselftest@vger.kernel.org, rppt@kernel.org, shuah@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, skhan@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, corbet@lwn.net, pasha.tatashin@soleen.com, dmatlack@google.com, kexec@lists.infradead.org, pratyush@kernel.org, skhawaja@google.com, graf@amazon.com Subject: [PATCH v6 04/13] liveupdate: register luo_ser as KHO subtree Date: Wed, 3 Jun 2026 03:28:55 +0000 Message-ID: <20260603032905.344462-5-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260603032905.344462-1-pasha.tatashin@soleen.com> References: <20260603032905.344462-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Entirely remove the LUO FDT wrapper since the FDT only carries the compatible string and the pointer to the centralized struct luo_ser. Instead, register the struct luo_ser via the KHO raw subtree API, placing the compatibility string inside the structure itself. Signed-off-by: Pasha Tatashin Acked-by: Mike Rapoport (Microsoft) --- include/linux/kho/abi/luo.h | 57 +++++++++--------------- kernel/liveupdate/luo_core.c | 85 +++++++++++------------------------- 2 files changed, 46 insertions(+), 96 deletions(-) diff --git a/include/linux/kho/abi/luo.h b/include/linux/kho/abi/luo.h index 1b2f865a771a..9a4fe491812b 100644 --- a/include/linux/kho/abi/luo.h +++ b/include/linux/kho/abi/luo.h @@ -10,11 +10,11 @@ * * Live Update Orchestrator uses the stable Application Binary Interface * defined below to pass state from a pre-update kernel to a post-update - * kernel. The ABI is built upon the Kexec HandOver framework and uses a - * Flattened Device Tree to describe the preserved data. + * kernel. The ABI is built upon the Kexec HandOver framework and registers + * the central `struct luo_ser` via the KHO raw subtree API. * - * This interface is a contract. Any modification to the FDT structure, no= de - * properties, compatible strings, or the layout of the `__packed` seriali= zation + * This interface is a contract. Any modification to the structure fields, + * compatible strings, or the layout of the `__packed` serialization * structures defined here constitutes a breaking change. Such changes req= uire * incrementing the version number in the relevant `_COMPATIBLE` string to * prevent a new kernel from misinterpreting data from an old kernel. @@ -23,31 +23,15 @@ * however, backward/forward compatibility is only guaranteed for kernels * supporting the same ABI version. * - * FDT Structure Overview: + * KHO Structure Overview: * The entire LUO state is encapsulated within a single KHO entry named = "LUO". - * This entry contains an FDT with the following layout: - * - * .. code-block:: none - * - * / { - * compatible =3D "luo-v2"; - * luo-abi-header =3D ; - * }; - * - * Main LUO Node (/): - * - * - compatible: "luo-v2" - * Identifies the overall LUO ABI version. - * - luo-abi-header: u64 - * The physical address of `struct luo_ser`. + * This entry contains the `struct luo_ser` structure. * * Serialization Structures: - * The FDT properties point to memory regions containing arrays of simpl= e, - * `__packed` structures. These structures contain the actual preserved = state. - * * - struct luo_ser: * The central ABI structure that contains the overall state of the LU= O. - * It includes the liveupdate-number and pointers to sessions and FLBs. + * It includes the compatibility string, the liveupdate-number, and po= inters + * to sessions and FLBs. * * - struct luo_session_header_ser: * Header for the session array. Contains the total page count of the @@ -78,26 +62,27 @@ #ifndef _LINUX_KHO_ABI_LUO_H #define _LINUX_KHO_ABI_LUO_H =20 +#include #include =20 /* - * The LUO FDT hooks all LUO state for sessions, fds, etc. + * The LUO state is registered under this KHO entry name. */ -#define LUO_FDT_SIZE PAGE_SIZE -#define LUO_FDT_KHO_ENTRY_NAME "LUO" -#define LUO_FDT_COMPATIBLE "luo-v2" -#define LUO_FDT_ABI_HEADER "luo-abi-header" +#define LUO_KHO_ENTRY_NAME "LUO" +#define LUO_ABI_COMPATIBLE "luo-v3" +#define LUO_ABI_COMPAT_LEN ALIGN(sizeof(LUO_ABI_COMPATIBLE), 8) =20 /** * struct luo_ser - Centralized LUO ABI header. + * @compatible: Compatibility string identifying the LUO ABI version. * @liveupdate_num: A counter tracking the number of successful live updat= es. * @sessions_pa: Physical address of the first session block header. * @flbs_pa: Physical address of the FLB header. * - * This structure is the root of all preserved LUO state. It is pointed to= by - * the "luo-abi-header" property in the LUO FDT. + * This structure is the root of all preserved LUO state. */ struct luo_ser { + char compatible[LUO_ABI_COMPAT_LEN]; u64 liveupdate_num; u64 sessions_pa; u64 flbs_pa; @@ -111,7 +96,7 @@ struct luo_ser { * @data: Private data * @token: User provided token for this file * - * If this structure is modified, LUO_SESSION_COMPATIBLE must be updated. + * If this structure is modified, `LUO_ABI_COMPATIBLE` must be updated. */ struct luo_file_ser { char compatible[LIVEUPDATE_HNDL_COMPAT_LENGTH]; @@ -142,7 +127,7 @@ struct luo_file_set_ser { * physical memory preserved across the kexec. It provides the necessary * metadata to interpret the array of session entries that follow. * - * If this structure is modified, `LUO_FDT_COMPATIBLE` must be updated. + * If this structure is modified, `LUO_ABI_COMPATIBLE` must be updated. */ struct luo_session_header_ser { u64 count; @@ -159,7 +144,7 @@ struct luo_session_header_ser { * session) is created and passed to the new kernel, allowing it to recons= truct * the session context. * - * If this structure is modified, `LUO_FDT_COMPATIBLE` must be updated. + * If this structure is modified, `LUO_ABI_COMPATIBLE` must be updated. */ struct luo_session_ser { char name[LIVEUPDATE_SESSION_NAME_LENGTH]; @@ -180,7 +165,7 @@ struct luo_session_ser { * This structure is located at the physical address specified by the * flbs_pa in luo_ser. * - * If this structure is modified, `LUO_FDT_COMPATIBLE` must be updated. + * If this structure is modified, `LUO_ABI_COMPATIBLE` must be updated. */ struct luo_flb_header_ser { u64 pgcnt; @@ -202,7 +187,7 @@ struct luo_flb_header_ser { * passed to the new kernel. Each entry allows the LUO core to restore one * global, shared object. * - * If this structure is modified, `LUO_FDT_COMPATIBLE` must be updated. + * If this structure is modified, `LUO_ABI_COMPATIBLE` must be updated. */ struct luo_flb_ser { char name[LIVEUPDATE_FLB_COMPAT_LENGTH]; diff --git a/kernel/liveupdate/luo_core.c b/kernel/liveupdate/luo_core.c index 085c0dfc1ef1..69b00e7d0f8f 100644 --- a/kernel/liveupdate/luo_core.c +++ b/kernel/liveupdate/luo_core.c @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include @@ -67,8 +66,7 @@ =20 static struct { bool enabled; - void *fdt_out; - void *fdt_in; + struct luo_ser *luo_ser_out; u64 liveupdate_num; } luo_global; =20 @@ -85,11 +83,10 @@ early_param("liveupdate", early_liveupdate_param); =20 static int __init luo_early_startup(void) { + phys_addr_t luo_ser_phys; struct luo_ser *luo_ser; - int err, header_size; - phys_addr_t fdt_phys; - const void *ptr; - u64 luo_ser_pa; + size_t len; + int err; =20 if (!kho_is_enabled()) { if (liveupdate_enabled()) @@ -98,40 +95,29 @@ static int __init luo_early_startup(void) return 0; } =20 - /* Retrieve LUO subtree, and verify its format. */ - err =3D kho_retrieve_subtree(LUO_FDT_KHO_ENTRY_NAME, &fdt_phys, NULL); + /* Retrieve LUO state from KHO. */ + err =3D kho_retrieve_subtree(LUO_KHO_ENTRY_NAME, &luo_ser_phys, &len); if (err) { if (err !=3D -ENOENT) { - pr_err("failed to retrieve FDT '%s' from KHO: %pe\n", - LUO_FDT_KHO_ENTRY_NAME, ERR_PTR(err)); + pr_err("failed to retrieve LUO state '%s' from KHO: %pe\n", + LUO_KHO_ENTRY_NAME, ERR_PTR(err)); return err; } =20 return 0; } =20 - luo_global.fdt_in =3D phys_to_virt(fdt_phys); - err =3D fdt_node_check_compatible(luo_global.fdt_in, 0, - LUO_FDT_COMPATIBLE); - if (err) { - pr_err("FDT '%s' is incompatible with '%s' [%d]\n", - LUO_FDT_KHO_ENTRY_NAME, LUO_FDT_COMPATIBLE, err); - + if (len < sizeof(*luo_ser)) { + pr_err("LUO state is too small (%zu < %zu)\n", len, sizeof(*luo_ser)); return -EINVAL; } =20 - header_size =3D 0; - ptr =3D fdt_getprop(luo_global.fdt_in, 0, LUO_FDT_ABI_HEADER, &header_siz= e); - if (!ptr || header_size !=3D sizeof(u64)) { - pr_err("Unable to get ABI header '%s' [%d]\n", - LUO_FDT_ABI_HEADER, header_size); - + luo_ser =3D phys_to_virt(luo_ser_phys); + if (strncmp(luo_ser->compatible, LUO_ABI_COMPATIBLE, LUO_ABI_COMPAT_LEN))= { + pr_err("LUO state is incompatible with '%s'\n", LUO_ABI_COMPATIBLE); return -EINVAL; } =20 - luo_ser_pa =3D get_unaligned((u64 *)ptr); - luo_ser =3D phys_to_virt(luo_ser_pa); - luo_global.liveupdate_num =3D luo_ser->liveupdate_num; pr_info("Retrieved live update data, liveupdate number: %lld\n", luo_global.liveupdate_num); @@ -164,37 +150,20 @@ static int __init liveupdate_early_init(void) } early_initcall(liveupdate_early_init); =20 -/* Called during boot to create outgoing LUO fdt tree */ -static int __init luo_fdt_setup(void) +/* Called during boot to create outgoing LUO state */ +static int __init luo_state_setup(void) { struct luo_ser *luo_ser; - u64 luo_ser_pa; - void *fdt_out; int err; =20 - fdt_out =3D kho_alloc_preserve(LUO_FDT_SIZE); - if (IS_ERR(fdt_out)) { - pr_err("failed to allocate/preserve FDT memory\n"); - return PTR_ERR(fdt_out); - } - luo_ser =3D kho_alloc_preserve(sizeof(*luo_ser)); if (IS_ERR(luo_ser)) { - err =3D PTR_ERR(luo_ser); - goto exit_free_fdt; + pr_err("failed to allocate/preserve LUO state memory\n"); + return PTR_ERR(luo_ser); } - luo_ser_pa =3D virt_to_phys(luo_ser); - - err =3D fdt_create(fdt_out, LUO_FDT_SIZE); - err |=3D fdt_finish_reservemap(fdt_out); - err |=3D fdt_begin_node(fdt_out, ""); - err |=3D fdt_property_string(fdt_out, "compatible", LUO_FDT_COMPATIBLE); - err |=3D fdt_property(fdt_out, LUO_FDT_ABI_HEADER, &luo_ser_pa, - sizeof(luo_ser_pa)); - err |=3D fdt_end_node(fdt_out); - err |=3D fdt_finish(fdt_out); - if (err) - goto exit_free_luo_ser; + + strscpy(luo_ser->compatible, LUO_ABI_COMPATIBLE, sizeof(luo_ser->compatib= le)); + luo_ser->liveupdate_num =3D luo_global.liveupdate_num + 1; =20 err =3D luo_session_setup_outgoing(&luo_ser->sessions_pa); if (err) @@ -204,21 +173,17 @@ static int __init luo_fdt_setup(void) if (err) goto exit_free_luo_ser; =20 - luo_ser->liveupdate_num =3D luo_global.liveupdate_num + 1; - - err =3D kho_add_subtree(LUO_FDT_KHO_ENTRY_NAME, fdt_out, - fdt_totalsize(fdt_out)); + err =3D kho_add_subtree(LUO_KHO_ENTRY_NAME, luo_ser, sizeof(*luo_ser)); if (err) goto exit_free_luo_ser; - luo_global.fdt_out =3D fdt_out; + + luo_global.luo_ser_out =3D luo_ser; =20 return 0; =20 exit_free_luo_ser: kho_unpreserve_free(luo_ser); -exit_free_fdt: - kho_unpreserve_free(fdt_out); - pr_err("failed to prepare LUO FDT: %d\n", err); + pr_err("failed to prepare LUO state: %d\n", err); =20 return err; } @@ -234,7 +199,7 @@ static int __init luo_late_startup(void) if (!liveupdate_enabled()) return 0; =20 - err =3D luo_fdt_setup(); + err =3D luo_state_setup(); if (err) luo_global.enabled =3D false; =20 --=20 2.53.0 From nobody Mon Jun 8 06:38:43 2026 Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 797193F5BFC for ; Wed, 3 Jun 2026 03:29:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457357; cv=none; b=ULY/fpeWk2QNhsn/X1RsFWb6OxIILavORzPYC5sgVo+DjcA/gq6NCHmHF1tnVNc9vngebUkqEWM6iUeYGuoTfDikaRPdVY6OfMmaPp2C2AXjQkRPShCaA7L36udPVNQjUbPN3yKofEz6QYvSRltpaQym31MpX3lAERAXjXBZfAk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457357; c=relaxed/simple; bh=bhQWLj7PPI9UClPVVfb3CJJP1nHiv+tJKCbUyOi+1+A=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XuBBwveaCHmOFzvEzuL+xz6Sufnt6XeJiiHj7UkM4H2548a9U68uK9wyMfAOlux34+iRCif7gH4ejP+L2vp5ARGIbtuFWRKN+U/kRoyEgKDPb7JM/m6F2mtup/rt/ztBj4DjuZCZNCJG+uzBcaqFueNSU30p8Iu7Eiy2nfcLyP0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b=b0UihE1q; arc=none smtp.client-ip=209.85.219.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="b0UihE1q" Received: by mail-qv1-f53.google.com with SMTP id 6a1803df08f44-8cc0ef7c306so159335426d6.3 for ; Tue, 02 Jun 2026 20:29:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; t=1780457354; x=1781062154; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=M0UeBGKKNpBDiXtsHx+XK9ecjuYaKOuvdeJHksP7ylQ=; b=b0UihE1qbydPBT3aAxZax/HNmDv6aVh/BfpF5M6dC/MZAOl0zPU0b7mtwrkgiPUINa faI354ziYU+ZOk5Hu0LwV3ePqC7XGQgwYhI/Vz247YkT2x1xhIaK55Esp+a3dIUyfaE9 rQkgQR3GWxiyMnVxodlg1jaao+k4lWM3HlNIZiK8JAKIG8x3b5Y1Etnz2lBEi+RWimDV WD9fMfzeVvUawywEpwZzOXVaJBduWQtYvtr3H1OMTYIkFysJ3PrEckrVrAtXMuK2sa/j w1ytAYnYMvRJufAdGWI8oJFv6owf0QBWAmsOhdjo7iOuQxPKWKnS0BGiA3ZhsT0ko9x8 PJXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780457354; x=1781062154; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=M0UeBGKKNpBDiXtsHx+XK9ecjuYaKOuvdeJHksP7ylQ=; b=TQ0b43CKPPfco87jpjnMi9kYT1tIqEWKRWfo/6qiBVaYsxAA6mvxFBKpJwNmw9mhS0 Gg7Shp9bNA776+8npe17WhLR9ZXke/EprA7OIw0uDgntLALmWldUed1GFN0TNCdbOhzC SWAEPiy5lvJyLP3uJ2ISgmn28o0S3tkctxfJCZaWUI/rdwNBNs3DE+LBvBxGyarCATti wBQ1HuE2AdlGULYOiAzVz+VqTzpHOmwH4Gi8AcRQ7HGB256nBxDcEaMpZkS/+ttsGOjX gNg8hc+cbGXiTw5Prl/jLRve4U2YLVQDA9q/NG0VGu9Yg3raLmxD/EovDPfDTvyeUGwS qeeA== X-Forwarded-Encrypted: i=1; AFNElJ+aZsvf8CwPVkG468T99VRePjrcKuBWwAYM9SInuR2xvsOQAKyQzGn2WSjrbFhL2pMxjtg50QX8kBTqC4Y=@vger.kernel.org X-Gm-Message-State: AOJu0YweNyhsEgx2fj2Glw95vdEdoZJfulq+yAEU5CNlk03wkRpwKvDS LXhotERhZjwuWdep1V+v9e2ivNrV8nUjq1ZkwS1hwTc/FgY26VQkmLrLa2duagYHeW4= X-Gm-Gg: Acq92OF8io1LIFJwExI6Oh5ktlrCWGhz9+5y+g9YNjIZn29nMgGD7znDOReaxwcvQKd UmgHjVIRPkPPEAj7XInJdNvp067OqUiAVm+jH15pdKDm8N85+EwOg3gw3jgv4s++g765KZ7Fc+3 f5rWUdJrsCmD8t4tEI0qCbhBQRQ6cdreehFDlZS0w/abFtHmZanwE+udrrJdQtiYHGamVnbc9q4 EKU2wEHsn57weuq7fEjRlZZjwK2C0JrCrhhjGDhvmm6V93v7XS31WPxouNDVQeb67KTH+RMdbyG FhmZi9aBRbvgEHiU1MqwWh+V6VNVEYKGlXc7VBZ4RSKOzUe9onEI8FZx6b1296yQuTGcULf0ZXU jMDVJBZcukvghyWyBWPVrLKKbNt3JcKcpm24z5RgyZtegNdKHNAe9fKCWIB+uanFLo1GpJn8GDW e1ok40yvrDA1IQovtXwVx70RbEgji69eCXHNYg93Dii0cJxcc0pFS3U5QCRYL5WQ== X-Received: by 2002:ad4:5be8:0:b0:8ac:b4d5:50ec with SMTP id 6a1803df08f44-8cecdcc5dd2mr23007136d6.38.1780457354509; Tue, 02 Jun 2026 20:29:14 -0700 (PDT) Received: from plex ([71.181.43.54]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8cecd26b3b9sm9244566d6.45.2026.06.02.20.29.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 20:29:14 -0700 (PDT) From: Pasha Tatashin To: linux-kselftest@vger.kernel.org, rppt@kernel.org, shuah@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, skhan@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, corbet@lwn.net, pasha.tatashin@soleen.com, dmatlack@google.com, kexec@lists.infradead.org, pratyush@kernel.org, skhawaja@google.com, graf@amazon.com Subject: [PATCH v6 05/13] liveupdate: Extract luo_file_deserialize_one helper Date: Wed, 3 Jun 2026 03:28:56 +0000 Message-ID: <20260603032905.344462-6-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260603032905.344462-1-pasha.tatashin@soleen.com> References: <20260603032905.344462-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Extract the logic for deserializing single entries for files into separate helper functions. In preparation to a linked-block serialization for files. This is a pure code movement, no other changes intended. Acked-by: Mike Rapoport (Microsoft) Reviewed-by: Pratyush Yadav (Google) Signed-off-by: Pasha Tatashin --- kernel/liveupdate/luo_file.c | 77 ++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/kernel/liveupdate/luo_file.c b/kernel/liveupdate/luo_file.c index 208987502f73..9eec07a9e9fc 100644 --- a/kernel/liveupdate/luo_file.c +++ b/kernel/liveupdate/luo_file.c @@ -753,6 +753,46 @@ int luo_file_finish(struct luo_file_set *file_set) return 0; } =20 +static int luo_file_deserialize_one(struct luo_file_set *file_set, + struct luo_file_ser *ser) +{ + struct liveupdate_file_handler *fh; + bool handler_found =3D false; + struct luo_file *luo_file; + + down_read(&luo_register_rwlock); + list_private_for_each_entry(fh, &luo_file_handler_list, list) { + if (!strcmp(fh->compatible, ser->compatible)) { + if (try_module_get(fh->ops->owner)) + handler_found =3D true; + break; + } + } + up_read(&luo_register_rwlock); + + if (!handler_found) { + pr_warn("No registered handler for compatible '%.*s'\n", + (int)sizeof(ser->compatible), + ser->compatible); + return -ENOENT; + } + + luo_file =3D kzalloc_obj(*luo_file); + if (!luo_file) { + module_put(fh->ops->owner); + return -ENOMEM; + } + + luo_file->fh =3D fh; + luo_file->file =3D NULL; + luo_file->serialized_data =3D ser->data; + luo_file->token =3D ser->token; + mutex_init(&luo_file->mutex); + list_add_tail(&luo_file->list, &file_set->files_list); + + return 0; +} + /** * luo_file_deserialize - Reconstructs the list of preserved files in the = new kernel. * @file_set: The incoming file_set to fill with deserialized data. @@ -782,6 +822,7 @@ int luo_file_deserialize(struct luo_file_set *file_set, struct luo_file_set_ser *file_set_ser) { struct luo_file_ser *file_ser; + int err; u64 i; =20 if (!file_set_ser->files) { @@ -809,39 +850,9 @@ int luo_file_deserialize(struct luo_file_set *file_set, */ file_ser =3D file_set->files; for (i =3D 0; i < file_set->count; i++) { - struct liveupdate_file_handler *fh; - bool handler_found =3D false; - struct luo_file *luo_file; - - down_read(&luo_register_rwlock); - list_private_for_each_entry(fh, &luo_file_handler_list, list) { - if (!strcmp(fh->compatible, file_ser[i].compatible)) { - if (try_module_get(fh->ops->owner)) - handler_found =3D true; - break; - } - } - up_read(&luo_register_rwlock); - - if (!handler_found) { - pr_warn("No registered handler for compatible '%.*s'\n", - (int)sizeof(file_ser[i].compatible), - file_ser[i].compatible); - return -ENOENT; - } - - luo_file =3D kzalloc_obj(*luo_file); - if (!luo_file) { - module_put(fh->ops->owner); - return -ENOMEM; - } - - luo_file->fh =3D fh; - luo_file->file =3D NULL; - luo_file->serialized_data =3D file_ser[i].data; - luo_file->token =3D file_ser[i].token; - mutex_init(&luo_file->mutex); - list_add_tail(&luo_file->list, &file_set->files_list); + err =3D luo_file_deserialize_one(file_set, &file_ser[i]); + if (err) + return err; } =20 return 0; --=20 2.53.0 From nobody Mon Jun 8 06:38:43 2026 Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC0C43F411B for ; Wed, 3 Jun 2026 03:29:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457358; cv=none; b=Nb8bGnnJvjMA6T6bd7PYZLtw8JoRxqa0YMm0fN1Rr3x02MMSaXftOsM5/BlJnraapUZpg30j3yxpnpORFa+84lXIuVHI6gQ+c1r0FgdqF2cQH7EgUpM8icClwPM8VyxO79cFFPHBllk4+OLxJhswA7L9hTFPX7fboif+ZEKY2RQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457358; c=relaxed/simple; bh=FlpNYeZf//1t0Q1W/mmEZOxbLRAkN1/PpE/AQRaykXM=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iL2+8bQC3XAQOD7E18WFvrbfYVNrjVfATLrPgAmjXpi7ewcys2lu5JXoQcja831hRAuMBUYP6eeIr4Bvvpainzijsg+ne8cMS0iL6K4xEhhpWrHSHSe9FaNuKbzCdBV6AvAt1QHMTPWg2H5jkwhHk0oAoC89YlLtC0KnFYONVgU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b=bebspVmA; arc=none smtp.client-ip=209.85.160.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="bebspVmA" Received: by mail-qt1-f177.google.com with SMTP id d75a77b69052e-5175cb5946dso17206141cf.0 for ; Tue, 02 Jun 2026 20:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; t=1780457356; x=1781062156; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=QfziVgpqRfO53l/kiKYNLloUUY6f9C5CrjqJQDvl8iE=; b=bebspVmAznl06IYs0jzgCrNjFdT8fCHv6nTAogr41a5XDLXtiUt/5WFIW3qSdyvzxx 4bocL2l45EFZ9YqD/Fo/BlrcB3R2R1uefBnRMrYiO6R9CvuXPwqDKk9dlzNEq0Jcd8WP G/L/pEzDE88CwMMX8HNti4hVFY4C2PXs7n1ohqTtKVVSsE8YMSswVwElBnEOsNnwwrfs et/W4aY0IUOQGhULAkDpoR3YAME92CIab/rFVHCBSJYyzoKLyA5U2B/FXdlvpWr3NBcy VR2yZMqFLKn/K56mHZaDFqddXHwi/DFm/hNZoY86SVeypjuHzIKTllLwa4IFSuSTB2KR KKRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780457356; x=1781062156; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=QfziVgpqRfO53l/kiKYNLloUUY6f9C5CrjqJQDvl8iE=; b=lLzDWyZVXQj5qrB+TWUvjYuTENiT8fXA1HtB1l8ntlJsuFAiYXh7rJEW1wUieFVAwi OSE1JmbavnWHiAfemn4L2EIDFt+N87bFFReVM9MYPYwGRzZOQpuHTjCGLKSttIEXxYt4 XEYO9C7Nx7QwDik5yxbNKwull0DSWGwFpQXG3HVh10wQ8ACvW74lK+HLiTq2zsFsuWW4 OQKkkSCKVpAODKofOf+1BkaPo9GtES7KIJW4BkIg8AKtQh7sw7kdlLVV8VrguBGafraO ltAyw7TiN/KK5IUnNjE4WJ0zjcDmSC/XBKA1xaVugxloG3mo3KvcNU6njPRFTwrpKFZN AW5Q== X-Forwarded-Encrypted: i=1; AFNElJ83cxafS95ehhHTuBMFsV8m/TlhdfV2sPyEwU431ylNSl4ixcBicZACYkN4ZVZw1sENAw8iL2M17/TQvYc=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5wuUo77T1RHeKadTIsciyrgPGlI0bbnxooIFCb+OtVU1BvMNz /4oF6Wl6C9W/XJZ+RW7e8bWKVe9MjkSXMbvZPkm8TbBKLNBE0t3ijxKr/ImuuobnAu4= X-Gm-Gg: Acq92OGSBT6O6QnXkYEO/pAqDdpMbHw0JvMiDk2ncNxIbVkBwuW0+9DWKpBSvFLSXzn jhBWzbBYaVtOz5kVN1aifTgocRRjBuPg0coySnCJ+EEbdVTxxl5T2lCMuGRwxz5dguV+HbKYiLa WoC1Qa2odhhmc+lXXariFCFP0Zqu7c3T0a4NzC7vlnjoeRwCiow7QHF4De8ZwG6LY+GNSf9pdrE dE6bOMlF8iikwhPnIAD6TnhCeAEEyg/+tmqMpAFmoUjJHKPkRV7/YwBlucnFCQhFJtFZTsYFDtL a05bvosgholvd8bIrrn3ngkN1ZOCSvayTwdJ9H2gr+8xkf2sT95XgpUNxpWmwb1Ea8Pr0hXjTvf d/3d4WQcXvRL/aG/iKFEOhppfjITBPtF2VUYJxvLvBKk2p9+6mCATz4yy5dP0BiMYuh5rJnKkis 57Awq8ABjFdH0mU/8zv/Pl63iMy1U5qti1RIth+8K1F4MQSYuDF/WnJ5qa/zCKrA== X-Received: by 2002:a05:622a:1c19:b0:516:cfb9:2856 with SMTP id d75a77b69052e-51778683f95mr26668491cf.31.1780457355655; Tue, 02 Jun 2026 20:29:15 -0700 (PDT) Received: from plex ([71.181.43.54]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8cecd26b3b9sm9244566d6.45.2026.06.02.20.29.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 20:29:15 -0700 (PDT) From: Pasha Tatashin To: linux-kselftest@vger.kernel.org, rppt@kernel.org, shuah@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, skhan@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, corbet@lwn.net, pasha.tatashin@soleen.com, dmatlack@google.com, kexec@lists.infradead.org, pratyush@kernel.org, skhawaja@google.com, graf@amazon.com Subject: [PATCH v6 06/13] liveupdate: Extract luo_session_deserialize_one helper Date: Wed, 3 Jun 2026 03:28:57 +0000 Message-ID: <20260603032905.344462-7-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260603032905.344462-1-pasha.tatashin@soleen.com> References: <20260603032905.344462-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Extract the logic for deserializing single entries for sessions into separate helper functions. In preparation to a linked-block serialization for sessions. This is a pure code movement, no other changes intended. Acked-by: Mike Rapoport (Microsoft) Reviewed-by: Pratyush Yadav (Google) Signed-off-by: Pasha Tatashin --- kernel/liveupdate/luo_session.c | 63 +++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/kernel/liveupdate/luo_session.c b/kernel/liveupdate/luo_sessio= n.c index 85782c6f3d6c..1cd315e0f6de 100644 --- a/kernel/liveupdate/luo_session.c +++ b/kernel/liveupdate/luo_session.c @@ -555,6 +555,40 @@ int __init luo_session_setup_incoming(u64 sessions_pa) return 0; } =20 +static int luo_session_deserialize_one(struct luo_session_header *sh, + struct luo_session_ser *ser) +{ + struct luo_session *session; + int err; + + session =3D luo_session_alloc(ser->name); + if (IS_ERR(session)) { + pr_warn("Failed to allocate session [%.*s] during deserialization %pe\n", + (int)sizeof(ser->name), ser->name, session); + return PTR_ERR(session); + } + + err =3D luo_session_insert(sh, session); + if (err) { + pr_warn("Failed to insert session [%s] %pe\n", + session->name, ERR_PTR(err)); + luo_session_free(session); + return err; + } + + scoped_guard(mutex, &session->mutex) { + err =3D luo_file_deserialize(&session->file_set, + &ser->file_set_ser); + } + if (err) { + pr_warn("Failed to deserialize files for session [%s] %pe\n", + session->name, ERR_PTR(err)); + return err; + } + + return 0; +} + int luo_session_deserialize(void) { struct luo_session_header *sh =3D &luo_session_global.incoming; @@ -586,34 +620,9 @@ int luo_session_deserialize(void) * reliably reset devices and reclaim memory. */ for (int i =3D 0; i < sh->header_ser->count; i++) { - struct luo_session *session; - - session =3D luo_session_alloc(sh->ser[i].name); - if (IS_ERR(session)) { - pr_warn("Failed to allocate session [%.*s] during deserialization %pe\n= ", - (int)sizeof(sh->ser[i].name), - sh->ser[i].name, session); - err =3D PTR_ERR(session); - goto save_err; - } - - err =3D luo_session_insert(sh, session); - if (err) { - pr_warn("Failed to insert session [%s] %pe\n", - session->name, ERR_PTR(err)); - luo_session_free(session); - goto save_err; - } - - scoped_guard(mutex, &session->mutex) { - err =3D luo_file_deserialize(&session->file_set, - &sh->ser[i].file_set_ser); - } - if (err) { - pr_warn("Failed to deserialize files for session [%s] %pe\n", - session->name, ERR_PTR(err)); + err =3D luo_session_deserialize_one(sh, &sh->ser[i]); + if (err) goto save_err; - } } =20 kho_restore_free(sh->header_ser); --=20 2.53.0 From nobody Mon Jun 8 06:38:43 2026 Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EBB0C3F787C for ; Wed, 3 Jun 2026 03:29:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457362; cv=none; b=dg0bSsrCQqGebuEH/3q0wJJazDIVSMBZQIzzyTBtP1OTi5Y0ZPS2mUn1scshEQ0hTrmcd2WCsxNZ80ymzJtop79ZUTun+dlzQhwkpKFkwgXX4qOs7AJJcUOKthG7c+i4dmHQYzzSo/h/SvDxa18WqJ+UZ4/j37pr2ap6JgPH5FM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457362; c=relaxed/simple; bh=X8O2xGSxVUU/uhSS620e6JMm9XpjobUa1luaKPnuR1I=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tp4Ve634jZ5X4DaCnd+70rqSUICHXLTgwI80nkMLR/o89uzUjgSsho+HRR3jLd1hGGs9/VIZ3Sd+G8m2jdzRyQT7M8GfpvaQxCi258BSwmXZp/FhStE22iOxCX6spKdo5o07L//DIfsd6p9GvX07aWL4a7VvWZN1ASrB+d0UtJ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b=itDUNNR+; arc=none smtp.client-ip=209.85.219.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="itDUNNR+" Received: by mail-qv1-f53.google.com with SMTP id 6a1803df08f44-8cceb2ecc03so33459596d6.3 for ; Tue, 02 Jun 2026 20:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; t=1780457357; x=1781062157; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=/+goXyLuH/FqZHKbCrnKG3Jp0DPoER679XEYr9/CPoc=; b=itDUNNR+xgnDTCDB0nfAv6EXkf+CeEVbo//FtfsW+dbF8Xl81GTM0Em2eaG/JTEwoe fH9WpJqg2fIOUZwy/fv8WxCEebML8M65QQEGmS6ctakx7ObDoTtXYZ5SeE4RE1tYct7g WK60MHuXzaPsFSk7wUfawULh+PCjfF3B73CE0t9fkkxbthVVi9ipbMuqDgs+0TdkLMoW +zspFMiB4ms3PLbMkHBsdJpYpP+tQV2tWNY9JxlYFqPyGDZBUFhRXVdgLmFz/mD74TMU 6k4q04+nFPxIPFB65r+WhPW3S3CEF7zZiIn+jXcIR1EtKfyURGZFacaaCY2JncMCSqgo sP7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780457357; x=1781062157; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=/+goXyLuH/FqZHKbCrnKG3Jp0DPoER679XEYr9/CPoc=; b=oRPTPRvv4OLqfqDpgt4tQWUrIum4D0reESvmt1aIYFkNgUZwoZ5hUJVR2IfP47wPDU uVA+Y5X3dmHgEDmqfMGZmb+Afrr2EMotEkK9Q9cnJDGjeqh08V7MCLhBfqAJMGpH4VMa lduBGrNEq/92+qV5mqhjF2RsYzypYZLpP5JG2OUCAZvaxeW6L2Cidqqx4qXSd0HDE+O3 WyV9LidLqtNBXTjisl7y11ZOyHTdUvyBYj29wIIqOF7gwnXSDz1z6GBcSRTEE7w+gnOy HCoSH3E4XdjF1AUyBdZXIgIl4S9B0WII6I6QLrKaGcmhMvacIsQ+NckCSXDl7IXdSoKW LYGw== X-Forwarded-Encrypted: i=1; AFNElJ/IHo+wKEgcdsmQq+AymNgIRljzbW5DvZXLMCfL3Lm9r1SD/UXKwK/f7nO4kIQPJXiXGjsDobvxR4dodg0=@vger.kernel.org X-Gm-Message-State: AOJu0YyFos/+z6o7urfLd6pZ8Maecy77O+6NeOmG/mY1qYx5v/i87IFS dwP/USaPmtv6L/gfe/mDNfc7WoVTpJlYIbUXYqAXwuNLFFy7mcGW54qWb0L3u1sSCfM= X-Gm-Gg: Acq92OElvuL3Pmea/uqAdEKTXM7tQQnzksfbBJahJb4Cj7GdhjJO5w24KVyxx1skNRY VlP6bbxOMae1XzlDcWEty+GGom/Aj1pI1gAIsGuDmMSGygbF7RSq4eDwOv2Hhr3p2ia+ZZRX4pX Y6YzAc/FuYLuDAbfMvAMbjdaPva9rXb1Vyrd4Vh9tpklRrFUnrbGGwH5p6OYTqZWeMu4yf2MSe4 Sn0XGG2IaAM7Pxp42zTuQToidM+aTnO1dXiItfmvuY7tqUFi+YWYfGHTw41SW5927WsRiuWJYns CcvI+uFuWNUannImGPvmKW9tDcvSLJ/OTcm9Fhs9ef/IDoqlnmJGQqjNyN+jW26m2Qz2tP3GcT7 HyvxxhMbeMKmq2YTXIGwhdcnI++tsCPSK8vGeikc8GK5osiNEGG8sxbLDOwa9w2D/7emGLVyFTv 4SctxvIOSuvldNvn55UZvSTmBOnCf5jbZLnnTo7w6vlAvqxnqGiirGhkbZbM/F1g== X-Received: by 2002:a05:6214:5708:b0:8cc:ed49:bdd0 with SMTP id 6a1803df08f44-8cecdcd11c4mr25000596d6.22.1780457356873; Tue, 02 Jun 2026 20:29:16 -0700 (PDT) Received: from plex ([71.181.43.54]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8cecd26b3b9sm9244566d6.45.2026.06.02.20.29.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 20:29:16 -0700 (PDT) From: Pasha Tatashin To: linux-kselftest@vger.kernel.org, rppt@kernel.org, shuah@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, skhan@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, corbet@lwn.net, pasha.tatashin@soleen.com, dmatlack@google.com, kexec@lists.infradead.org, pratyush@kernel.org, skhawaja@google.com, graf@amazon.com Subject: [PATCH v6 07/13] kho: add support for linked-block serialization Date: Wed, 3 Jun 2026 03:28:58 +0000 Message-ID: <20260603032905.344462-8-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260603032905.344462-1-pasha.tatashin@soleen.com> References: <20260603032905.344462-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce a linked-block serialization mechanism for state handover. Previously, LUO used contiguous memory blocks for serializing sessions and files, which imposed limits on the total number of items that could be preserved across a live update. This commit adds the infrastructure for a more flexible, block-based approach where serialized data is stored in a chain of linked blocks. This is a generic KHO serialization block infrastructure that can be used by multiple subsystems. Signed-off-by: Pasha Tatashin --- Documentation/core-api/kho/abi.rst | 5 + Documentation/core-api/kho/index.rst | 11 + MAINTAINERS | 1 + include/linux/kho/abi/block.h | 56 ++++ include/linux/kho_block.h | 106 +++++++ kernel/liveupdate/Makefile | 1 + kernel/liveupdate/kho_block.c | 411 +++++++++++++++++++++++++++ 7 files changed, 591 insertions(+) create mode 100644 include/linux/kho/abi/block.h create mode 100644 include/linux/kho_block.h create mode 100644 kernel/liveupdate/kho_block.c diff --git a/Documentation/core-api/kho/abi.rst b/Documentation/core-api/kh= o/abi.rst index 799d743105a6..edeb5b311963 100644 --- a/Documentation/core-api/kho/abi.rst +++ b/Documentation/core-api/kho/abi.rst @@ -28,6 +28,11 @@ KHO persistent memory tracker ABI .. kernel-doc:: include/linux/kho/abi/kexec_handover.h :doc: KHO persistent memory tracker =20 +KHO serialization block ABI +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D + +.. kernel-doc:: include/linux/kho/abi/block.h + See Also =3D=3D=3D=3D=3D=3D=3D=3D =20 diff --git a/Documentation/core-api/kho/index.rst b/Documentation/core-api/= kho/index.rst index 0a2dee4f8e7d..320914a42178 100644 --- a/Documentation/core-api/kho/index.rst +++ b/Documentation/core-api/kho/index.rst @@ -83,6 +83,17 @@ Public API .. kernel-doc:: kernel/liveupdate/kexec_handover.c :export: =20 +KHO Serialization Blocks API +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D + +.. kernel-doc:: kernel/liveupdate/kho_block.c + :doc: KHO Serialization Blocks + +.. kernel-doc:: include/linux/kho_block.h + +.. kernel-doc:: kernel/liveupdate/kho_block.c + :internal: + See Also =3D=3D=3D=3D=3D=3D=3D=3D =20 diff --git a/MAINTAINERS b/MAINTAINERS index 9ec290e38b44..920ba7622afa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14208,6 +14208,7 @@ F: Documentation/admin-guide/mm/kho.rst F: Documentation/core-api/kho/* F: include/linux/kexec_handover.h F: include/linux/kho/ +F: include/linux/kho_block.h F: kernel/liveupdate/kexec_handover* F: lib/test_kho.c F: tools/testing/selftests/kho/ diff --git a/include/linux/kho/abi/block.h b/include/linux/kho/abi/block.h new file mode 100644 index 000000000000..8641c20b379b --- /dev/null +++ b/include/linux/kho/abi/block.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (c) 2026, Google LLC. + * Pasha Tatashin + */ + +/** + * DOC: KHO Serialization Blocks ABI + * + * Subsystems using the KHO Serialization Blocks framework rely on the sta= ble + * Application Binary Interface defined below to pass serialized state fro= m a + * pre-update kernel to a post-update kernel. + * + * This interface is a contract. Any modification to the structure fields, + * compatible strings, or the layout of the `__packed` serialization + * structures defined here constitutes a breaking change. Such changes req= uire + * incrementing the version number in the `KHO_BLOCK_ABI_COMPATIBLE` strin= g to + * prevent a new kernel from misinterpreting data from an old kernel. + * + * Changes are allowed provided the compatibility version is incremented; + * however, backward/forward compatibility is only guaranteed for kernels + * supporting the same ABI version. + */ + +#ifndef _LINUX_KHO_ABI_BLOCK_H +#define _LINUX_KHO_ABI_BLOCK_H + +#include +#include + +#define KHO_BLOCK_ABI_COMPATIBLE "kho-block-v1" + +/** + * KHO_BLOCK_SIZE - The size of each serialization block. + * + * This is defined as PAGE_SIZE. PAGE_SIZE is ABI compliant because live + * update between kernels with different page sizes is not supported by KH= O. + */ +#define KHO_BLOCK_SIZE PAGE_SIZE + +/** + * struct kho_block_header_ser - Header for the serialized data block. + * @next: Physical address of the next struct kho_block_header_ser. + * @count: The number of entries that immediately follow this header in the + * memory block. + * + * This structure is located at the beginning of a block of physical memory + * preserved across a kexec. It provides the necessary metadata to interpr= et + * the array of entries that follow. + */ +struct kho_block_header_ser { + u64 next; + u64 count; +} __packed; + +#endif /* _LINUX_KHO_ABI_BLOCK_H */ diff --git a/include/linux/kho_block.h b/include/linux/kho_block.h new file mode 100644 index 000000000000..93a7cc2be5f5 --- /dev/null +++ b/include/linux/kho_block.h @@ -0,0 +1,106 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (c) 2026, Google LLC. + * Pasha Tatashin + */ + +#ifndef _LINUX_KHO_BLOCK_H +#define _LINUX_KHO_BLOCK_H + +#include +#include +#include + +/** + * struct kho_block - Internal representation of a serialization block. + * @list: List head for linking blocks in memory. + * @ser: Pointer to the serialized header in preserved memory. + */ +struct kho_block { + struct list_head list; + struct kho_block_header_ser *ser; +}; + +/** + * struct kho_block_set - A set of blocks containing serialized entries of= the same type. + * @blocks: The list of serialization blocks (struct kho_block). + * @nblocks: The number of allocated serialization blocks. + * @head_pa: Physical address of the first block header. + * @entry_size: The size of each entry in the blocks. + * @count_per_block: The maximum number of entries each block can hold. + * @incoming: True if this block set was restored from the previous= kernel. + * + * Note: Synchronization and locking are the responsibility of the caller. + * The block set structure itself is not internally synchronized. + */ +struct kho_block_set { + struct list_head blocks; + long nblocks; + u64 head_pa; + size_t entry_size; + u64 count_per_block; + bool incoming; +}; + +/** + * struct kho_block_set_it - Iterator for serializing entries into blocks. + * @bs: The block set being iterated. + * @block: The current block. + * @i: The current entry index within @block. + */ +struct kho_block_set_it { + struct kho_block_set *bs; + struct kho_block *block; + u64 i; +}; + +/** + * KHO_BLOCK_SET_INIT - Initialize a static kho_block_set. + * @_name: Name of the kho_block_set variable. + * @_entry_size: The size of each entry in the block set. + */ +#define KHO_BLOCK_SET_INIT(_name, _entry_size) { \ + .blocks =3D LIST_HEAD_INIT((_name).blocks), \ + .entry_size =3D _entry_size, \ + .count_per_block =3D (KHO_BLOCK_SIZE - \ + sizeof(struct kho_block_header_ser)) / \ + (_entry_size), \ +} + +void kho_block_set_init(struct kho_block_set *bs, size_t entry_size); + +int kho_block_set_grow(struct kho_block_set *bs, u64 count); +void kho_block_set_shrink(struct kho_block_set *bs, u64 count); + +int kho_block_set_restore(struct kho_block_set *bs, u64 head_pa); +void kho_block_set_destroy(struct kho_block_set *bs); +void kho_block_set_clear(struct kho_block_set *bs); + +/** + * kho_block_set_head_pa - Get the physical address of the first block hea= der. + * @bs: The block set. + * + * Return: The physical address of the first block header, or 0 if empty. + */ +static inline u64 kho_block_set_head_pa(struct kho_block_set *bs) +{ + return bs->head_pa; +} + +/** + * kho_block_set_is_empty - Check if the block set has no allocated blocks. + * @bs: The block set. + * + * Return: True if there are no blocks in the set, false otherwise. + */ +static inline bool kho_block_set_is_empty(struct kho_block_set *bs) +{ + return list_empty(&bs->blocks); +} + +void kho_block_set_it_init(struct kho_block_set_it *it, struct kho_block_s= et *bs); +void *kho_block_set_it_reserve_entry(struct kho_block_set_it *it); +void *kho_block_set_it_read_entry(struct kho_block_set_it *it); +void *kho_block_set_it_prev(struct kho_block_set_it *it); + +#endif /* _LINUX_KHO_BLOCK_H */ diff --git a/kernel/liveupdate/Makefile b/kernel/liveupdate/Makefile index d2f779cbe279..eec9d3ae07eb 100644 --- a/kernel/liveupdate/Makefile +++ b/kernel/liveupdate/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 =20 luo-y :=3D \ + kho_block.o \ luo_core.o \ luo_file.o \ luo_flb.o \ diff --git a/kernel/liveupdate/kho_block.c b/kernel/liveupdate/kho_block.c new file mode 100644 index 000000000000..4f147c308e6b --- /dev/null +++ b/kernel/liveupdate/kho_block.c @@ -0,0 +1,411 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* + * Copyright (c) 2026, Google LLC. + * Pasha Tatashin + */ + +/** + * DOC: KHO Serialization Blocks + * + * KHO provides a mechanism to preserve stateful data across a kexec hando= ver + * by serializing it into memory blocks, and provides the common + * infrastructure for managing these blocks. + * + * Each block consists of a header (struct kho_block_header_ser) followed = by an + * array of serialized entries. Multiple blocks are linked together via a + * physical pointer in the header, forming a linked list that can be easily + * traversed in both the current and the next kernel. + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include +#include +#include +#include +#include + +/* + * Safeguard limit for the number of serialization blocks. This is used to + * prevent infinite loops and excessive memory allocation in case of memory + * corruption in the preserved state. + * + * With a 4KB page size, 10k blocks is about 40MB. For 32-byte entries + * (e.g. 4 u64s), each block holds up to 127 entries (accounting for the + * 16-byte header), allowing the block set to hold up to 1.27M entries. + */ +#define KHO_MAX_BLOCKS 10000 + +/** + * kho_block_set_init - Initialize a block set. + * @bs: The block set to initialize. + * @entry_size: The size of each entry in the blocks. + */ +void kho_block_set_init(struct kho_block_set *bs, size_t entry_size) +{ + *bs =3D (struct kho_block_set)KHO_BLOCK_SET_INIT(*bs, entry_size); + WARN_ON_ONCE(!bs->count_per_block); +} + +/* Serialized entries start immediately after the block header */ +static void *kho_block_entries(struct kho_block *block) +{ + return (void *)(block->ser + 1); +} + +/* Get the address of the serialized entry at the specified index */ +static void *kho_block_entry(struct kho_block_set_it *it, u64 index) +{ + return kho_block_entries(it->block) + (index * it->bs->entry_size); +} + +/* Free serialized data */ +static void kho_block_free_ser(struct kho_block_set *bs, + struct kho_block_header_ser *ser) +{ + if (bs->incoming) + kho_restore_free(ser); + else + kho_unpreserve_free(ser); +} + +static struct kho_block_header_ser *kho_block_alloc_ser(struct kho_block_s= et *bs) +{ + WARN_ON_ONCE(bs->incoming); + return kho_alloc_preserve(KHO_BLOCK_SIZE); +} + +static int kho_block_add(struct kho_block_set *bs, + struct kho_block_header_ser *ser) +{ + struct kho_block *block, *last; + + if (bs->nblocks >=3D KHO_MAX_BLOCKS) + return -ENOSPC; + + block =3D kzalloc_obj(*block); + if (!block) + return -ENOMEM; + + block->ser =3D ser; + last =3D list_last_entry_or_null(&bs->blocks, struct kho_block, list); + list_add_tail(&block->list, &bs->blocks); + bs->nblocks++; + + if (last) + last->ser->next =3D virt_to_phys(ser); + else + bs->head_pa =3D virt_to_phys(ser); + + return 0; +} + +static int kho_block_set_grow_one(struct kho_block_set *bs) +{ + struct kho_block_header_ser *ser; + int err; + + ser =3D kho_block_alloc_ser(bs); + if (IS_ERR(ser)) + return PTR_ERR(ser); + + err =3D kho_block_add(bs, ser); + if (err) { + kho_block_free_ser(bs, ser); + return err; + } + + return 0; +} + +/** + * kho_block_set_grow - Expand the block set to accommodate the target cou= nt. + * @bs: The block set. + * @count: The target number of valid entries to accommodate. + * + * Acts as a runtime notifier when new resources (such as files or session= s) + * are registered. Dynamically preallocates and links preserved memory blo= cks + * if the target entry count exceeds the current total capacity of the set, + * ensuring they are available during serialization/deserialization. + * + * Context: Caller must hold a lock protecting the block set. + * Return: 0 on success, or a negative errno on failure. + */ +int kho_block_set_grow(struct kho_block_set *bs, u64 count) +{ + if (WARN_ON_ONCE(bs->incoming)) + return -EINVAL; + + while (count > bs->nblocks * bs->count_per_block) { + int err =3D kho_block_set_grow_one(bs); + + if (err) + return err; + } + + return 0; +} + +static void kho_block_set_shrink_one(struct kho_block_set *bs) +{ + struct kho_block *last, *new_last; + + if (list_empty(&bs->blocks)) + return; + + last =3D list_last_entry(&bs->blocks, struct kho_block, list); + list_del(&last->list); + bs->nblocks--; + kho_block_free_ser(bs, last->ser); + kfree(last); + + new_last =3D list_last_entry_or_null(&bs->blocks, struct kho_block, list); + if (new_last) + new_last->ser->next =3D 0; + else + bs->head_pa =3D 0; +} + +/** + * kho_block_set_shrink - Shrink the block set to accommodate the target c= ount. + * @bs: The block set. + * @count: The target number of valid entries to accommodate. + * + * Acts as a runtime notifier when resources (such as files or sessions) a= re + * unregistered, allowing the block set to release and unallocate redundant + * preserved memory blocks. Checks if the last block in the set can be rem= oved + * because the remaining entry count is fully accommodated by the precedin= g blocks. + * + * Note: It is the caller's responsibility to ensure that entries are remo= ved + * in LIFO (last-in, first-out) order (the reverse order of their insertio= n). + * Because shrinking destroys the last block in the set, removing entries = in + * any other order would corrupt active data. + * + * Context: Caller must hold a lock protecting the block set. + */ +void kho_block_set_shrink(struct kho_block_set *bs, u64 count) +{ + while (bs->nblocks > 0 && count <=3D (bs->nblocks - 1) * bs->count_per_bl= ock) + kho_block_set_shrink_one(bs); +} + +/* + * kho_block_set_is_cyclic - Check for cycles in a linked list of blocks. + * Uses Floyd's cycle-finding algorithm to ensure sanity of the incoming l= ist. + * + * Return: true if a cycle or corruption is detected, false otherwise. + */ +static bool kho_block_set_is_cyclic(struct kho_block_set *bs) +{ + struct kho_block_header_ser *fast; + struct kho_block_header_ser *slow; + int count =3D 0; + + fast =3D phys_to_virt(bs->head_pa); + slow =3D fast; + + while (fast) { + if (count++ >=3D KHO_MAX_BLOCKS) { + pr_err("Block set is corrupted\n"); + return true; + } + + if (!fast->next) + break; + + fast =3D phys_to_virt(fast->next); + if (!fast->next) + break; + + fast =3D phys_to_virt(fast->next); + slow =3D phys_to_virt(slow->next); + + if (slow =3D=3D fast) { + pr_err("Block set is corrupted\n"); + return true; + } + } + + return false; +} + +/** + * kho_block_set_restore - Restore a block set from a physical address. + * @bs: The block set to restore. + * @head_pa: Physical address of the first block header. + * + * Restores a serialized block set from a given physical address. The call= er is + * responsible for ensuring that the block set @bs has been allocated and + * initialized prior to calling this function. + * + * Return: 0 on success, or a negative errno on failure. + */ +int kho_block_set_restore(struct kho_block_set *bs, u64 head_pa) +{ + struct kho_block_header_ser *ser; + u64 next_pa =3D head_pa; + int err; + + /* Restored block sets use size from the previous kernel */ + bs->incoming =3D true; + if (!head_pa) + return 0; + + bs->head_pa =3D head_pa; + if (kho_block_set_is_cyclic(bs)) { + bs->head_pa =3D 0; + return -EINVAL; + } + + while (next_pa) { + ser =3D phys_to_virt(next_pa); + if (!ser->count || ser->count > bs->count_per_block) { + pr_warn("Block contains invalid entry count: %llu\n", + ser->count); + err =3D -EINVAL; + goto err_destroy; + } + err =3D kho_block_add(bs, ser); + if (err) + goto err_destroy; + next_pa =3D ser->next; + } + + return 0; + +err_destroy: + kho_block_set_destroy(bs); + + /* Free the remaining un-restored blocks in the physical chain */ + while (next_pa) { + struct kho_block_header_ser *next_ser =3D phys_to_virt(next_pa); + + next_pa =3D next_ser->next; + kho_block_free_ser(bs, next_ser); + } + return err; +} + +/** + * kho_block_set_destroy - Destroy all blocks in a block set. + * @bs: The block set. + */ +void kho_block_set_destroy(struct kho_block_set *bs) +{ + struct kho_block *block, *tmp; + + list_for_each_entry_safe(block, tmp, &bs->blocks, list) { + list_del(&block->list); + kho_block_free_ser(bs, block->ser); + kfree(block); + } + bs->nblocks =3D 0; + bs->head_pa =3D 0; +} + +/** + * kho_block_set_clear - Clear all serialized data in a block set. + * @bs: The block set to clear. + */ +void kho_block_set_clear(struct kho_block_set *bs) +{ + struct kho_block *block; + + list_for_each_entry(block, &bs->blocks, list) { + block->ser->count =3D 0; + memset(block->ser + 1, 0, KHO_BLOCK_SIZE - sizeof(*block->ser)); + } +} + +/** + * kho_block_set_it_init - Initialize a block set iterator. + * @it: The iterator to initialize. + * @bs: The block set to iterate over. + */ +void kho_block_set_it_init(struct kho_block_set_it *it, struct kho_block_s= et *bs) +{ + it->bs =3D bs; + it->block =3D list_first_entry_or_null(&bs->blocks, struct kho_block, lis= t); + it->i =3D 0; +} + +/** + * kho_block_set_it_reserve_entry - Reserve and return the next available = slot for writing. + * @it: The block iterator. + * + * Reserves a slot in the current block during state serialization to add = a new + * entry, advancing the internal index. If the current block is full, it + * automatically moves to the next block in the set. + * + * Return: A pointer to the reserved entry slot, or NULL if the block set's + * capacity is fully exhausted. + */ +void *kho_block_set_it_reserve_entry(struct kho_block_set_it *it) +{ + void *entry; + + if (!it->block) + return NULL; + + if (it->i =3D=3D it->bs->count_per_block) { + if (list_is_last(&it->block->list, &it->bs->blocks)) + return NULL; + it->block =3D list_next_entry(it->block, list); + it->i =3D 0; + } + + entry =3D kho_block_entry(it, it->i++); + it->block->ser->count =3D it->i; + return entry; +} + +/** + * kho_block_set_it_read_entry - Read the next serialized entry from the b= lock set. + * @it: The block iterator. + * + * Iterates through previously written entries during state deserializatio= n, + * respecting the actual count stored in each block's header. + * + * Return: A pointer to the next serialized entry, or NULL if all serializ= ed + * entries have been read. + */ +void *kho_block_set_it_read_entry(struct kho_block_set_it *it) +{ + if (!it->block) + return NULL; + + if (it->i =3D=3D it->block->ser->count) { + if (list_is_last(&it->block->list, &it->bs->blocks)) + return NULL; + it->block =3D list_next_entry(it->block, list); + it->i =3D 0; + } + + return kho_block_entry(it, it->i++); +} + +/** + * kho_block_set_it_prev - Return the previous entry slot in the block set. + * @it: The block iterator. + * + * If the current index is at the start of a block, it automatically moves= to + * the end of the previous block. + * + * Return: A pointer to the previous entry slot, or NULL if at the very + * beginning of the block set. + */ +void *kho_block_set_it_prev(struct kho_block_set_it *it) +{ + if (!it->block) + return NULL; + + if (it->i =3D=3D 0) { + if (list_is_first(&it->block->list, &it->bs->blocks)) + return NULL; + it->block =3D list_prev_entry(it->block, list); + it->i =3D it->bs->count_per_block; + } + + return kho_block_entry(it, --it->i); +} --=20 2.53.0 From nobody Mon Jun 8 06:38:43 2026 Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A75243F7897 for ; Wed, 3 Jun 2026 03:29:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457361; cv=none; b=OxCgjNa7VsNY5uEeH8/U6ZEotuGS9pQW27NpKxvbShZotRmCpdvn7tYj+8nDdn8+XnlrO2ax88vHeOYNuOv+iR/pKYABFPfj/M7k3DgX/qSGl71wCghT1ZTbLHkLiQsY6pZrvZVF46brtW+8j4yr1/7XiP54urGb8/LaHXV0ELc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457361; c=relaxed/simple; bh=BUqck5wg4D12YPrDF5xhx84BkumRp2TDeBPRt9od/wk=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CEyOpscSmjmsRciUxnwoWu/8iVFKrkipvDMJjysyVQ15034Y88DvkuBVFuxyI3dzGMGPjmaEz+Caz6XXOfroLThEnNNjolI39YXmjubwbXtApMwBMV83gjYKw512XBXZFhj2Tf151k+A3+HfFwMSPqhLidxtCbvy+n1ARWSQhnA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b=MZTEqwd3; arc=none smtp.client-ip=209.85.219.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="MZTEqwd3" Received: by mail-qv1-f50.google.com with SMTP id 6a1803df08f44-8ccf887de87so44618316d6.0 for ; Tue, 02 Jun 2026 20:29:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; t=1780457359; x=1781062159; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=C9xWUzUEP3GatCDCPhqDCyXoyiDq9Ol5847oPRS2f7E=; b=MZTEqwd3BaM3Nm5TsFpYhnpu20vfcoQgFQAMDX/3uFWru8apOVrfTji39qs0GEyazY AQ97WmniGonIzsxnFGiKeUA3ad27yMYRwkXkI7Sx3oIbgVy99HO4J3gMpzZvWzepPmzA MEtAoR6DBPwQTtOWXiADSa79obChZCNUkIYu+g94PPVmxswaFu/CDX3ciwsOhv1Ms69n oeq/XE/uMUsUZs6QBwRGlxOn5HgCnZaj1rEdu45gHy/6+oJWc5PWVwdK+2TrP/PqY2sD IQsvr8Sk4tikEcBw43olCvbha4xKEutMf3r6EsjtgPCZCa3BC8hNQZxLcSzEmW+o1Ie0 pUNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780457359; x=1781062159; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=C9xWUzUEP3GatCDCPhqDCyXoyiDq9Ol5847oPRS2f7E=; b=m5NmI7/cfUqxw1P7j+xc4qaSOFiAZFJZllJCACgpfTjA0Kx4e89ehMBHj56VDB6oZ+ FQfXsgg+JvJaA46U+/CRyV2xShnYrGccn+UP35OosN5amJ9j9HCJeRWNqzaDrBMt+Sla Y6U7AH64QLI1BdEvykp6d7NamUkgexwDR0NUV4CXTLVZ35GuqDim3v8BHDtFwK70E7j8 pXnBg64r0mjKBiDM+jesLvkkPTowDV9Jg9IDv0vEQQl16O57L30ulxqspdtfwWBHTevw xKlZG5rrTzGdRjRRZ4Bom35qKM0FjXkKyWDzepE+/0uURX6EYV2qr2NBpobDBMT2MGFq Obdg== X-Forwarded-Encrypted: i=1; AFNElJ9OZ5WnGMNOTVnZh6VMRmBXgjp4bilbty/wRNR+ln2ZnsCq0pspOu7VWk4kebo2yF9mYhrsY4O2IXFRviQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yzmjbyd1nFymJdgrYUvuJEtV3IckZFBKHajK0+0W1YUL+1iDsty oP8Ah8V4RhlnjYh9yot4c8BS6WWRzG0EOks1QBy72ZIr1bckXSoLrLYmVkouQy4QvOBhd4xYxdx C+QcQ X-Gm-Gg: Acq92OE02fLdBx1jeskQ55u7aRqqkc0jx5OvF3IzJ3n3oI/Gw1jJGhPiYaT6FI/t2eL sxI5T9vfdsjI6EjdZQLDBzk1tacD6yMDMFeJzu86kOixDf8XzPcYkqFd5m7r9YTZRtPCbwnI4DG tUjGZzk/cGW6O7zt/tAehNM2FftvqlRWQtDCGYS/Dk2wdfs9mVDpI+BMAckbdUsY3rl4SMZuUYu yoqxYdKkl2qvsAeGVwYxhkN0v6u/gvUv2rsqCZxqxuBoqvJ8AWmd6iDDl3n/HqVS1yl0jgvt/PA VHG2mwEEExmtEpx07tVSKi5GjlLXMIfyefz896igC9KMgstiPE/ZeBAXh9E0QaWYBe4idauxjsu h4+W050BSVb4mftLLfayvXmPGfL7q4DHpS/S586AeM+BV8bP7QRydzK2+Vo8RUsTK0DeiIBEA4L Nhqnp7TowNnEytD3EXzsS71e2MLNOPk2lnaQ4C2Nx2GGZhpqEver6kbThYMdBrWA== X-Received: by 2002:a05:6214:c24:b0:8ca:10c9:845d with SMTP id 6a1803df08f44-8cecdf0ca03mr21814626d6.31.1780457358504; Tue, 02 Jun 2026 20:29:18 -0700 (PDT) Received: from plex ([71.181.43.54]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8cecd26b3b9sm9244566d6.45.2026.06.02.20.29.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 20:29:17 -0700 (PDT) From: Pasha Tatashin To: linux-kselftest@vger.kernel.org, rppt@kernel.org, shuah@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, skhan@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, corbet@lwn.net, pasha.tatashin@soleen.com, dmatlack@google.com, kexec@lists.infradead.org, pratyush@kernel.org, skhawaja@google.com, graf@amazon.com Subject: [PATCH v6 08/13] liveupdate: defer session block allocation and physical address setting Date: Wed, 3 Jun 2026 03:28:59 +0000 Message-ID: <20260603032905.344462-9-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260603032905.344462-1-pasha.tatashin@soleen.com> References: <20260603032905.344462-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, luo_session_setup_outgoing() allocates the session block and sets its physical address in the header immediately. With upcoming dynamic block-based session management, this makes the first block different from the rest. Move the allocation to where it is first needed. Acked-by: Mike Rapoport (Microsoft) Reviewed-by: Pratyush Yadav (Google) Signed-off-by: Pasha Tatashin --- kernel/liveupdate/luo_core.c | 4 +- kernel/liveupdate/luo_internal.h | 2 +- kernel/liveupdate/luo_session.c | 68 ++++++++++++++++++++------------ 3 files changed, 45 insertions(+), 29 deletions(-) diff --git a/kernel/liveupdate/luo_core.c b/kernel/liveupdate/luo_core.c index 69b00e7d0f8f..1b2bda22902d 100644 --- a/kernel/liveupdate/luo_core.c +++ b/kernel/liveupdate/luo_core.c @@ -165,9 +165,7 @@ static int __init luo_state_setup(void) strscpy(luo_ser->compatible, LUO_ABI_COMPATIBLE, sizeof(luo_ser->compatib= le)); luo_ser->liveupdate_num =3D luo_global.liveupdate_num + 1; =20 - err =3D luo_session_setup_outgoing(&luo_ser->sessions_pa); - if (err) - goto exit_free_luo_ser; + luo_session_setup_outgoing(&luo_ser->sessions_pa); =20 err =3D luo_flb_setup_outgoing(&luo_ser->flbs_pa); if (err) diff --git a/kernel/liveupdate/luo_internal.h b/kernel/liveupdate/luo_inter= nal.h index fe22086bfbeb..ee18f9a11b91 100644 --- a/kernel/liveupdate/luo_internal.h +++ b/kernel/liveupdate/luo_internal.h @@ -79,7 +79,7 @@ extern struct rw_semaphore luo_register_rwlock; =20 int luo_session_create(const char *name, struct file **filep); int luo_session_retrieve(const char *name, struct file **filep); -int __init luo_session_setup_outgoing(u64 *sessions_pa); +void __init luo_session_setup_outgoing(u64 *sessions_pa); int __init luo_session_setup_incoming(u64 sessions_pa); int luo_session_serialize(void); int luo_session_deserialize(void); diff --git a/kernel/liveupdate/luo_session.c b/kernel/liveupdate/luo_sessio= n.c index 1cd315e0f6de..2411849a34e3 100644 --- a/kernel/liveupdate/luo_session.c +++ b/kernel/liveupdate/luo_session.c @@ -108,15 +108,16 @@ static DECLARE_RWSEM(luo_session_serialize_rwsem); =20 /** * struct luo_session_header - Header struct for managing LUO sessions. - * @count: The number of sessions currently tracked in the @list. - * @list: The head of the linked list of `struct luo_session` instan= ces. - * @rwsem: A read-write semaphore providing synchronized access to the - * session list and other fields in this structure. - * @header_ser: The header data of serialization array. - * @ser: The serialized session data (an array of - * `struct luo_session_ser`). - * @active: Set to true when first initialized. If previous kernel did= not - * send session data, active stays false for incoming. + * @count: The number of sessions currently tracked in the @list. + * @list: The head of the linked list of `struct luo_session` insta= nces. + * @rwsem: A read-write semaphore providing synchronized access to t= he + * session list and other fields in this structure. + * @header_ser: The header data of serialization array. + * @ser: The serialized session data (an array of + * `struct luo_session_ser`). + * @sessions_pa: Points to the location of sessions_pa within struct luo_s= er. + * @active: Set to true when first initialized. If previous kernel di= d not + * send session data, active stays false for incoming. */ struct luo_session_header { long count; @@ -124,6 +125,7 @@ struct luo_session_header { struct rw_semaphore rwsem; struct luo_session_header_ser *header_ser; struct luo_session_ser *ser; + u64 *sessions_pa; bool active; }; =20 @@ -171,10 +173,30 @@ static void luo_session_free(struct luo_session *sess= ion) kfree(session); } =20 +static int luo_session_grow_ser(struct luo_session_header *sh) +{ + struct luo_session_header_ser *header_ser; + + if (sh->count =3D=3D LUO_SESSION_MAX) + return -ENOMEM; + + if (sh->header_ser) + return 0; + + header_ser =3D kho_alloc_preserve(LUO_SESSION_PGCNT << PAGE_SHIFT); + if (IS_ERR(header_ser)) + return PTR_ERR(header_ser); + + sh->header_ser =3D header_ser; + sh->ser =3D (void *)(header_ser + 1); + return 0; +} + static int luo_session_insert(struct luo_session_header *sh, struct luo_session *session) { struct luo_session *it; + int err; =20 guard(rwsem_write)(&sh->rwsem); =20 @@ -183,8 +205,9 @@ static int luo_session_insert(struct luo_session_header= *sh, * for new session. */ if (sh =3D=3D &luo_session_global.outgoing) { - if (sh->count =3D=3D LUO_SESSION_MAX) - return -ENOMEM; + err =3D luo_session_grow_ser(sh); + if (err) + return err; } =20 /* @@ -524,21 +547,10 @@ int luo_session_retrieve(const char *name, struct fil= e **filep) return err; } =20 -int __init luo_session_setup_outgoing(u64 *sessions_pa) +void __init luo_session_setup_outgoing(u64 *sessions_pa) { - struct luo_session_header_ser *header_ser; - - header_ser =3D kho_alloc_preserve(LUO_SESSION_PGCNT << PAGE_SHIFT); - if (IS_ERR(header_ser)) - return PTR_ERR(header_ser); - - *sessions_pa =3D virt_to_phys(header_ser); - - luo_session_global.outgoing.header_ser =3D header_ser; - luo_session_global.outgoing.ser =3D (void *)(header_ser + 1); + luo_session_global.outgoing.sessions_pa =3D sessions_pa; luo_session_global.outgoing.active =3D true; - - return 0; } =20 int __init luo_session_setup_incoming(u64 sessions_pa) @@ -644,6 +656,8 @@ int luo_session_serialize(void) =20 down_write(&luo_session_serialize_rwsem); down_write(&sh->rwsem); + *sh->sessions_pa =3D 0; + list_for_each_entry(session, &sh->list, list) { err =3D luo_session_freeze_one(session, &sh->ser[i]); if (err) @@ -653,7 +667,11 @@ int luo_session_serialize(void) sizeof(sh->ser[i].name)); i++; } - sh->header_ser->count =3D sh->count; + + if (sh->header_ser && sh->count > 0) { + sh->header_ser->count =3D sh->count; + *sh->sessions_pa =3D virt_to_phys(sh->header_ser); + } up_write(&sh->rwsem); =20 return 0; --=20 2.53.0 From nobody Mon Jun 8 06:38:43 2026 Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 818273FC5A1 for ; Wed, 3 Jun 2026 03:29:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457363; cv=none; b=cMyPDpGfgCEq9erCDXGNuO+Npo6/LRf22hidhJPOg1/zGYIbD+DD1Xi1pdG4T+0AlGOXy0nPVePTUG6WUNtgMeh3AvH23A2MguNOLpaqLhmhB/AWsf+4vi9JawgcUw+FF4GSCxQIkc5srMI/pcHbmaz3v/DnagLmMBfnTM5FbyI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457363; c=relaxed/simple; bh=0gwKyQQYDBUnv0UGfVWyXc49IlrArrhgteCjS6YB3K4=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M/96M4v5fOu2myLVRUUmv9fK1zlk5GUOCWVjl6iAwVBGbBLKSOgoEtMaHU3U+xrL/wmPSZ2okqsbkI+n1cVWTBXF+DPmkC2jeaZqfKj5mz7e/sln2EDhC2Y3R7mbcBYmAfhQVmAQ1pKrz7JhC5VZp/RurqHObQDZWypoYfnShGU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b=J3vWjEOK; arc=none smtp.client-ip=209.85.219.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="J3vWjEOK" Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-8ce9df48e1bso31845156d6.1 for ; Tue, 02 Jun 2026 20:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; t=1780457360; x=1781062160; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Tz2WlgQShBzc08rHE8f9hPH77UCMh/X7xv20EWPP2Uw=; b=J3vWjEOKG7oiAv0W7ehKe7u292uQLR+KlnBMR/KlZWsAWSpC1vPHC4YxiqXpBX+Hyo Web5s6QOMZcFWDuB3ktxcH4couHxcy30PyXfjS/2HuLc3zvxA/D9GV1Tbz7MvgyGx6js AfBV5zckYv1lC1mQC/hUD31ZrJeA0mxmIG4ColZGhJNDVdQWhEn3enGs2/DrzGffR9Nf +VgOdzcuFSdn1igZz//sFByftOs5OQuyLosr4nVQ8qHCq7cE/KsFIqDdHHsaVrzhxzbn vNRyUUKW/qR/qAEMGF8fl+VD2L9Un+7l8msnuOU2H1lhLcm0sRt/iDii71485Utai+hs npLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780457360; x=1781062160; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Tz2WlgQShBzc08rHE8f9hPH77UCMh/X7xv20EWPP2Uw=; b=M2Ka41+wDHhnY53c3keFkW8IQUkWdiD/RXzGlhjQ3ZHffVWwWkvgDtdxQ2fVyKBoa9 IEBKnDHMkNXi7z5QW/++huHi1yIasBuhwlyuncmnjw+1WOC7USawsDVfC9QXUrUn6y6c uNm+CDb3Iulv0mw7ZGcwYDgAMEJEgdvzu9wf2hU8Av/pqCk8xyw7Trbuso2uBP/Lte48 C2oEKGRwdfT7Nh4kD3Bu1RJpNYA5nK0LJbtiXmDeJp7Wc5KWjjPtXyewbEgay5ZWQlc3 ukeaULZMJZUlxlTkNnArBvZshE+817FfuuJ07cUz2ePqpMNEBcVWSI9AjUssEN1hd34f EkaQ== X-Forwarded-Encrypted: i=1; AFNElJ9R2KD8TSaxpZnkLBUxMwCe0u5Xc9I8Dv8E0uDJr73VEWcv6MkrTn71aVGz2wbtNmnJWyzwF8kVLRHWmS4=@vger.kernel.org X-Gm-Message-State: AOJu0Yx8dMSC+nTwiH+WbjzJSmZU0DdyNOJfzrmmFKRw1x+tQ3iswlbc SL81opF1Nh9o+dvINat5kZAtSHRdv2wZD4Va2D9ZdQkIPXH8GnEIaEJp4ulJkobIu18= X-Gm-Gg: Acq92OE2htO4aClzjPiWvVLH9PCnxY7dAv854xYUMtybW/0H29LrWh0eDLapXO4my4q jybdJuPuDJrRZaglqZY0f8xVoN3GtQllqxR2ulECfsw2BaWY+CpNnR2GgdtcREUH6i1BVxjgH8l /z/FsZQ8x75A1CsUHLfaOyo819rWYEacX/bUL1Bm65TLirHp4cXzCwp6AHQ3iJiBcJ3AfoxF1EM +dHdQu8/NEd0wWIXp0DHi0SB/+iYVYOJBx4CIjpusZ5/YkA9igUmxV/Ckro7QXYGZ8CWgaPjWLh Ebzix2QW6FD13D1kN5JXQwFiX5YY8uZyXXRARRhSdJU9LbRqkyrahmcm754tXmMxlinWfW3wHV/ DK/HXkVq9aTyj7NvWryWNZD/dYayoBxf/VyKRZVjaYVNPakdUwlkmO+aA63XgJK5L1IYfUwS/m4 MH15v3So7/81gn2pCfXo7f7t1MKXm78jgUjxSSZjyDEQbQvyVIuZedw47V5bkQrg== X-Received: by 2002:a05:6214:260e:b0:8ac:a154:e156 with SMTP id 6a1803df08f44-8cecdca3c5emr23602316d6.29.1780457360528; Tue, 02 Jun 2026 20:29:20 -0700 (PDT) Received: from plex ([71.181.43.54]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8cecd26b3b9sm9244566d6.45.2026.06.02.20.29.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 20:29:19 -0700 (PDT) From: Pasha Tatashin To: linux-kselftest@vger.kernel.org, rppt@kernel.org, shuah@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, skhan@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, corbet@lwn.net, pasha.tatashin@soleen.com, dmatlack@google.com, kexec@lists.infradead.org, pratyush@kernel.org, skhawaja@google.com, graf@amazon.com Subject: [PATCH v6 09/13] liveupdate: Remove limit on the number of sessions Date: Wed, 3 Jun 2026 03:29:00 +0000 Message-ID: <20260603032905.344462-10-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260603032905.344462-1-pasha.tatashin@soleen.com> References: <20260603032905.344462-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, the number of LUO sessions is limited by a fixed number of pre-allocated pages for serialization (16 pages, allowing for ~819 sessions). This limitation is problematic if LUO is used to support things such as systemd file descriptor store, and would be used not just as VM memory but to save other states on the machine. Remove this limit by transitioning to a linked-block approach for session metadata serialization. Instead of a single contiguous block, session metadata is now stored in a chain of 16-page blocks. Each block starts with a header containing the physical address of the next block and the number of session entries in the current block. Acked-by: Mike Rapoport (Microsoft) Reviewed-by: Pratyush Yadav (Google) Signed-off-by: Pasha Tatashin --- include/linux/kho/abi/luo.h | 24 +------ kernel/liveupdate/luo_session.c | 113 +++++++++++++++----------------- 2 files changed, 56 insertions(+), 81 deletions(-) diff --git a/include/linux/kho/abi/luo.h b/include/linux/kho/abi/luo.h index 9a4fe491812b..79758d92ed5f 100644 --- a/include/linux/kho/abi/luo.h +++ b/include/linux/kho/abi/luo.h @@ -33,11 +33,6 @@ * It includes the compatibility string, the liveupdate-number, and po= inters * to sessions and FLBs. * - * - struct luo_session_header_ser: - * Header for the session array. Contains the total page count of the - * preserved memory block and the number of `struct luo_session_ser` - * entries that follow. - * * - struct luo_session_ser: * Metadata for a single session, including its name and a physical po= inter * to another preserved memory block containing an array of @@ -63,13 +58,15 @@ #define _LINUX_KHO_ABI_LUO_H =20 #include +#include #include =20 /* * The LUO state is registered under this KHO entry name. */ #define LUO_KHO_ENTRY_NAME "LUO" -#define LUO_ABI_COMPATIBLE "luo-v3" +#define LUO_COMPAT_BASE "luo-v3" +#define LUO_ABI_COMPATIBLE LUO_COMPAT_BASE "-" KHO_BLOCK_ABI_COMPATIBLE #define LUO_ABI_COMPAT_LEN ALIGN(sizeof(LUO_ABI_COMPATIBLE), 8) =20 /** @@ -118,21 +115,6 @@ struct luo_file_set_ser { u64 count; } __packed; =20 -/** - * struct luo_session_header_ser - Header for the serialized session data = block. - * @count: The number of `struct luo_session_ser` entries that immediately - * follow this header in the memory block. - * - * This structure is located at the beginning of a contiguous block of - * physical memory preserved across the kexec. It provides the necessary - * metadata to interpret the array of session entries that follow. - * - * If this structure is modified, `LUO_ABI_COMPATIBLE` must be updated. - */ -struct luo_session_header_ser { - u64 count; -} __packed; - /** * struct luo_session_ser - Represents the serialized metadata for a LUO s= ession. * @name: The unique name of the session, provided by the userspac= e at diff --git a/kernel/liveupdate/luo_session.c b/kernel/liveupdate/luo_sessio= n.c index 2411849a34e3..b79b2a488974 100644 --- a/kernel/liveupdate/luo_session.c +++ b/kernel/liveupdate/luo_session.c @@ -24,9 +24,10 @@ * ioctls on /dev/liveupdate. * * - Serialization: Session metadata is preserved using the KHO framework.= When - * a live update is triggered via kexec, an array of `struct luo_session= _ser` - * is populated and placed in a preserved memory region. The physical ad= dress - * of this array is stored in the centralized `struct luo_ser` structure. + * a live update is triggered via kexec, session metadata is serialized = into + * a chain of linked-blocks and placed in a preserved memory region. The + * physical address of the first block header is stored in the centraliz= ed + * `struct luo_ser` structure. * * Session Lifecycle: * @@ -89,6 +90,7 @@ #include #include #include +#include #include #include #include @@ -98,23 +100,14 @@ #include #include "luo_internal.h" =20 -/* 16 4K pages, give space for 744 sessions */ -#define LUO_SESSION_PGCNT 16ul -#define LUO_SESSION_MAX (((LUO_SESSION_PGCNT << PAGE_SHIFT) - \ - sizeof(struct luo_session_header_ser)) / \ - sizeof(struct luo_session_ser)) - static DECLARE_RWSEM(luo_session_serialize_rwsem); - /** * struct luo_session_header - Header struct for managing LUO sessions. * @count: The number of sessions currently tracked in the @list. * @list: The head of the linked list of `struct luo_session` insta= nces. * @rwsem: A read-write semaphore providing synchronized access to t= he * session list and other fields in this structure. - * @header_ser: The header data of serialization array. - * @ser: The serialized session data (an array of - * `struct luo_session_ser`). + * @block_set: The set of serialization blocks. * @sessions_pa: Points to the location of sessions_pa within struct luo_s= er. * @active: Set to true when first initialized. If previous kernel di= d not * send session data, active stays false for incoming. @@ -123,8 +116,7 @@ struct luo_session_header { long count; struct list_head list; struct rw_semaphore rwsem; - struct luo_session_header_ser *header_ser; - struct luo_session_ser *ser; + struct kho_block_set block_set; u64 *sessions_pa; bool active; }; @@ -143,10 +135,14 @@ static struct luo_session_global luo_session_global = =3D { .incoming =3D { .list =3D LIST_HEAD_INIT(luo_session_global.incoming.list), .rwsem =3D __RWSEM_INITIALIZER(luo_session_global.incoming.rwsem), + .block_set =3D KHO_BLOCK_SET_INIT(luo_session_global.incoming.block_set, + sizeof(struct luo_session_ser)), }, .outgoing =3D { .list =3D LIST_HEAD_INIT(luo_session_global.outgoing.list), .rwsem =3D __RWSEM_INITIALIZER(luo_session_global.outgoing.rwsem), + .block_set =3D KHO_BLOCK_SET_INIT(luo_session_global.outgoing.block_set, + sizeof(struct luo_session_ser)), }, }; =20 @@ -173,25 +169,6 @@ static void luo_session_free(struct luo_session *sessi= on) kfree(session); } =20 -static int luo_session_grow_ser(struct luo_session_header *sh) -{ - struct luo_session_header_ser *header_ser; - - if (sh->count =3D=3D LUO_SESSION_MAX) - return -ENOMEM; - - if (sh->header_ser) - return 0; - - header_ser =3D kho_alloc_preserve(LUO_SESSION_PGCNT << PAGE_SHIFT); - if (IS_ERR(header_ser)) - return PTR_ERR(header_ser); - - sh->header_ser =3D header_ser; - sh->ser =3D (void *)(header_ser + 1); - return 0; -} - static int luo_session_insert(struct luo_session_header *sh, struct luo_session *session) { @@ -205,7 +182,7 @@ static int luo_session_insert(struct luo_session_header= *sh, * for new session. */ if (sh =3D=3D &luo_session_global.outgoing) { - err =3D luo_session_grow_ser(sh); + err =3D kho_block_set_grow(&sh->block_set, sh->count + 1); if (err) return err; } @@ -232,6 +209,8 @@ static void luo_session_remove(struct luo_session_heade= r *sh, guard(rwsem_write)(&sh->rwsem); list_del(&session->list); sh->count--; + if (sh =3D=3D &luo_session_global.outgoing) + kho_block_set_shrink(&sh->block_set, sh->count); } =20 static int luo_session_finish_one(struct luo_session *session) @@ -555,15 +534,17 @@ void __init luo_session_setup_outgoing(u64 *sessions_= pa) =20 int __init luo_session_setup_incoming(u64 sessions_pa) { - struct luo_session_header_ser *header_ser; + struct luo_session_header *sh =3D &luo_session_global.incoming; + int err; =20 - if (sessions_pa) { - header_ser =3D phys_to_virt(sessions_pa); - luo_session_global.incoming.header_ser =3D header_ser; - luo_session_global.incoming.ser =3D (void *)(header_ser + 1); - luo_session_global.incoming.active =3D true; - } + if (!sessions_pa) + return 0; =20 + err =3D kho_block_set_restore(&sh->block_set, sessions_pa); + if (err) + return err; + + sh->active =3D true; return 0; } =20 @@ -605,6 +586,8 @@ int luo_session_deserialize(void) { struct luo_session_header *sh =3D &luo_session_global.incoming; static bool is_deserialized; + struct luo_session_ser *ser; + struct kho_block_set_it it; static int saved_err; int err; =20 @@ -631,18 +614,19 @@ int luo_session_deserialize(void) * userspace to detect the failure and trigger a reboot, which will * reliably reset devices and reclaim memory. */ - for (int i =3D 0; i < sh->header_ser->count; i++) { - err =3D luo_session_deserialize_one(sh, &sh->ser[i]); + kho_block_set_it_init(&it, &sh->block_set); + while ((ser =3D kho_block_set_it_read_entry(&it))) { + err =3D luo_session_deserialize_one(sh, ser); if (err) goto save_err; } =20 - kho_restore_free(sh->header_ser); - sh->header_ser =3D NULL; - sh->ser =3D NULL; + kho_block_set_destroy(&sh->block_set); =20 return 0; + save_err: + kho_block_set_destroy(&sh->block_set); saved_err =3D err; return err; } @@ -651,36 +635,45 @@ int luo_session_serialize(void) { struct luo_session_header *sh =3D &luo_session_global.outgoing; struct luo_session *session; - int i =3D 0; + struct kho_block_set_it it; int err; =20 down_write(&luo_session_serialize_rwsem); down_write(&sh->rwsem); *sh->sessions_pa =3D 0; =20 + kho_block_set_it_init(&it, &sh->block_set); + list_for_each_entry(session, &sh->list, list) { - err =3D luo_session_freeze_one(session, &sh->ser[i]); - if (err) + struct luo_session_ser *ser =3D kho_block_set_it_reserve_entry(&it); + + /* This should not fail normally as blocks were pre-allocated */ + if (WARN_ON_ONCE(!ser)) { + err =3D -ENOSPC; goto err_undo; + } =20 - strscpy(sh->ser[i].name, session->name, - sizeof(sh->ser[i].name)); - i++; - } + err =3D luo_session_freeze_one(session, ser); + if (err) { + kho_block_set_it_prev(&it); + goto err_undo; + } =20 - if (sh->header_ser && sh->count > 0) { - sh->header_ser->count =3D sh->count; - *sh->sessions_pa =3D virt_to_phys(sh->header_ser); + strscpy(ser->name, session->name, sizeof(ser->name)); } + + if (sh->count > 0) + *sh->sessions_pa =3D kho_block_set_head_pa(&sh->block_set); up_write(&sh->rwsem); =20 return 0; =20 err_undo: list_for_each_entry_continue_reverse(session, &sh->list, list) { - i--; - luo_session_unfreeze_one(session, &sh->ser[i]); - memset(sh->ser[i].name, 0, sizeof(sh->ser[i].name)); + struct luo_session_ser *ser =3D kho_block_set_it_prev(&it); + + luo_session_unfreeze_one(session, ser); + memset(ser->name, 0, sizeof(ser->name)); } up_write(&sh->rwsem); up_write(&luo_session_serialize_rwsem); --=20 2.53.0 From nobody Mon Jun 8 06:38:43 2026 Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BCEC83FCB10 for ; Wed, 3 Jun 2026 03:29:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457365; cv=none; b=FT0gStg8eIf9SdCPekxlSueOG2cgp6AwdZgk4qzI6DhZJDiCeMpCyJGo4kkexazjVpjZLA5Lm/37YP9sP0LnbmA2lWWFG1y7jOq5J1iIgwGYdPrStPAtOmr0Dn7VFaqOkfok4ic9pHCSFsqwT8kSozV+kL25/w0PJi9w5Dh5GQo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457365; c=relaxed/simple; bh=yEFWFfzRSqKK8yaJuteqmaD2iCfnvu87uZtqGd2pNTI=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D2kxHTB/dTUr7IOqPuyKz2lbLvYF3Khohy4l72dCjI1p+gSxlBoa/byQ+1GV52jCNI1+3f8jES7fbu0v5q7Fg3mA05RCok6dUXsm1AUb2btDmqcj14IQcXPDiOk76vsDz52ufl1KazC3nhP/P827lDdSX8V9UQJmr2J08TDWUFA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b=XsImrYQU; arc=none smtp.client-ip=209.85.219.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="XsImrYQU" Received: by mail-qv1-f43.google.com with SMTP id 6a1803df08f44-8cceaacd07bso47921526d6.3 for ; Tue, 02 Jun 2026 20:29:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; t=1780457362; x=1781062162; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=aDk1luXhEbMZPjSCi9wsbdWPEY1V0MeSCJTY8TocvIA=; b=XsImrYQU4BhzlfAyIcUebZ6AIQQu7oi0Imbg3PsRDNl3Oc7jNv16Q5/+YI7O3DLTLt u2noPW0BSIpQUnKNU4aKb57daS0ngvUMESjsLosc5hl0awLDNP3X5w3jj5zLpfbEAUqd Y2z2dkfHWQ6+9tNFjqImqhaHYI2sNYibmxvf31Wo4yz0vyvvBQHgNna1+6TWBSPMM60h SAFmNVu0vrRtJIy08nMdHhX6FBZURYrcGvk37hUw6Qg3kdln+ECGUY9GZbdWrzk2bdRc 0CKfAiSjd2AH0nya+B8k3TQOjq+noImLwQPTY91/GxsO+iOofEJXqjrIDM2iZPzIwyeW FdFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780457362; x=1781062162; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=aDk1luXhEbMZPjSCi9wsbdWPEY1V0MeSCJTY8TocvIA=; b=iloSNPUsOlt6Oyn2/PZZu99NHyYQfa2t8MePkJil5lVxoVoaOhhZYe3tVq+oFLJfnD KrjFlDE9+w1Kc4Eg93C30G1O5SR5U0RAeLniS6+d6yvIIRBYJCSoXJ/JrriV/4VyWAv+ vnwh37MTztu/ZCcy902d88bJ6cpcAtZV5l0CxKiX6C2f5YgwhL3q6wQ8nTfkGdxlDOgQ 8OwEBbeUJKX4YOicM5bachLPd+YOMHg+nTjlvY1gjNf9OWtnLsiAbBsW3FgavfC+J2KR kzlqOU1fOQq/rQdiusY2T7H3GmxkNCvRZbCh53he6LhLlUIfn122jTVX4dHpmptaUCr3 ND1w== X-Forwarded-Encrypted: i=1; AFNElJ/Vq3dlddC+t+6cMZtgPo7cqHbDEG15Uy33YqQKryY7vQG5tSVQEf639bTjOgDa8PEbd/+mSbZgzLXHZ5k=@vger.kernel.org X-Gm-Message-State: AOJu0Yx44IVCjes4ZNtG33xFXMEZqYMtzbTOAetinD4BgQl1SWxmlL8H kbdN7kqB52eXqY8e6PYP3Pp/qN4pJrz8I9ORq3Aw3ZyOFMtqaK5EKOCj4fEY7PhbCzI= X-Gm-Gg: Acq92OHW18RG45gtqZpemclAqbzXqbSL3AbAiYesBh/InMpJI6Sf90S0wtTVigU66Lk jHlNaYc1wAlqF2T6AAvr0y9YvOcKiTIiku4PqICP4r76VsgP0+wl2Cfg50OZvqygB6IXITD75t7 1l4Eq8r+TnEPDQo+FUsHaMTxTn35i1kF727j0r4rj+tB13QR596z78b+ac36+h5RGtFroUKOWke RtB9znhIBLYk1WTSFys0kNp3kLoZaKjkJYXDuNKTPHzCAkJ6Oa5kmM84gjStUFQb7RAvo91zBRN t/Rg5+l3yamMuR+dABc0Ahiv+zYT+EYomaEUjooYVnlNXwaQ7E3rYGKVipFQAqrzSy2gg3ZuGUy 1o2i6tFAkWKgXHpUGH9W/xhEA6Zo6FaeyzZ6eJSQsj6irVAKPweLp1JPpi0xTe42rHzcYJWrZeC OqcaVs8U2bDkDSpgDIw1azes7JokXLtX+Vvr1taAm/8MJFSHXzGPcZxMTsmQGuXw== X-Received: by 2002:a05:6214:2f13:b0:8ce:aace:eaf8 with SMTP id 6a1803df08f44-8cece152728mr22557086d6.43.1780457361705; Tue, 02 Jun 2026 20:29:21 -0700 (PDT) Received: from plex ([71.181.43.54]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8cecd26b3b9sm9244566d6.45.2026.06.02.20.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 20:29:21 -0700 (PDT) From: Pasha Tatashin To: linux-kselftest@vger.kernel.org, rppt@kernel.org, shuah@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, skhan@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, corbet@lwn.net, pasha.tatashin@soleen.com, dmatlack@google.com, kexec@lists.infradead.org, pratyush@kernel.org, skhawaja@google.com, graf@amazon.com Subject: [PATCH v6 10/13] liveupdate: Remove limit on the number of files per session Date: Wed, 3 Jun 2026 03:29:01 +0000 Message-ID: <20260603032905.344462-11-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260603032905.344462-1-pasha.tatashin@soleen.com> References: <20260603032905.344462-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To remove the fixed limit on the number of preserved files per session, transition the file metadata serialization from a single contiguous memory block to a chain of linked blocks. Acked-by: Mike Rapoport (Microsoft) Signed-off-by: Pasha Tatashin --- include/linux/kho/abi/luo.h | 13 +-- kernel/liveupdate/luo_file.c | 138 ++++++++++++++----------------- kernel/liveupdate/luo_internal.h | 6 +- 3 files changed, 74 insertions(+), 83 deletions(-) diff --git a/include/linux/kho/abi/luo.h b/include/linux/kho/abi/luo.h index 79758d92ed5f..16df550ef143 100644 --- a/include/linux/kho/abi/luo.h +++ b/include/linux/kho/abi/luo.h @@ -35,8 +35,8 @@ * * - struct luo_session_ser: * Metadata for a single session, including its name and a physical po= inter - * to another preserved memory block containing an array of - * `struct luo_file_ser` for all files in that session. + * to the first `struct kho_block_header_ser` for all files in that se= ssion. + * Multiple blocks are linked via the `next` field in the header. * * - struct luo_file_ser: * Metadata for a single preserved file. Contains the `compatible` str= ing to @@ -65,7 +65,7 @@ * The LUO state is registered under this KHO entry name. */ #define LUO_KHO_ENTRY_NAME "LUO" -#define LUO_COMPAT_BASE "luo-v3" +#define LUO_COMPAT_BASE "luo-v4" #define LUO_ABI_COMPATIBLE LUO_COMPAT_BASE "-" KHO_BLOCK_ABI_COMPATIBLE #define LUO_ABI_COMPAT_LEN ALIGN(sizeof(LUO_ABI_COMPATIBLE), 8) =20 @@ -103,9 +103,10 @@ struct luo_file_ser { =20 /** * struct luo_file_set_ser - Represents the serialized metadata for file s= et - * @files: The physical address of a contiguous memory block that holds - * the serialized state of files (array of luo_file_ser) in this= file - * set. + * @files: The physical address of the first `struct kho_block_header_se= r`. + * This structure is the header for a block of memory containing + * an array of `struct luo_file_ser` entries. Multiple blocks are + * linked via the `next` field in the header. * @count: The total number of files that were part of this session duri= ng * serialization. Used for iteration and validation during * restoration. diff --git a/kernel/liveupdate/luo_file.c b/kernel/liveupdate/luo_file.c index 9eec07a9e9fc..c39f96961a85 100644 --- a/kernel/liveupdate/luo_file.c +++ b/kernel/liveupdate/luo_file.c @@ -118,11 +118,6 @@ static LIST_HEAD(luo_file_handler_list); /* Keep track of files being preserved by LUO */ static DEFINE_XARRAY(luo_preserved_files); =20 -/* 2 4K pages, give space for 128 files per file_set */ -#define LUO_FILE_PGCNT 2ul -#define LUO_FILE_MAX \ - ((LUO_FILE_PGCNT << PAGE_SHIFT) / sizeof(struct luo_file_ser)) - /** * struct luo_file - Represents a single preserved file instance. * @fh: Pointer to the &struct liveupdate_file_handler that man= ages @@ -174,39 +169,6 @@ struct luo_file { u64 token; }; =20 -static int luo_alloc_files_mem(struct luo_file_set *file_set) -{ - size_t size; - void *mem; - - if (file_set->files) - return 0; - - WARN_ON_ONCE(file_set->count); - - size =3D LUO_FILE_PGCNT << PAGE_SHIFT; - mem =3D kho_alloc_preserve(size); - if (IS_ERR(mem)) - return PTR_ERR(mem); - - file_set->files =3D mem; - - return 0; -} - -static void luo_free_files_mem(struct luo_file_set *file_set) -{ - /* If file_set has files, no need to free preservation memory */ - if (file_set->count) - return; - - if (!file_set->files) - return; - - kho_unpreserve_free(file_set->files); - file_set->files =3D NULL; -} - static unsigned long luo_get_id(struct liveupdate_file_handler *fh, struct file *file) { @@ -276,16 +238,15 @@ int luo_preserve_file(struct luo_file_set *file_set, = u64 token, int fd) if (luo_token_is_used(file_set, token)) return -EEXIST; =20 - if (file_set->count =3D=3D LUO_FILE_MAX) - return -ENOSPC; + err =3D kho_block_set_grow(&file_set->block_set, file_set->count + 1); + if (err) + return err; =20 file =3D fget(fd); - if (!file) - return -EBADF; - - err =3D luo_alloc_files_mem(file_set); - if (err) - goto err_fput; + if (!file) { + err =3D -EBADF; + goto err_shrink; + } =20 err =3D -ENOENT; down_read(&luo_register_rwlock); @@ -300,7 +261,7 @@ int luo_preserve_file(struct luo_file_set *file_set, u6= 4 token, int fd) =20 /* err is still -ENOENT if no handler was found */ if (err) - goto err_free_files_mem; + goto err_fput; =20 err =3D xa_insert(&luo_preserved_files, luo_get_id(fh, file), file, GFP_KERNEL); @@ -343,10 +304,10 @@ int luo_preserve_file(struct luo_file_set *file_set, = u64 token, int fd) xa_erase(&luo_preserved_files, luo_get_id(fh, file)); err_module_put: module_put(fh->ops->owner); -err_free_files_mem: - luo_free_files_mem(file_set); err_fput: fput(file); +err_shrink: + kho_block_set_shrink(&file_set->block_set, file_set->count); =20 return err; } @@ -392,13 +353,14 @@ void luo_file_unpreserve_files(struct luo_file_set *f= ile_set) =20 list_del(&luo_file->list); file_set->count--; + kho_block_set_shrink(&file_set->block_set, file_set->count); =20 fput(luo_file->file); mutex_destroy(&luo_file->mutex); kfree(luo_file); } =20 - luo_free_files_mem(file_set); + kho_block_set_destroy(&file_set->block_set); } =20 static int luo_file_freeze_one(struct luo_file_set *file_set, @@ -454,7 +416,7 @@ static void __luo_file_unfreeze(struct luo_file_set *fi= le_set, luo_file_unfreeze_one(file_set, luo_file); } =20 - memset(file_set->files, 0, LUO_FILE_PGCNT << PAGE_SHIFT); + kho_block_set_clear(&file_set->block_set); } =20 /** @@ -493,19 +455,24 @@ static void __luo_file_unfreeze(struct luo_file_set *= file_set, int luo_file_freeze(struct luo_file_set *file_set, struct luo_file_set_ser *file_set_ser) { - struct luo_file_ser *file_ser =3D file_set->files; struct luo_file *luo_file; + struct kho_block_set_it it; int err; - int i; =20 if (!file_set->count) return 0; =20 - if (WARN_ON(!file_ser)) - return -EINVAL; + kho_block_set_it_init(&it, &file_set->block_set); =20 - i =3D 0; list_for_each_entry(luo_file, &file_set->files_list, list) { + struct luo_file_ser *file_ser =3D kho_block_set_it_reserve_entry(&it); + + /* This should not fail normally as blocks were pre-allocated */ + if (WARN_ON_ONCE(!file_ser)) { + err =3D -ENOSPC; + goto err_unfreeze; + } + err =3D luo_file_freeze_one(file_set, luo_file); if (err < 0) { pr_warn("Freeze failed for token[%#0llx] handler[%s] err[%pe]\n", @@ -514,16 +481,14 @@ int luo_file_freeze(struct luo_file_set *file_set, goto err_unfreeze; } =20 - strscpy(file_ser[i].compatible, luo_file->fh->compatible, - sizeof(file_ser[i].compatible)); - file_ser[i].data =3D luo_file->serialized_data; - file_ser[i].token =3D luo_file->token; - i++; + strscpy(file_ser->compatible, luo_file->fh->compatible, + sizeof(file_ser->compatible)); + file_ser->data =3D luo_file->serialized_data; + file_ser->token =3D luo_file->token; } =20 file_set_ser->count =3D file_set->count; - if (file_set->files) - file_set_ser->files =3D virt_to_phys(file_set->files); + file_set_ser->files =3D kho_block_set_head_pa(&file_set->block_set); =20 return 0; =20 @@ -741,14 +706,12 @@ int luo_file_finish(struct luo_file_set *file_set) module_put(luo_file->fh->ops->owner); list_del(&luo_file->list); file_set->count--; + kho_block_set_shrink(&file_set->block_set, file_set->count); mutex_destroy(&luo_file->mutex); kfree(luo_file); } =20 - if (file_set->files) { - kho_restore_free(file_set->files); - file_set->files =3D NULL; - } + kho_block_set_destroy(&file_set->block_set); =20 return 0; } @@ -822,16 +785,18 @@ int luo_file_deserialize(struct luo_file_set *file_se= t, struct luo_file_set_ser *file_set_ser) { struct luo_file_ser *file_ser; + struct kho_block_set_it it; int err; - u64 i; =20 if (!file_set_ser->files) { WARN_ON(file_set_ser->count); return 0; } =20 - file_set->count =3D file_set_ser->count; - file_set->files =3D phys_to_virt(file_set_ser->files); + file_set->count =3D 0; + err =3D kho_block_set_restore(&file_set->block_set, file_set_ser->files); + if (err) + return err; =20 /* * Note on error handling: @@ -848,25 +813,50 @@ int luo_file_deserialize(struct luo_file_set *file_se= t, * userspace to detect the failure and trigger a reboot, which will * reliably reset devices and reclaim memory. */ - file_ser =3D file_set->files; - for (i =3D 0; i < file_set->count; i++) { - err =3D luo_file_deserialize_one(file_set, &file_ser[i]); + kho_block_set_it_init(&it, &file_set->block_set); + while ((file_ser =3D kho_block_set_it_read_entry(&it))) { + err =3D luo_file_deserialize_one(file_set, file_ser); if (err) - return err; + goto err_destroy_blocks; + file_set->count++; + } + + if (file_set->count !=3D file_set_ser->count) { + pr_warn("File count mismatch: expected %llu, found %llu\n", + file_set_ser->count, file_set->count); + err =3D -EINVAL; + goto err_destroy_blocks; } =20 return 0; + +err_destroy_blocks: + while (!list_empty(&file_set->files_list)) { + struct luo_file *luo_file; + + luo_file =3D list_first_entry(&file_set->files_list, + struct luo_file, list); + list_del(&luo_file->list); + module_put(luo_file->fh->ops->owner); + mutex_destroy(&luo_file->mutex); + kfree(luo_file); + } + file_set->count =3D 0; + kho_block_set_destroy(&file_set->block_set); + return err; } =20 void luo_file_set_init(struct luo_file_set *file_set) { INIT_LIST_HEAD(&file_set->files_list); + kho_block_set_init(&file_set->block_set, sizeof(struct luo_file_ser)); } =20 void luo_file_set_destroy(struct luo_file_set *file_set) { WARN_ON(file_set->count); WARN_ON(!list_empty(&file_set->files_list)); + WARN_ON(!kho_block_set_is_empty(&file_set->block_set)); } =20 /** diff --git a/kernel/liveupdate/luo_internal.h b/kernel/liveupdate/luo_inter= nal.h index ee18f9a11b91..64879ffe7378 100644 --- a/kernel/liveupdate/luo_internal.h +++ b/kernel/liveupdate/luo_internal.h @@ -10,6 +10,7 @@ =20 #include #include +#include =20 struct luo_ucmd { void __user *ubuffer; @@ -44,14 +45,13 @@ static inline int luo_ucmd_respond(struct luo_ucmd *ucm= d, * struct luo_file_set - A set of files that belong to the same sessions. * @files_list: An ordered list of files associated with this session, it = is * ordered by preservation time. - * @files: The physically contiguous memory block that holds the seri= alized - * state of files. + * @block_set: The set of serialization blocks. * @count: A counter tracking the number of files currently stored in= the * @files_list for this session. */ struct luo_file_set { struct list_head files_list; - struct luo_file_ser *files; + struct kho_block_set block_set; u64 count; }; =20 --=20 2.53.0 From nobody Mon Jun 8 06:38:43 2026 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE5EB3F4DEC for ; Wed, 3 Jun 2026 03:29:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457365; cv=none; b=HPrHkqrkdQLnjp5nVpu6e4J+6pg6TM1Fc2FclrbB+XnW2KXCmil+V3gc5pUG6sZ+rZiP6HA8APiLFSfZAtdKsV4SchdwhtU786bSMwQQH019/rIBnmQfpg4mtdJkNGib8dq59QkX0lK5mLVajPlQKJpTDJlOhg9qnPMDB03WEXI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457365; c=relaxed/simple; bh=GqAk9WL9MH7rJUNKZjopN3vwXWkbaerKBCceA/gzAA0=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gPJ7f5NOvNkP5H0ZL0uwLbgGl/DisLLB9PBt5z0ZVve/6t82xEvteAcl2cBSA7vQRr3W1pTShvzqFR4qnY5HpWbDLIFmdD9qh5iuGLwkF25DEUZAl38MaIQSNwaTaETpcoFqYxczT7iHaqfxdgsFrgPTOD58KuWRUVh7UGg1hpw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b=XRGUJ0UN; arc=none smtp.client-ip=209.85.219.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="XRGUJ0UN" Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-8ccdf8d4ac5so55654946d6.1 for ; Tue, 02 Jun 2026 20:29:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; t=1780457363; x=1781062163; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=SdAegEf5u3em8MUzB4xyEunyt/xoJrJRQD9FIOINoRs=; b=XRGUJ0UNmoPk6xP3bivJjzDmBze24+arUiWsunPSzKxbhNPP7DEhI/ujxVXhvEjQ0n 6RHOCMyvE5qmschJm5pYqCGh1yzPDToIfIoUN9L1PEqCB/V+vs1MDPzFgSETGD5gEl9b 9lU4Xe7Dpkvi44kz6DA+2C/Iey+k09O3OnHWhdpOz4jM+CUC2v1MwPLyxYxDdBFN7fN2 nY7zBeq+Wtsn0wxaT5k611chqCKpN2ro2R5bLStufRTjtvn+Otww60iiMRwWtbseQgbn 09e+LuEykr6cuxi6Ze1tY4V18M1WDkxEbcZezfzbSraC+OpXc2F/ki4GcNHUhd4pNIud nthg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780457363; x=1781062163; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=SdAegEf5u3em8MUzB4xyEunyt/xoJrJRQD9FIOINoRs=; b=eKQ3Sa94+cidXU1dHbrh8kawxiSefxUo1baSVjkjdN+hzyBJHcoVlo0QiRpyVD1fjH +/FJSko3/MVQdcM8epcL06pUUu0C1xSCcEGB9W5aZQwB4YoL2M6EwACkbYRsFD6c5NfI abIkHGyZ3NtHyQYMNv5q0+pK2yh5rjxMMyYxIEc8e1c+mWdMSgscHEoNAcimXM47ieFv fakf9KJlM9vyqSgERsoPg1dT4UgBJAHLLOrLzmsz56+FDybB/iDjMyLMglL49ahbNnvj 8wP8i0hAGE2oI1z5JkH7sqiJE605SQ5KMOCM1XSzIIpR7uLV2+fDfiVtERtZWcj0rdoN gjDw== X-Forwarded-Encrypted: i=1; AFNElJ+PchQ/UiKUN+9bvBROvVhXPWGbNmUZwgbBNjq6pVLeSg0T/BMA29y6tl7b2OJ2tYOJ6oLlDMi4+TnFWi8=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9Li9/wi4Opg1VVuUn47L/zU9CC93hioQWvm63L6LoYOk0UPz2 jNNwi+HIFb/cP+MfRWxwcs7tJnMsi4CfgyjCqKxkreUqyDzct89u0gH22bG3l/QleGY= X-Gm-Gg: Acq92OF4+fjjF54hkgF3Ahpxg6W8XNZbrvn8B29k9rOkJJelQIMg4E0yhFYae3MEhHo S3gxDlV6rHK+yJUZYUVNK+K2nwVvTu+a4uHnJiVB4w/q1ExryTRrqFpBaz5Wi6JSmgEUOhCS5yU 3+EDhcPJMsP8ZCGYE0vK+T202Zt7QK7y0MeYuq9i3DUtLZZUqhYxxALR1i1fA38VPxz1bANj8CQ KMq9jHMbgvACgLUZ08/WYOEG8Pla8hAntHDahvsp7zVsKDDBeHk1q3T3Ww4Y4i4DJ6knc0SCp8/ v6qCYdRH5XnN0vZuTl525Pa9YbtsSa1QQnMW5TeW9veullYz9EmKKclKbFHgg6HCoJlR8PXocSX Ya6fPG3GAaJ8IFfFREahrwY621u6+rllLdQ5M9or3g6yWtbysuB6Fpn4GtFO3pkq/uAKHOj/Hfi y7cZ1oY8ljcIb6mhOc7gf/WCkBca4w8pxLNU8eVxJNpXQc9cCQQqTys8Rg9Z7rwQ== X-Received: by 2002:a05:6214:4c86:b0:8cc:f354:f47f with SMTP id 6a1803df08f44-8cecdf0ee3emr21236886d6.29.1780457362975; Tue, 02 Jun 2026 20:29:22 -0700 (PDT) Received: from plex ([71.181.43.54]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8cecd26b3b9sm9244566d6.45.2026.06.02.20.29.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 20:29:22 -0700 (PDT) From: Pasha Tatashin To: linux-kselftest@vger.kernel.org, rppt@kernel.org, shuah@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, skhan@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, corbet@lwn.net, pasha.tatashin@soleen.com, dmatlack@google.com, kexec@lists.infradead.org, pratyush@kernel.org, skhawaja@google.com, graf@amazon.com Subject: [PATCH v6 11/13] selftests/liveupdate: Test session and file limit removal Date: Wed, 3 Jun 2026 03:29:02 +0000 Message-ID: <20260603032905.344462-12-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260603032905.344462-1-pasha.tatashin@soleen.com> References: <20260603032905.344462-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" With the removal of static limits on the number of sessions and files per session, the orchestrator now uses dynamic allocation. Add new test cases to verify that the system can handle a large number of sessions and files. These tests ensure that the dynamic block allocation and reuse logic for session metadata and outgoing files work correctly beyond the previous static limits. Acked-by: Mike Rapoport (Microsoft) Reviewed-by: Pratyush Yadav (Google) Signed-off-by: Pasha Tatashin --- .../testing/selftests/liveupdate/liveupdate.c | 75 +++++++++++++++++++ .../selftests/liveupdate/luo_test_utils.c | 24 ++++++ .../selftests/liveupdate/luo_test_utils.h | 2 + 3 files changed, 101 insertions(+) diff --git a/tools/testing/selftests/liveupdate/liveupdate.c b/tools/testin= g/selftests/liveupdate/liveupdate.c index c7d94b9181e1..502fb3567e38 100644 --- a/tools/testing/selftests/liveupdate/liveupdate.c +++ b/tools/testing/selftests/liveupdate/liveupdate.c @@ -26,6 +26,7 @@ =20 #include =20 +#include "luo_test_utils.h" #include "../kselftest.h" #include "../kselftest_harness.h" =20 @@ -499,4 +500,78 @@ TEST_F(liveupdate_device, get_session_name_max_length) ASSERT_EQ(close(session_fd), 0); } =20 +/* + * Test Case: Manage Many Sessions + * + * Verifies that a large number of sessions can be created and then + * destroyed during normal system operation. This specifically tests the + * dynamic block allocation and reuse logic for session metadata management + * without preserving any files. + */ +TEST_F(liveupdate_device, preserve_many_sessions) +{ +#define MANY_SESSIONS 2000 + int session_fds[MANY_SESSIONS]; + int ret, i; + + self->fd1 =3D open(LIVEUPDATE_DEV, O_RDWR); + if (self->fd1 < 0 && errno =3D=3D ENOENT) + SKIP(return, "%s does not exist", LIVEUPDATE_DEV); + ASSERT_GE(self->fd1, 0); + + ret =3D luo_ensure_nofile_limit(MANY_SESSIONS); + if (ret =3D=3D -EPERM) + SKIP(return, "Insufficient privileges to set RLIMIT_NOFILE"); + ASSERT_EQ(ret, 0); + + for (i =3D 0; i < MANY_SESSIONS; i++) { + char name[64]; + + snprintf(name, sizeof(name), "many-session-%d", i); + session_fds[i] =3D create_session(self->fd1, name); + ASSERT_GE(session_fds[i], 0); + } + + for (i =3D 0; i < MANY_SESSIONS; i++) + ASSERT_EQ(close(session_fds[i]), 0); +} + +/* + * Test Case: Preserve Many Files + * + * Verifies that a large number of files can be preserved in a single sess= ion + * and then destroyed during normal system operation. This tests the dynam= ic + * block allocation and management for outgoing files. + */ +TEST_F(liveupdate_device, preserve_many_files) +{ +#define MANY_FILES 500 + int mem_fds[MANY_FILES]; + int session_fd, ret, i; + + self->fd1 =3D open(LIVEUPDATE_DEV, O_RDWR); + if (self->fd1 < 0 && errno =3D=3D ENOENT) + SKIP(return, "%s does not exist", LIVEUPDATE_DEV); + ASSERT_GE(self->fd1, 0); + + session_fd =3D create_session(self->fd1, "many-files-test"); + ASSERT_GE(session_fd, 0); + + ret =3D luo_ensure_nofile_limit(MANY_FILES + 10); + if (ret =3D=3D -EPERM) + SKIP(return, "Insufficient privileges to set RLIMIT_NOFILE"); + ASSERT_EQ(ret, 0); + + for (i =3D 0; i < MANY_FILES; i++) { + mem_fds[i] =3D memfd_create("test-memfd", 0); + ASSERT_GE(mem_fds[i], 0); + ASSERT_EQ(preserve_fd(session_fd, mem_fds[i], i), 0); + } + + for (i =3D 0; i < MANY_FILES; i++) + ASSERT_EQ(close(mem_fds[i]), 0); + + ASSERT_EQ(close(session_fd), 0); +} + TEST_HARNESS_MAIN diff --git a/tools/testing/selftests/liveupdate/luo_test_utils.c b/tools/te= sting/selftests/liveupdate/luo_test_utils.c index 3c8721c505df..333a3530051b 100644 --- a/tools/testing/selftests/liveupdate/luo_test_utils.c +++ b/tools/testing/selftests/liveupdate/luo_test_utils.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -28,6 +29,29 @@ int luo_open_device(void) return open(LUO_DEVICE, O_RDWR); } =20 +int luo_ensure_nofile_limit(long min_limit) +{ + struct rlimit hl; + + /* Allow to extra files to be used by test itself */ + min_limit +=3D 32; + + if (getrlimit(RLIMIT_NOFILE, &hl) < 0) + return -errno; + + if (hl.rlim_cur >=3D min_limit) + return 0; + + hl.rlim_cur =3D min_limit; + if (hl.rlim_cur > hl.rlim_max) + hl.rlim_max =3D hl.rlim_cur; + + if (setrlimit(RLIMIT_NOFILE, &hl) < 0) + return -errno; + + return 0; +} + int luo_create_session(int luo_fd, const char *name) { struct liveupdate_ioctl_create_session arg =3D { .size =3D sizeof(arg) }; diff --git a/tools/testing/selftests/liveupdate/luo_test_utils.h b/tools/te= sting/selftests/liveupdate/luo_test_utils.h index 90099bf49577..6a0d85386613 100644 --- a/tools/testing/selftests/liveupdate/luo_test_utils.h +++ b/tools/testing/selftests/liveupdate/luo_test_utils.h @@ -26,6 +26,8 @@ int luo_create_session(int luo_fd, const char *name); int luo_retrieve_session(int luo_fd, const char *name); int luo_session_finish(int session_fd); =20 +int luo_ensure_nofile_limit(long min_limit); + int create_and_preserve_memfd(int session_fd, int token, const char *data); int restore_and_verify_memfd(int session_fd, int token, const char *expect= ed_data); =20 --=20 2.53.0 From nobody Mon Jun 8 06:38:43 2026 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6AE2B3FE363 for ; Wed, 3 Jun 2026 03:29:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457367; cv=none; b=PSI4PckoTkfJhs9jdM5sk42/HhCCEq8s+EG7GmlinshzS5uoInPsP8pEa6seVCZ4aVdvVVMVMxkhsXNwTvyMpcqKJZjTfDRdoqKCGTzVgCF+oshhz7t1zLesuYm3avE+z0sgO9dxfa4wDY9/oHKZuKJDKW0Kl/vpTSCqLzX/CkQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457367; c=relaxed/simple; bh=zVenBMcmRxURhVBZmDsLf2LabKQiVm7GKN1LU8rMyS8=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CsAg5WHcReUz8TY38VjcRt1ON9lYN3TAKGRiiz2pzfVWiQUOnsJOts4Qs/nJzBlrboyaAOihvsKdQC0U+H6KeMhmcDbvXJK8VXYu/FO9HXFLOPsyvhB5+bnyrujlAh4z2nsWu7V/N4laXy6zsYfRs8NsSEo5kwu8HWx7iZYy6a4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b=XcFBWTb6; arc=none smtp.client-ip=209.85.219.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="XcFBWTb6" Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-8ccf18ef922so54915266d6.3 for ; Tue, 02 Jun 2026 20:29:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; t=1780457364; x=1781062164; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=psMAwGaqe9xuyJY3Mn283ARVP/GQQXmgr+1HpWpGRKs=; b=XcFBWTb6hZQAhAjn3K7CmzlQYZ5HKzAUaHLOiOssReJ0XjOKQgMHVQ3rWuLRdUIchY fd2DnWuCLs5nnFQmy1hQArIIz3+b+4Mf3uWwkpqEQ7cq5+X86qKsDUQep7Jm1mU4xRrT Su57PCruJvvsWIE7F9ajNVNJ5m/gzrUa7VhLAN4c0Ag2Ik4tXKGdsC74wYcGnQkLWGzc nC6N406w2XsG5h4c2dbTfp7VVkallWqNnIx8R9zdwqs2GSqcg47tNfYUnjPv+9eUavbq M0UYlj0yuKAo5F1muDoCnCB5NrEXqzvHJyeiJd7FMIKuoGup6HBqR9s3rljRyNw6zT1g s5cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780457364; x=1781062164; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=psMAwGaqe9xuyJY3Mn283ARVP/GQQXmgr+1HpWpGRKs=; b=BSgkiF7w90TlXbOle1htqrENLliJ8g/52gEjDk34Ifv0IdJdEZ21ifW2dbZD7YoD/E IJ0B12FWQRk1hxBBog34LnruRvvWu14pTE0QCSFGHXYEqIr+CXJaBE3Lo7elPerzoYiO cdQB9gq4o+8pjkVMN5xHZ5iA1AzpTp8Sppjf0pDW8prbt14xxoenghuiCl+xnF2DuVFK umX32+xW1ci11DFLOll35oyYxtoY8jduZz5t/hoeA9zooQVwlHCCvaRPezH9LD6JYbhM vH0ioNRnpUrbqNVIhQqo0bvC3N6L/r6x1xblnxQ7kWVvzRqsVdTI/7Kl2aca11/TP/dz kwxQ== X-Forwarded-Encrypted: i=1; AFNElJ/NJ9K7FeEi0vLW0UtWTZeTqKam6FUQNgp1YdPGPEY4z8ze8vDtcoZa/8C0IeoeBLOscecMAoUPkvBfQIQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5+s5/FYz2wwf27AiwvSJS1C20Z+hNR5k/AaQ+8NCqK3MecqE8 GE9+hdVgFY+oLszs3DywjLX2o3zDOKBV6TWo6LkHm9P5uC/SGEebQ2dGUrzyYx1gDdM= X-Gm-Gg: Acq92OE8M489vHXzsHXVJUmSqmAuMhWKbgK34lPkvs2eBrvXvJRwsyYLth/A4eguRME z5JYUPIKCIAG19vZb+cuUyywfxcxvmxSrmSe3jpuRlzhIUnlBOAseSaGv1uOHG95qtFjQA7qEFW /LKAGCvmckNk8n1i0r0+veSOHCka4hmbd7qyN3pmYVXNk1iAI8UcsVlpXzk0wP1dTcj1gmQDbVA LfqevRN1ncRg1VDC0Lp6NsvqEdXuOGMMVhS0B+zCMt9WcOV5ibvBvhoFXpwSfWU/6TDs94waF5D xdzWpCacHKljDT8nqo+BhaWS5+Q+BbZWPqh8jkMhDDn0vvvQx7aO6HG9GPUOCm+CN/xV/aEw+ap 5PP66PKmvQtO77gexjRhxT89LaJvmBLJQySLKO2ByvNAEemCS8WJaGwheu2wTCTdJzOEd6jZd3g 727DjdD9EGaDtA08kJW6cMNEHQGgy5hup50ZKeDEuSj/xE6yXTVYPU91MYQfTFwO1VPZWGpmOt X-Received: by 2002:ad4:5044:0:b0:8bd:59a6:4165 with SMTP id 6a1803df08f44-8cecdc04bc1mr16915496d6.4.1780457364532; Tue, 02 Jun 2026 20:29:24 -0700 (PDT) Received: from plex ([71.181.43.54]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8cecd26b3b9sm9244566d6.45.2026.06.02.20.29.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 20:29:23 -0700 (PDT) From: Pasha Tatashin To: linux-kselftest@vger.kernel.org, rppt@kernel.org, shuah@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, skhan@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, corbet@lwn.net, pasha.tatashin@soleen.com, dmatlack@google.com, kexec@lists.infradead.org, pratyush@kernel.org, skhawaja@google.com, graf@amazon.com Subject: [PATCH v6 12/13] selftests/liveupdate: Add stress-sessions kexec test Date: Wed, 3 Jun 2026 03:29:03 +0000 Message-ID: <20260603032905.344462-13-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260603032905.344462-1-pasha.tatashin@soleen.com> References: <20260603032905.344462-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a new test that creates 2000 LUO sessions before a kexec reboot and verifies their presence after the reboot. This ensures that the linked-block serialization mechanism works correctly for a large number of sessions. Acked-by: Mike Rapoport (Microsoft) Reviewed-by: Pratyush Yadav (Google) Signed-off-by: Pasha Tatashin --- tools/testing/selftests/liveupdate/Makefile | 1 + .../liveupdate/luo_stress_sessions.c | 102 ++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 tools/testing/selftests/liveupdate/luo_stress_sessions.c diff --git a/tools/testing/selftests/liveupdate/Makefile b/tools/testing/se= lftests/liveupdate/Makefile index 080754787ede..ed7534468386 100644 --- a/tools/testing/selftests/liveupdate/Makefile +++ b/tools/testing/selftests/liveupdate/Makefile @@ -6,6 +6,7 @@ TEST_GEN_PROGS +=3D liveupdate =20 TEST_GEN_PROGS_EXTENDED +=3D luo_kexec_simple TEST_GEN_PROGS_EXTENDED +=3D luo_multi_session +TEST_GEN_PROGS_EXTENDED +=3D luo_stress_sessions =20 TEST_FILES +=3D do_kexec.sh =20 diff --git a/tools/testing/selftests/liveupdate/luo_stress_sessions.c b/too= ls/testing/selftests/liveupdate/luo_stress_sessions.c new file mode 100644 index 000000000000..f201b1839d1d --- /dev/null +++ b/tools/testing/selftests/liveupdate/luo_stress_sessions.c @@ -0,0 +1,102 @@ +// SPDX-License-Identifier: GPL-2.0-only + +/* + * Copyright (c) 2026, Google LLC. + * Pasha Tatashin + * + * Validate that LUO can handle a large number of sessions across a kexec + * reboot. + */ + +#include +#include +#include "luo_test_utils.h" + +#define NUM_SESSIONS 2000 +#define STATE_SESSION_NAME "kexec_many_state" +#define STATE_MEMFD_TOKEN 999 + +/* Stage 1: Executed before the kexec reboot. */ +static void run_stage_1(int luo_fd) +{ + int ret, i; + + ksft_print_msg("[STAGE 1] Increasing ulimit for open files...\n"); + ret =3D luo_ensure_nofile_limit(NUM_SESSIONS); + if (ret =3D=3D -EPERM) + ksft_exit_skip("Insufficient privileges to set RLIMIT_NOFILE\n"); + if (ret < 0) + ksft_exit_fail_msg("luo_ensure_nofile_limit failed: %s\n", strerror(-ret= )); + + ksft_print_msg("[STAGE 1] Creating state file for next stage (2)...\n"); + create_state_file(luo_fd, STATE_SESSION_NAME, STATE_MEMFD_TOKEN, 2); + + ksft_print_msg("[STAGE 1] Creating %d sessions...\n", NUM_SESSIONS); + + for (i =3D 0; i < NUM_SESSIONS; i++) { + char name[LIVEUPDATE_SESSION_NAME_LENGTH]; + int s_fd; + + snprintf(name, sizeof(name), "many-test-%d", i); + s_fd =3D luo_create_session(luo_fd, name); + if (s_fd < 0) { + fail_exit("luo_create_session for '%s' at index %d", + name, i); + } + } + + ksft_print_msg("[STAGE 1] Successfully created %d sessions.\n", + NUM_SESSIONS); + + close(luo_fd); + daemonize_and_wait(); +} + +/* Stage 2: Executed after the kexec reboot. */ +static void run_stage_2(int luo_fd, int state_session_fd) +{ + int i, stage; + + ksft_print_msg("[STAGE 2] Starting post-kexec verification...\n"); + + restore_and_read_stage(state_session_fd, STATE_MEMFD_TOKEN, &stage); + if (stage !=3D 2) { + fail_exit("Expected stage 2, but state file contains %d", + stage); + } + + ksft_print_msg("[STAGE 2] Retrieving and finishing %d sessions...\n", + NUM_SESSIONS); + + for (i =3D 0; i < NUM_SESSIONS; i++) { + char name[LIVEUPDATE_SESSION_NAME_LENGTH]; + int s_fd; + + snprintf(name, sizeof(name), "many-test-%d", i); + s_fd =3D luo_retrieve_session(luo_fd, name); + if (s_fd < 0) { + fail_exit("luo_retrieve_session for '%s' at index %d", + name, i); + } + + if (luo_session_finish(s_fd) < 0) { + fail_exit("luo_session_finish for '%s' at index %d", + name, i); + } + close(s_fd); + } + + ksft_print_msg("[STAGE 2] Finalizing state session...\n"); + if (luo_session_finish(state_session_fd) < 0) + fail_exit("luo_session_finish for state session"); + close(state_session_fd); + + ksft_print_msg("\n--- MANY-SESSIONS KEXEC TEST PASSED (%d sessions) ---\n= ", + NUM_SESSIONS); +} + +int main(int argc, char *argv[]) +{ + return luo_test(argc, argv, STATE_SESSION_NAME, + run_stage_1, run_stage_2); +} --=20 2.53.0 From nobody Mon Jun 8 06:38:43 2026 Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0CFB3FE662 for ; Wed, 3 Jun 2026 03:29:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457369; cv=none; b=HOVx2lfXbMLyJlBublPoFUIy3jy4g8VrOOxd9FRSZIRfBk0+uVSpDyKL+uIs1QFyvr0UzSzz0jCMGB4dfy2o4xLzAsi6Ljge9R9gifCGA0HFovEG/SIDpJobc554LzieBewz1L/uS70oQrJLtIIKF//5tG+3XfXZf2lL/grsme8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780457369; c=relaxed/simple; bh=PI26M0khAE7StCXBHeuwdUicbhLFrZpiZfsokDq9n88=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y9StZuhoNwozUcgWR8VNihhfOD7tQMe+vjSKWrjt3tYmGJQZp6/hpG+kS1iHi+DUp+O6RHmtOBYFgsD9y11Eh27i2EdNw9c7hVGOUI5hYeICW5sDMqB9RSof776FwojG8kpEu6Dfo9/mJXiaxaW6nArbSAJD+DArwgwqQi6DzKQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b=H3gBJSfy; arc=none smtp.client-ip=209.85.219.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="H3gBJSfy" Received: by mail-qv1-f54.google.com with SMTP id 6a1803df08f44-8ccedaf0b54so27715116d6.0 for ; Tue, 02 Jun 2026 20:29:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; t=1780457366; x=1781062166; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LZ44uuKaEudMkx03Nujcoh6Uuv+6Qpcd4aVYSw8wkq4=; b=H3gBJSfyhNg/d6xu8tLy3zhPjq0CIcVT/vNWBe0DuibKH55/qS4e6LLCg+5zeqDmhR hhwZQIsVo57hM55ZQDivV6QthQNfw6vBcVPhYuUS7p8LAiYLOE6N/cGo6VOaJ6epJPgU 0wCwLZcspfeG20llEo2UvjtXyGe3J/5zBiPPolqLtA6J8xbD9wZeseSIW0sC2K+cs47z CxuvDvrCq4BiuXhYBof1v6DlVLI+JpGuVPPDiczcylwEmSjiay76x8Ax1qSl5eoUqHbL FgkfC+fYpuMSDtd2RcKttTwoU7FMSUgarS6naaReiZmhx5didspEY4QLcu+jFsE06j9R NVXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780457366; x=1781062166; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=LZ44uuKaEudMkx03Nujcoh6Uuv+6Qpcd4aVYSw8wkq4=; b=KGjvpP0zOxL2IcAx+NYyYVx9mkyijDn32j12WyNMaDCfEg0vrAbZzYWUy2KrzlsIUT +bZy3kx8dR2yKm/9TcvRVj6xPa2Wsl8aAhe5LRdJkzgPvrOceLmtrqIk3KN3QWv/8pO9 4kmg6TYPQwB5C2l6HDzyrgOKmSc+UOdIbs/cUNEBQestb9HuS9raTWeoA+NKV1G9k4LO tWI0+WU7k9np6S1owZT3ExmcgeFYN0cddHVICYIdwJ0JAe/c3x/L46hNKYp/FtFTyWgP aqUcY4RgCp4VBjHR4fQqpVyqe04EXIBv3VUdXFpt+JkfJLv67SdVMorW2XntT9IdL9Kf 1AVw== X-Forwarded-Encrypted: i=1; AFNElJ9LnMG1h5S0V/GOlcXgeDfG6oL48tjekS27Rj5PEKLRAHh3vB39AGoC3MF2oQXuP/HQr/BsqERm5m+sAec=@vger.kernel.org X-Gm-Message-State: AOJu0YyGsks2B2kbw2gkaBjM/BUtE+qgGMcipDdi31WCItiAxLWHe3hH pEp1rpTe+oT95zlfmP1co66Jmxpy9QbBJ99qbjGffbwXXFYmaWEJVxen1AwSMAasc34= X-Gm-Gg: Acq92OEb7Sq8XTWmNsbMy34+cNmHFurePrXrA9OTeKoG1jQaeOdsbCheV5l90KtpSAZ Tl0G/ISHDEM6E1sB+y3kogIpmwdFOE0tTq7JuHHztcyKjIYSAL70NKM3Kir8UN+cNdd2NUWTqCW DqGIiEUYcgLlz2fyzbrTyFX2H4S4AVsNVDTmDNycJY/R+3ySwnKL2BGIF1n5vPNXUntK3PAaRhi domYpCqaeY6feOqTssdwZginbwR2cVXHwY1fdwa/JjNI2uwo1ElnlDVtGHUArx1gR/bnEDsbvl4 T+zJPXi0zKaNIQ2nHfQ20AAqwU0FIwZaIWb7P79HmJXZKcpqxNYT5fuPup3Mj0w2B5L1Et+juya BNHZk/PI9DBiwsb4kvL7Fqmpska4Q3IHjBM+Hght4/nCwbPnKtWx8WakqPhZXXv7yH4vu9LPMK/ YS2jbMc+PsA6t6SasqLGqi8vswYK/EmXi07axrC0NDqWVWBtLIsg20U6VihCm4WQ== X-Received: by 2002:a05:6214:500e:b0:8a0:4e92:c45f with SMTP id 6a1803df08f44-8cecdc18097mr21849986d6.11.1780457365747; Tue, 02 Jun 2026 20:29:25 -0700 (PDT) Received: from plex ([71.181.43.54]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8cecd26b3b9sm9244566d6.45.2026.06.02.20.29.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 20:29:25 -0700 (PDT) From: Pasha Tatashin To: linux-kselftest@vger.kernel.org, rppt@kernel.org, shuah@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, skhan@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, corbet@lwn.net, pasha.tatashin@soleen.com, dmatlack@google.com, kexec@lists.infradead.org, pratyush@kernel.org, skhawaja@google.com, graf@amazon.com Subject: [PATCH v6 13/13] selftests/liveupdate: Add stress-files kexec test Date: Wed, 3 Jun 2026 03:29:04 +0000 Message-ID: <20260603032905.344462-14-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260603032905.344462-1-pasha.tatashin@soleen.com> References: <20260603032905.344462-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a new luo_stress_files kexec test that verifies preserving and retrieving 500 files across a kexec reboot. Reviewed-by: Pratyush Yadav (Google) Acked-by: Mike Rapoport (Microsoft) Signed-off-by: Pasha Tatashin --- tools/testing/selftests/liveupdate/Makefile | 1 + .../selftests/liveupdate/luo_stress_files.c | 97 +++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 tools/testing/selftests/liveupdate/luo_stress_files.c diff --git a/tools/testing/selftests/liveupdate/Makefile b/tools/testing/se= lftests/liveupdate/Makefile index ed7534468386..30689d22cb02 100644 --- a/tools/testing/selftests/liveupdate/Makefile +++ b/tools/testing/selftests/liveupdate/Makefile @@ -7,6 +7,7 @@ TEST_GEN_PROGS +=3D liveupdate TEST_GEN_PROGS_EXTENDED +=3D luo_kexec_simple TEST_GEN_PROGS_EXTENDED +=3D luo_multi_session TEST_GEN_PROGS_EXTENDED +=3D luo_stress_sessions +TEST_GEN_PROGS_EXTENDED +=3D luo_stress_files =20 TEST_FILES +=3D do_kexec.sh =20 diff --git a/tools/testing/selftests/liveupdate/luo_stress_files.c b/tools/= testing/selftests/liveupdate/luo_stress_files.c new file mode 100644 index 000000000000..0cdf9cd4bac7 --- /dev/null +++ b/tools/testing/selftests/liveupdate/luo_stress_files.c @@ -0,0 +1,97 @@ +// SPDX-License-Identifier: GPL-2.0-only + +/* + * Copyright (c) 2026, Google LLC. + * Pasha Tatashin + * + * Validate that LUO can handle a large number of files per session across + * a kexec reboot. + */ + +#include +#include +#include "luo_test_utils.h" + +#define NUM_FILES 500 +#define STATE_SESSION_NAME "kexec_many_files_state" +#define STATE_MEMFD_TOKEN 9999 +#define TEST_SESSION_NAME "many_files_session" + +/* Stage 1: Executed before the kexec reboot. */ +static void run_stage_1(int luo_fd) +{ + int session_fd, i; + + ksft_print_msg("[STAGE 1] Creating state file for next stage (2)...\n"); + create_state_file(luo_fd, STATE_SESSION_NAME, STATE_MEMFD_TOKEN, 2); + + ksft_print_msg("[STAGE 1] Creating test session '%s'...\n", TEST_SESSION_= NAME); + session_fd =3D luo_create_session(luo_fd, TEST_SESSION_NAME); + if (session_fd < 0) + fail_exit("luo_create_session"); + + ksft_print_msg("[STAGE 1] Preserving %d files...\n", NUM_FILES); + for (i =3D 0; i < NUM_FILES; i++) { + char data[64]; + + snprintf(data, sizeof(data), "file-data-%d", i); + if (create_and_preserve_memfd(session_fd, i, data) < 0) + fail_exit("create_and_preserve_memfd for index %d", i); + } + + ksft_print_msg("[STAGE 1] Successfully preserved %d files.\n", NUM_FILES); + + close(luo_fd); + daemonize_and_wait(); +} + +/* Stage 2: Executed after the kexec reboot. */ +static void run_stage_2(int luo_fd, int state_session_fd) +{ + int session_fd; + int i, stage; + + ksft_print_msg("[STAGE 2] Starting post-kexec verification...\n"); + + restore_and_read_stage(state_session_fd, STATE_MEMFD_TOKEN, &stage); + if (stage !=3D 2) { + fail_exit("Expected stage 2, but state file contains %d", + stage); + } + + ksft_print_msg("[STAGE 2] Retrieving test session '%s'...\n", TEST_SESSIO= N_NAME); + session_fd =3D luo_retrieve_session(luo_fd, TEST_SESSION_NAME); + if (session_fd < 0) + fail_exit("luo_retrieve_session"); + + ksft_print_msg("[STAGE 2] Verifying %d files...\n", NUM_FILES); + for (i =3D 0; i < NUM_FILES; i++) { + char data[64]; + int fd; + + snprintf(data, sizeof(data), "file-data-%d", i); + fd =3D restore_and_verify_memfd(session_fd, i, data); + if (fd < 0) + fail_exit("restore_and_verify_memfd for index %d", i); + close(fd); + } + + ksft_print_msg("[STAGE 2] Finishing test session...\n"); + if (luo_session_finish(session_fd) < 0) + fail_exit("luo_session_finish for test session"); + close(session_fd); + + ksft_print_msg("[STAGE 2] Finalizing state session...\n"); + if (luo_session_finish(state_session_fd) < 0) + fail_exit("luo_session_finish for state session"); + close(state_session_fd); + + ksft_print_msg("\n--- MANY-FILES KEXEC TEST PASSED (%d files) ---\n", + NUM_FILES); +} + +int main(int argc, char *argv[]) +{ + return luo_test(argc, argv, STATE_SESSION_NAME, + run_stage_1, run_stage_2); +} --=20 2.53.0