From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 35DBB36CDF3 for ; Fri, 1 May 2026 23:44:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777679088; cv=none; b=A/W47HBj4HCqckfqtCKvLtqb80tlOMYeuEoyv4X/aCcehpQDctzb3znZRfgV8QpLT0bYjyqxAlU+UKxl69kTMN2x+qYvTCEeVa3mjv6SFlt4pfVkGuFmJJD0PVyzL3unElTSdrXHL9g+uenWtG0ybqkUxGztwKcRb24cbkvf7ME= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777679088; c=relaxed/simple; bh=JEVHi+1MFAr+8KMKVA8mD6CbgoxkevEYu8Y4RRerd10=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UZp8Hge/M1spNwsBiAEuttH/iJXvLlJKGmTEoG9U/FZs1WX0lPy3LxwOIIHfhe8dZ7kuc4IdDpegjvhQyFLdm2HlqsaYJF2RQd8vn8WljzIq/yO+3RjboXtVz/ucXNKEeWUQw8yv1oBYRyPWWFW9+ROHOP5NZ9BVqh+TGTzQ1EY= 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=f7IlN937; arc=none smtp.client-ip=209.85.216.47 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="f7IlN937" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-35da2d35eccso1749270a91.0 for ; Fri, 01 May 2026 16:44:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777679086; x=1778283886; 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; bh=M7yG+7nozXqY2jD1ConB/MN0MOX8qKIWBN1J+a4MYII=; b=f7IlN9378DZpqhWWIihtx9qI5vubpZwKnkIkY7/BtDkOK7DVXKBxwG/kX14lteLtau BUs2/YaVDK+bJ1PtCM2F87//RkCUMq/GBO6eIFM+XyYle4aQ0WmAsvRvKP7o7aXlXx6g 2vAm8vJNWPieDOuFWBuLU500MZbRq3JltHksJnpAH+5XGZ4/jWiasaIqryzxi2w5R0zd 4EfReNHDYcO0Duf9hZYyPXk9KhXa8jVXVf880S7yCeaAqmRscXY9oOohWfi/vw6wVr4g IWf3gssXfT1jVgF8UOxDKQp0Ap38ss2A3CiRCCe64tTVQBWqAjhFybpLLXzphRf8vHKn Pn5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777679086; x=1778283886; 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; bh=M7yG+7nozXqY2jD1ConB/MN0MOX8qKIWBN1J+a4MYII=; b=qWkOzFdYWEVcCaytfTSOZv979xbZvkpYlRwoE/r+5txFxLGCedVwvjD+PAxP2FC7/a 3kuigaPnQZvhT8MSQ/mxUq7aI/cRAj8z7p/tLkdTJBe+iAZL07gAZkVuQTFTh/UEcVIn TfX3ON6K7f4GsEr6ud7trkDgnEHiYErJL3aP3+6ywDE9Crby+B9Em8+s9uSbJVocAbqg +z5QX1YIHdOct2zayi7cHhkfOSit2NPFWvrWCBEihdBmRL5hP8M4YsDg/GuzTPoXy17N tzI1Hsm74E5HBBTkYcdS+CZu+pHqda8dSZaQaPvxLsyRhjQ+UGg+JNEB0JzGuGi+8TKj TFWQ== X-Forwarded-Encrypted: i=1; AFNElJ+mV/zqDXLSne5Avij8nHG4i92Ps+RaHMSlWDX3uEQeq5iRbS0eKzQ/i1iCLWO9+IyusxBLn5530HrONtA=@vger.kernel.org X-Gm-Message-State: AOJu0Ywk4WX+f33muvXY3596iqE2nDiEgzNw1zchAbawUH3ryawPU745 BFl3AkWeirv3FYPPObzHxwqpuzpwxzXv76vhxKdEGuUpLi5WftiT9BuO X-Gm-Gg: AeBDiesfhZrO8Sicf0NGeY1Jg3Vq/QIpKlDmEqWga718YPrs3tSQQG1eatyBrdjzNKn wUadMUU6E+JIpblVPqomEk847HWTWl7AVnjQAjEvlFdMCWsPMqW/tmJ2YDHvaIs1596RGRF9/+y rvdkT9blKifTiDeA+wq0d+Ac4uGJB6p+6BGsHD5G4lZJHGM5SAsh4sUcmqsDdQfpLYvCFKjnIs3 fX8XV78Se3ZP6/694sE8NTvIu1Z0LTCIQPDYloLdzas00IoR3fHSdVv8zLAc6tyYhADuGNGC66x Jhwivpc2kdXFRJbcPY5/M219swYjofYstmI2sgHWKVZPKbUkcwzjbXM59CTS0R8xCMdq7b7S/9Y wjCoQyJmejYCKivYtdss9mcCgQ9okXVwFkGjeCeBZRgMKAC2dDXUePG+R+GU3yBIUmjhM2qnSvN np3Potz/0uGIeL1O30sbLySNacFBe5cw== X-Received: by 2002:a17:90b:518c:b0:35b:e51a:ec77 with SMTP id 98e67ed59e1d1-3650ce38376mr1164990a91.16.1777679086499; Fri, 01 May 2026 16:44:46 -0700 (PDT) Received: from localhost ([121.237.249.41]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b9caaaf0e5sm32537925ad.18.2026.05.01.16.44.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 May 2026 16:44:46 -0700 (PDT) From: Coiby Xu To: kexec@lists.infradead.org Cc: Andrew Morton , Sourabh Jain , Baoquan He , Dave Young , Mike Rapoport , Pasha Tatashin , Pratyush Yadav , Coiby Xu , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 6/9] crash_dump: Only use kexec_dprintk during the kexec_file_load syscall Date: Sat, 2 May 2026 07:43:35 +0800 Message-ID: <20260501234342.2518281-7-coiby.xu@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260501234342.2518281-1-coiby.xu@gmail.com> References: <20260501234342.2518281-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 72ae2dffb077..545d712428d3 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; @@ -127,18 +127,18 @@ 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"); return -1; } - 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); @@ -152,7 +152,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); } @@ -305,8 +305,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_info("dm-crypt keys haven't be saved to crash-reserved memory\n"); return -EINVAL; } -- 2.54.0