From patchwork Sat Feb 8 23:19:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akilesh Kailash X-Patchwork-Id: 13966553 X-Patchwork-Delegate: mpatocka@redhat.com Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 D940724338E for ; Sat, 8 Feb 2025 23:19:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739056776; cv=none; b=qa9d4maaRApDPonbZho82q1dRAhsDHNme0tGPVSHAmDG54S2DvmihJ6itqQbASZ1XzwFHN2I0AZ0LFv5HWYcPNrQdrVlDmfVWYrdjdLTK1I7Wcw3PXWUKTJ0eR/OdTeTCVs8IBWP9UKfbyYMF+dUA1/VB2g5SFlK//Y6n1R8hLU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739056776; c=relaxed/simple; bh=jIFv2SsvGgxh5XvyGujY/iKz4uWqj9G4Vnr3Ld7sPx0=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=dTEIpMUYQx/t0E4KU3l/xbiup15FTNIMt8nrmAEglakbf/9vTmUbaUdEAiAW8nHuSuHWLM3VRM0F0xZC2L5bkkVf21doi6I4+JsrixUy2j+zm1GCD7Gxs1VR3PPp4ddRG3FTccxHJ8Gs+jyQ9/b+o8XTa9e1AS2PDmc8ngfdRcU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--akailash.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=mwuFoaF8; arc=none smtp.client-ip=209.85.216.74 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--akailash.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="mwuFoaF8" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2fa32e4044bso3032508a91.0 for ; Sat, 08 Feb 2025 15:19:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739056774; x=1739661574; darn=lists.linux.dev; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=2fAxa4aN2gJ59ABhKxViFnLDaFYa2+S9AaH1Jy6Y5iE=; b=mwuFoaF8cPvbV/f/haszhj/LP4ytaQTnTRZU6+/MmTJM3Ki9DoH6lH7MDihzPWhR5v nMK0vKeo2bJCXIyE4t9T93X69M1VOljxJy19qvxyXfEL+5tMtWO1JXpULImSv3cc9WuY OO5NaDw4axBK0laFH8hp8SuXEsyfvaCh/xYIn/G11cIhWU2Uq5lwMcQTdQThMOojvw4B V9H0B8V+l3/NseUXsdGDmef34ALBCZEn79XtlihAVRAtOFLEikmLSlGRtNEkc9cxS0XW +zDRo6DN/qMjQR2V2FC7GL2eYyZZhnDco7RmP4anOHClcs29WqJCloIov8WxfXwKDrS3 c/Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739056774; x=1739661574; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=2fAxa4aN2gJ59ABhKxViFnLDaFYa2+S9AaH1Jy6Y5iE=; b=TaQMtIJWGsbc7L8BG5aKpHA8eouxjBKv8m3UKOd17/sxAQj7DoIs+NLkHjXlEUuDE/ 63i3eiV7lvvGtsUp/eZ3wEjRg7qmOjaAV7ESu0ws+M+041VxLZGtLbkKasXI9NxiO94M OyORonDkAP4AYtLvk6cC3TFomAGeo8rlqhgvMwEIvV9ohL/y3Fw+yehrbhrXckcZVIcm 3TWzuyqTWQBUisBEEOnW67+i5q15zDdXx9JhbUJj7z8WkausRxJqghvaCfiy3pfbdLfT V/wVu1+qyo+kBWB709rPqPSqTQs7psxT7uyG+rslStshkowkmUADu4/6nZOCulTCsnfM kaOA== X-Forwarded-Encrypted: i=1; AJvYcCVmYLJB9hWEw01jspUMpbJuxovY66mj+kSFIJr1ZyDyPHg5WPFBtXuP8yQyUwqk0ez2XOF7Oce+tQ==@lists.linux.dev X-Gm-Message-State: AOJu0YwhAh4zN1klxyhwwqSJFnb1BxnVuSc0B5WW7Ox9srKEyb6nmB64 o1SGeA/doVrFdXZLHKC4/gK0g4zKkIPIuWbk6FwBYvsTGRWJH9rY56Ed8IJZsnTG7xXPwvjcMuN rE8mNr/7tZQ== X-Google-Smtp-Source: AGHT+IGTo0DIBBKLaC8j/EXJp5BYuwmNZDX8o3x/MBdEOSTLIkG/S7kviz6vlv/uW0jpyiGro0lOtJPHsX1Y0A== X-Received: from pjf3.prod.google.com ([2002:a17:90b:3f03:b0:2f4:3e59:8bb1]) (user=akailash job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5543:b0:2ee:d63f:d73 with SMTP id 98e67ed59e1d1-2fa24064ea7mr13002389a91.11.1739056774226; Sat, 08 Feb 2025 15:19:34 -0800 (PST) Date: Sat, 8 Feb 2025 23:19:23 +0000 Precedence: bulk X-Mailing-List: dm-devel@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog Message-ID: <20250208231923.1952228-1-akailash@google.com> Subject: [PATCH] dm-verity: skip verity_handle_err on I/O errors for metadata From: Akilesh Kailash To: Mikulas Patocka , Sami Tolvanen Cc: akailash@google.com, kernel-team@android.com, Alasdair Kergon , Mike Snitzer , dm-devel@lists.linux.dev, linux-kernel@vger.kernel.org Handle I/O error for metadata blocks if FEC correction fails. This is similar to handling I/O error for data blocks: 'commit 2c0468e054c0 ("dm verity: skip redundant verity_handle_err() on I/O errors")' Fixes: 2c0468e054c0 ("dm verity: skip redundant verity_handle_err() on I/O errors") Signed-off-by: Akilesh Kailash --- Note: This patch should have been included in the data block fix patch. A "fixes" tag has been added to address this. Link: https://lore.kernel.org/all/20210913092642.3237796-1-akailash@google.com/ --- drivers/md/dm-verity-target.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/md/dm-verity-target.c b/drivers/md/dm-verity-target.c index e86c1431b108..e1ce3b256f0a 100644 --- a/drivers/md/dm-verity-target.c +++ b/drivers/md/dm-verity-target.c @@ -353,16 +353,26 @@ static int verity_verify_level(struct dm_verity *v, struct dm_verity_io *io, } else if (verity_fec_decode(v, io, DM_VERITY_BLOCK_TYPE_METADATA, hash_block, data) == 0) aux->hash_verified = 1; - else if (verity_handle_err(v, + else { + if (bio->bi_status) { + /* + * Error correction failed; Just return error + */ + r = -EIO; + goto release_ret_r; + } + if (verity_handle_err(v, DM_VERITY_BLOCK_TYPE_METADATA, hash_block)) { - struct bio *bio; - io->had_mismatch = true; - bio = dm_bio_from_per_bio_data(io, v->ti->per_io_data_size); - dm_audit_log_bio(DM_MSG_PREFIX, "verify-metadata", bio, + struct bio *bio; + + io->had_mismatch = true; + bio = dm_bio_from_per_bio_data(io, v->ti->per_io_data_size); + dm_audit_log_bio(DM_MSG_PREFIX, "verify-metadata", bio, block, 0); - r = -EIO; - goto release_ret_r; + r = -EIO; + goto release_ret_r; + } } }