From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 8C1EC389443 for ; Wed, 29 Jul 2026 03:37:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785296245; cv=none; b=o6eN9GR6ZwgGdGmtJGQHxavhXJgUyzUjH4rXklsoPG067bLdrM9XIJLNRMVDLjCyAsdivnv/Yx23W1WUWH3GkuwU9QYptgRj5w/YjlF0yVfkaC8e2gdkcPXoLCZFoY2TWPiXGpr99r62A4YLFeROSxa/hi+JGxLxJPKkuL+CJyA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785296245; c=relaxed/simple; bh=1Rib5cqO+Sv9VCD9foeEaNrf95fR32dBxhdJ3vJQlHk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QxSesXZVWsErCx8+jnEyhezF8w0kpsCv+9JdSflE24xp4fJW3U8VuFYaxdrfqIfOY2L8GxhaT16h+6L/nEHHDoV2QVJuVlx0JuDjvyZ+hWvCPVJT0BhXK4xklJS2tNQgaMtObQlISfmrsM7YtIbPb8sBzcavPi6SGf7/BfJxIa4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=NGSkBkzv; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NGSkBkzv" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-8487088510aso503370b3a.0 for ; Tue, 28 Jul 2026 20:37:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785296243; x=1785901043; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=vxmlwNVtuVCj9KzbSqHlJa35Lwuk28K9I8I/7plDAtE=; b=NGSkBkzv/vWnOz1XaB5a6VJLAiwcps9ofHvElv9pChsmIX8HNBaIbsuw68XClr2EsU SQK570tSN8DVUJV6Ud2zPXgpRQZ3zIH/95lzOv3fM2bzGiFo08WOaTG8l+91CU0qwx7T 8DGKxeSRGMTNVpprPgpW4opBENNJ9dBnhCf43WjNMmPToFiCJ0ZxruKN/zwFbtjcJthG C1JIFcWUIOECDzZiDlUfJH5HseaKiU0RLBYAYDx3vJl/+4rOIlT3ohNbeC/ABNWz+tvY k8AY3NxVu9ViP3bkBbd7FBI6L058uAWuycwzsj5o4UkZc36gXWNrQcNqFke/TwskhhWG TaKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785296243; x=1785901043; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=vxmlwNVtuVCj9KzbSqHlJa35Lwuk28K9I8I/7plDAtE=; b=tFU61KjjKn6dna945X4YwTw4YSx2uJAhjktkNsmNfe2Q/LNpT+Vw5u3nygSKRS4auY 8g+fTbzPgKQTiHOwEG6gUyzJ4gBQX7oCTsz2WY8g5fn2KqC6RqGdz1dj5OH01FVbmcNc kBjapWcV9SvAAKFy1JwDCWxRJwOm9M5LbvPwsAst5wVoU4vGiUEwRCQ1SJlVrZ5f3Of1 1V+XFSpiwja8MzCfNCd5k6v4+kL0H0t2YgHmmvGDW0AAG84EWr4C6mLaDl4PN7rbzRf3 KH5AYo0H3PPdaHNZbAIqSVY/f0uFXmFmidYQIQCuhjQ4o2dJADCB0xl7ORkbueImIB/K Nw0w== X-Forwarded-Encrypted: i=1; AHgh+RoIXLPEX+H2f0AftGGjRRuzkog4HWm1FrAKOugAK3OhKDuCWaiZLGqOu2x7aRvmISzzwKBZi/GekcU+nRk=@vger.kernel.org X-Gm-Message-State: AOJu0YzpzFwWJ9IQZ/hxqj/fl9EUgJRwbwZkkj4otzLGqdP561h9xMqZ Caf2CLdLa1RrZ0Pf/hyGKVcTeU/Mpq0JVzxrSPDIL2sG09BE5apl/inZ X-Gm-Gg: AR+sD11hTDAITq2I5AMQ2CgYwmKK6KR3HEacjaUwFyqOxnQ7Zg7cJbzexGMBPYgUGEu OG75LwFioCCuUlc61yXfCxB8UAlA/W+5UCgFVOCl2AK5zp3LZ7pbNYmy4wXAsIY6JIaHLg2ekCh FVxzwwDLbXF2SVjHy1grXzxLMw36gbcIqeIWWdlaXSBeP+xyP6Bkpq0/51lI11gGNOTqfUQN/3S jq5yXfiuKDuDcpOXaz2ehH9V4e+48bLoyKUAphLkzO0fT5NQpB42Ct0SGXCFn4ZHftulMC2gRRY xAS9f2ZWYO/MVC305yyQN+/S0pc4KkN0Qdhht+nnS13k4K2mE26wzBvuo6OTJzXT5nTuCChFtZz yimokj47ISgHvzNgNY/NXtton9V5fkYLuq8/hli5EJNTXauCTnz2BBejDsDIl4D5vj7jLXrNW9a xLV/2S1AjAi1ZKLNBNZLUqAM+TWP+OPG4tbCHf298iz+s= X-Received: by 2002:a05:6a00:1152:b0:847:968d:b101 with SMTP id d2e1a72fcca58-84e93234afemr5348185b3a.21.1785296242830; Tue, 28 Jul 2026 20:37:22 -0700 (PDT) Received: from localhost ([2a09:bac5:42f2:1e1e::300:30]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84e9fe2393csm694329b3a.10.2026.07.28.20.37.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2026 20:37:22 -0700 (PDT) From: Coiby Xu To: kexec@lists.infradead.org Cc: Andrew Morton , Sourabh Jain , Baoquan He , Dave Young , Pratyush Yadav , Mike Rapoport , Pasha Tatashin , Coiby Xu , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 06/10] crash_dump: Only use kexec_dprintk during the kexec_file_load syscall Date: Wed, 29 Jul 2026 11:36:46 +0800 Message-ID: <20260729033654.311541-7-coiby.xu@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260729033654.311541-1-coiby.xu@gmail.com> References: <20260729033654.311541-1-coiby.xu@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit kexec_dprintk will only be activated by "kexec -d" during kexec_file_load syscall. So use pr_* outside of this syscall. Fixes: 9ebfa8dcaea7 ("crash_dump: reuse saved dm crypt keys for CPU/memory hot-plugging") Fixes: 62f17d9df692 ("crash_dump: retrieve dm crypt keys in kdump kernel") Signed-off-by: Coiby Xu --- kernel/crash_dump_dm_crypt.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/kernel/crash_dump_dm_crypt.c b/kernel/crash_dump_dm_crypt.c index 9a64e2d6841b..3ee01996778f 100644 --- a/kernel/crash_dump_dm_crypt.c +++ b/kernel/crash_dump_dm_crypt.c @@ -75,10 +75,10 @@ static int add_key_to_keyring(struct dm_crypt_key *dm_key, if (!IS_ERR(key_ref)) { r = key_ref_to_ptr(key_ref)->serial; key_ref_put(key_ref); - kexec_dprintk("Success adding key %s", dm_key->key_desc); + pr_debug("Success adding key %s", dm_key->key_desc); } else { r = PTR_ERR(key_ref); - kexec_dprintk("Error when adding key"); + pr_warn("Error when adding key"); } return r; @@ -128,19 +128,19 @@ static int restore_dm_crypt_keys_to_thread_keyring(void) keyring_ref = lookup_user_key(KEY_SPEC_USER_KEYRING, 0x01, KEY_NEED_WRITE); if (IS_ERR(keyring_ref)) { - kexec_dprintk("Failed to get the user keyring\n"); + pr_warn("Failed to get the user keyring\n"); return PTR_ERR(keyring_ref); } addr = dm_crypt_keys_addr; dm_crypt_keys_read((char *)&key_count, sizeof(key_count), &addr); if (key_count > KEY_NUM_MAX) { - kexec_dprintk("Failed to read the number of dm-crypt keys\n"); + pr_warn("Failed to read the number of dm-crypt keys\n"); ret = -1; goto out; } - kexec_dprintk("There are %u keys\n", key_count); + pr_debug("There are %u keys\n", key_count); addr = dm_crypt_keys_addr; keys_header_size = get_keys_header_size(key_count); @@ -154,7 +154,7 @@ static int restore_dm_crypt_keys_to_thread_keyring(void) for (int i = 0; i < keys_header->total_keys; i++) { key = &keys_header->keys[i]; - kexec_dprintk("Get key (size=%u)\n", key->key_size); + pr_debug("Get key (size=%u)\n", key->key_size); add_key_to_keyring(key, keyring_ref); } @@ -309,8 +309,7 @@ static ssize_t config_keys_reuse_store(struct config_item *item, int r; if (!kexec_crash_image || !kexec_crash_image->dm_crypt_keys_addr) { - kexec_dprintk( - "dm-crypt keys haven't be saved to crash-reserved memory\n"); + pr_debug("dm-crypt keys haven't be saved to crash-reserved memory\n"); return -EINVAL; } -- 2.55.0