From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.210.199 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792709442; b=ZlO4/jaW4oA0RewBl4XAv6L138KrS/JBJJ47dkQ9pUyenSDJso69OJpW+m+nVCkaG5pg 35+h8eW3ci2z5jKKYIVFC2OzIKLO5QYqnsyU4JTxOTQBxtURGIJtcmC1DdQ7VphOCsjZf dHz+aHF36QQJ4yma1Zi3v+GIs/wmkh87gsVNYBCUaQQEUnFKU6Fe21cdt3xPxeogBMcRa 2zOR5Zma41aF2VydlQL/TT3bDy/yfevV/ubvqDQbgaZqg904ENUEPJ1Vuv1gJHyj2d21V SyuBJl7VM6uuIVKdNZ9QPkl5cLi0xsAjDGS0As1zugOhirWTnYYluCgxDuCG55GX+QA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792709442; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=ZxtqEGpizmVFkbAIWqB2ioSJ0+pXS1WhHyAhjSgL0fY=; b=TFXIhSJ7x26nfFu55mi1Gr0tiIQ8JJ23+Og4c+2Ebgt/KpPgDSGFDiO6V2FeJveUKIwz tH3vA7mpVcmHithp2ld3Kh3BmKYLjGLxXrSchAztRb5XnTZ5C4Tle35WYWFb79kP7l/aO KRF2o5baBNAKy08w9cwqbhfQDWFsv6Mo4Ko66U+BaFXJk7r1DeJGZXbavTb+gXSxo2aeh 2ybQ/84Urq6ugnoYrOxpkSSgclr3yHD5EDAYZVf1vxwmjxFOZHX668YQAxSDISyGJ78Ds Q3tIBcTU9CrSHvjPio9EyyOe0tVyUkbyIGOQ4m2uvRLL5XJ0t8wO4x9tsuIpiCA2hrQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--dmatlack.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20251104 header.b=hkeCY4Qr; arc=none smtp.remote-ip=209.85.210.199 Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B4AC606A327 for ; Thu, 22 Oct 2026 22:50:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 9B4AC606A327 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--dmatlack.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20251104 header.b=hkeCY4Qr Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-89fb6a45c48so328973b3a.1 for ; Thu, 22 Oct 2026 15:50:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1792709441; x=1793314241; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=ZxtqEGpizmVFkbAIWqB2ioSJ0+pXS1WhHyAhjSgL0fY=; b=hkeCY4QrUPcOu9aMlXEYsLJQSYbxfMCMPafVHxp/qBQ81RyHK30g0dAPN/zMMo6hs2 +Noop33mrk2ImIlprjdjS+XqW/bcfzHTTJKcb+Qv0ymddJzDBGZ1KYzsGC/LyIZjcHE8 706ymBYNvn7SQITqBHbI21nq7Zvi118rzHqCP4e17M2KS7GR0DWbwmrjGnjZzZ/Gu+ZA ELd9RKf9vpJ9/YDuI3bADAD/holClohd5eJPHwwt/hDYGYSV1xjXxUivDSpvvFWsfXHu lwYF4KDyxeNRgpfjt4fsVEBatsp+6SbLH1h14yYzCVs4HwxdeoIuobGJX7z9uGo6b+Cm T9gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792709441; x=1793314241; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ZxtqEGpizmVFkbAIWqB2ioSJ0+pXS1WhHyAhjSgL0fY=; b=bIF50e+zGmmV1bhkjUQdmI9gLWHdu2ur4Y6s2kTZhjzNWKDzua1P2Zn5o0q8apbxEB IYb2zdKrSc8S7Tp0eH2i52goaYtMQ3a8BPbGBTzYLe3Fl96+BdK7ew90trNgJpSY9PgE 2Gtgos516mhiOxTcnNklBB/qY281pR3sktd+x8XrwHojKSMbuST4Uqp/3opmN039Z7oy WjJvGGy4IVY5n/pmwcYVWZhZDkPAUJpUwXKzSlN6h+NKSAqQOr96S7DLBxDY7/rj0fxy mJDKS5luadchl0dBwG/ilcQS+7xxtp4M3F+PXqod4f/tYDQDMPl/67+x8kitH9kj2plC jFSA== X-Forwarded-Encrypted: i=1; AKwUvByLH0HKSW1QrhQQStam4DDGVSr1+KElUgQ+WyDxwclw72kzsvJ4QEvSWDMlXEVwbjRj3g9iomxtNCiMyU14dUc=@vger.kernel.org X-Gm-Message-State: AFq9FYKb+Bs5bORbmTBsMby8COPUaLLsnH4Q48naXL4HdNWcgRYuRw2T Umw4/FWUAdZEFx45ZJeamqzUPWG47R3Xk/xihJzt11qHDNAbeULRA+5pBysIHLag6mthEzE+Fzf krl58JzbNTr7TDg== X-Received: from pgfd7-n1.prod.google.com ([2002:a05:6a02:6547:10b0:cc7:d1fb:4ccd]) (user=dmatlack job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:d81a:b0:3e2:6825:beec with SMTP id adf61e73a8af0-3e369227d0bmr279978637.19.1792709440800; Thu, 22 Oct 2026 15:50:40 -0700 (PDT) Date: Thu, 22 Oct 2026 22:50:28 +0000 In-Reply-To: <20261022225035.377445-1-dmatlack@google.com> X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261022225035.377445-1-dmatlack@google.com> X-Mailer: git-send-email 2.56.0.257.gf7497c7d27-goog Message-ID: <20261022225035.377445-4-dmatlack@google.com> Subject: [PATCH v2 03/10] liveupdate: Allow file handlers to mark retrieve failures as retryable From: David Matlack To: kexec@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org Cc: Alexander Graf , Andrew Morton , Baolin Wang , Christian Brauner , David Hildenbrand , Hugh Dickins , Jonathan Corbet , "Liam R. Howlett" , Lorenzo Stoakes , Michal Hocko , Mike Rapoport , Pasha Tatashin , Pratyush Yadav , Randy Dunlap , Samiullah Khawaja , Shuah Khan , Suren Baghdasaryan , Vlastimil Babka , David Matlack Content-Type: text/plain; charset="UTF-8" From: Pasha Tatashin When luo_retrieve_file() invokes a handler's .retrieve() callback and it returns an error, LUO currently records the error in luo_file->retrieve_status and blocks any subsequent retrieve attempts. This is necessary when the handler has already partially consumed or freed the preserved KHO state. However, with user arguments passed to .retrieve(), a handler may fail early while validating caller-supplied parameters (such as a missing argument, an invalid or read-only target file descriptor, or a non-empty target file) before touching any preserved KHO state. In such cases, userspace should be able to fix the argument and retry LIVEUPDATE_SESSION_RETRIEVE_FD, and if the file is never retrieved, .finish() must still run to release the preserved KHO state. Add a retryable output flag to struct liveupdate_file_op_args. When a handler sets args->retryable = true on error, luo_retrieve_file() leaves luo_file->retrieve_status at 0 so the retrieve operation can be retried and .finish() will still clean up the unconsumed preserved state if the session is finished without retrieving the file. Signed-off-by: Pasha Tatashin Signed-off-by: David Matlack --- include/linux/liveupdate.h | 11 ++++++++--- include/uapi/linux/liveupdate.h | 7 ++++--- kernel/liveupdate/luo_file.c | 20 ++++++++++++++------ 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/include/linux/liveupdate.h b/include/linux/liveupdate.h index 7543f5d648d3..e4ad0bf78a5c 100644 --- a/include/linux/liveupdate.h +++ b/include/linux/liveupdate.h @@ -58,9 +58,13 @@ struct liveupdate_arg_spec { * @session: The session this file belongs to. * @retrieve_status: The retrieve status for the 'can_finish / finish' * operation. A value of 0 means the retrieve has not been - * attempted, a positive value means the retrieve was - * successful, and a negative value means the retrieve failed, - * and the value is the error code of the call. + * attempted (or only failed with a retryable error), a + * positive value means the retrieve was successful, and a + * negative value means the retrieve permanently failed, and + * the value is the error code of the call. + * @retryable: For .retrieve(): [OUT] Set to true by the callback on + * error when the preserved state has not been consumed and + * retrieval may be retried. * @file: The file object. For retrieve: [OUT] The callback sets * this to the new file. For other ops: [IN] The caller sets * this to the file being operated on. @@ -83,6 +87,7 @@ struct liveupdate_file_op_args { struct liveupdate_file_handler *handler; struct liveupdate_session *session; int retrieve_status; + bool retryable; struct file *file; u64 serialized_data; void *private_data; diff --git a/include/uapi/linux/liveupdate.h b/include/uapi/linux/liveupdate.h index e806752c2fc6..953ffe0823be 100644 --- a/include/uapi/linux/liveupdate.h +++ b/include/uapi/linux/liveupdate.h @@ -174,9 +174,10 @@ struct liveupdate_session_preserve_fd { * associated with the token and populates the @fd field with a new file * descriptor referencing the restored resource in the current (new) kernel. * This operation must be performed *before* signaling completion via - * %LIVEUPDATE_IOCTL_FINISH. If a retrieve of a token fails, subsequent - * attempts to retrieve the token fail with the same error code. Failed - * retrieves are not retried. + * %LIVEUPDATE_IOCTL_FINISH. If a retrieve of a token fails after consuming + * preserved state, subsequent attempts to retrieve the token fail with the + * same error code. Early argument or target validation errors before + * preserved state is consumed leave the token intact and may be retried. * * Retrieving a token that was already retrieved successfully returns a new file * descriptor for the same file. The @arg only applies to the retrieve that diff --git a/kernel/liveupdate/luo_file.c b/kernel/liveupdate/luo_file.c index eeeb3b5ff2fa..908ae124ea5e 100644 --- a/kernel/liveupdate/luo_file.c +++ b/kernel/liveupdate/luo_file.c @@ -152,9 +152,10 @@ static DEFINE_XARRAY(luo_preserved_files); * @retrieve_status: Status code indicating whether a user/kernel in the new kernel has * successfully called retrieve() on this file. This prevents * multiple retrieval attempts. A value of 0 means a retrieve() - * has not been attempted, a positive value means the retrieve() - * was successful, and a negative value means the retrieve() - * failed, and the value is the error code of the call. + * has not been attempted (or only failed with a retryable + * error), a positive value means the retrieve() was successful, + * and a negative value means the retrieve() permanently failed, + * and the value is the error code of the call. * @mutex: A mutex that protects the fields of this specific instance * (e.g., @retrieved, @file), ensuring that operations like * retrieving or finishing a file are atomic. @@ -604,7 +605,9 @@ void luo_file_unfreeze(struct luo_file_set *file_set, * The operation is idempotent: if a file has already been successfully * retrieved, this function will simply return a pointer to the existing * 'struct file' and report success without re-executing the retrieve - * operation. This is handled by checking the 'retrieved' flag under a lock. + * operation. If a previous retrieve failed permanently, it returns that + * saved error code; if a previous retrieve failed with a retryable error + * before consuming preserved state, the retrieve operation is re-attempted. * * File retrieval can happen in any order; it is not bound by the order of * preservation. @@ -671,8 +674,13 @@ int luo_retrieve_file(struct luo_file_set *file_set, u64 token, u64 arg, err = luo_file->fh->ops->retrieve(&args); kfree(args.arg); if (err) { - /* Keep the error code for later use. */ - luo_file->retrieve_status = err; + /* + * Keep the error code for later use unless the handler marked + * the failure as retryable (e.g. invalid user argument before + * preserved state was consumed). + */ + if (!args.retryable) + luo_file->retrieve_status = err; return err; } -- 2.56.0.257.gf7497c7d27-goog