From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 DAF5238D400 for ; Wed, 22 Jul 2026 18:59:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784746765; cv=none; b=Lirt7jFuMQ151v8dux1pWivvNd9EEm+hWSTP/YlgFLB2n5rDyG2zAKxhlRnwVelZmI55j2Uub+2orjA+iRtfkCkT6AOgJTws2y+aGyMbsdvqH36nmywcfVyW3JXtvJ2rPU7RPCAPQUhig+jGqI3Q8z2sj/GPnd19cFDxCP6dv40= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784746765; c=relaxed/simple; bh=6JUXonkvhqCluPq91YNslI6Xc6PHhaJJ82TMx9QRo24=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dfd4z5gAqFXMLw0lkj3Ncu1g0Bv24c3RsreW1h1hRTUb/wqQkxn2ZSRHtv+MuRDra4qMFBCHi3UBMVbY28X2WOpkBSoyHv2uCuO65w+v6ew7IxbYCsK9q+WHTubAm9RJyrgPU7mlru6hi7cR0U03DhZCGrEOe1aIyGa041swK3U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=meshstor.io; spf=pass smtp.mailfrom=meshstor.io; dkim=pass (2048-bit key) header.d=meshstor.io header.i=@meshstor.io header.b=Ai0g5NKB; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=meshstor.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=meshstor.io Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=meshstor.io header.i=@meshstor.io header.b="Ai0g5NKB" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-49557167508so44945985e9.1 for ; Wed, 22 Jul 2026 11:59:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meshstor.io; s=google; t=1784746751; x=1785351551; 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=InzNp2nHOOp7QQLn15Ay7fcFkfBNFGx8C4/KxQQFD2c=; b=Ai0g5NKBb/WoSwM4WCinC9gL5DuAa88xLuEC4hRIs96ghwRQmvDlMLh5VL8zWotpFo JLjmRiIu37BjI3rhd4Ubw4snBPwDFxkD6abowchkrUjNFOey/CJUVv59O8K2o34bXApT 4wCOv64ZNQn2gEcUXAlJfmTzBq/ChFOvz0KDkCMfXy+BPORDQH/yJVd8q4o1hH5eyKUb S/BWDDtTklXRRcmxmHW3gZoCTvjMSA7HKGVHZyrsR6bfdDbQLne1R7K151Fu6TuNRAWt gNTwsano4qKf9TqettAQaDaizTf9HGlyParu20USjlWCEDbIz720Sk/FeTdSzuha7whc pl+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784746751; x=1785351551; 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=InzNp2nHOOp7QQLn15Ay7fcFkfBNFGx8C4/KxQQFD2c=; b=U/WK/UqoZoH1RRXYEQ11XH7g84W5hEpmfnqbsrNg7OT7WHstZyv9H+yCltzoftWmrn rGFH+94PWSVFnK+rQkMVYrcKLytNYK5Ty7g0FTwycMVSCGoJyuZ3Fw9iijmGk8IcFy5L ElWQQs6pFrxpPkc/yo90qMmsIaZ5ePXMu2KcjXBnxr6gI9VaA9KObqmk8N611UulvS3F VeZp6aIAoZG4XV868Og5fFuLQ+5Z7x/1T9AgWghxezkr/o4PFsKieMYJMywwE57QljMa YWsaQ47INkvxthjfauWlPMASomi9OeGW7FVHyH2kbdWN15314tML+zJT78F7BTtm9Na0 sLoA== X-Forwarded-Encrypted: i=1; AHgh+RoAo7O87Hev/4K1irQcJFJGqowQ/L/vCXSt3hI9FaMXwA8DjqFjKDbCEPIwxfYR69uyICJhdtkdLTdrMtY=@vger.kernel.org X-Gm-Message-State: AOJu0YysenG9T7yFr9nYBmpkY6rXyoBKmEUVUre1sHwtfFMH5rkjdZe4 FZ3NATWeCm4IWdpa5q6d6WmixPSqwxvzWBfrK+1WJwPrYwwD16m1cdjybO4kuqBiQuxQTV9Xkce moWp1wg== X-Gm-Gg: AR+sD11SwrWQn+wmtCeUIwsnRWTesMsu3ef7bCnIr1TWdr9VqcFfCpK8Rn7F7sh01Ej rPgeS2fPa8jSvqBQOhcSZtLucJ/u4XfFG/ctStjMHCt/1FXe/UFnkYXDyelzhhrOUHB55Zd2VB4 ono2Y62UG+oRewJwn//wrll7g3pY0ZMU4Mjb9VZ2DonZ3BGmkGhKxe7x4LB6RUJ4LE9nt2lGVE5 G0bIHoP1P6m7wQB/aEQAMe68Zhf8hqFluGuZdUT272GEFPHrVC7bnZCunB2WS7VX5xkpePKMp2M oxJDtmoBjGWK9JM0NMdDomuQc9gWXx+Q8B+7Qp/GKA+3vVsiq04+p+e/LMfZI8/qV63+4maC48k XxVuX5ukHZcrIkopvaIrJ/sT9dlaSfa8ohfnA9evtjMgJXHTU3YIy2Ji/zXYVfQeh/tj+b/tNH7 DhaP23OBQqUl3M7Vx8V/xmYh6V6KjyR7cwUXL8ngjFztxIQNM= X-Received: by 2002:a05:600c:1551:b0:495:5858:e163 with SMTP id 5b1f17b1804b1-4955858e1damr203016475e9.27.1784746751519; Wed, 22 Jul 2026 11:59:11 -0700 (PDT) Received: from ai-pc ([46.172.241.174]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-495730353d9sm13740055e9.12.2026.07.22.11.59.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 11:59:11 -0700 (PDT) From: Mykola Marzhan To: Jens Axboe , Song Liu , Yu Kuai , Keith Busch , Christoph Hellwig , Sagi Grimberg , linux-block@vger.kernel.org, linux-raid@vger.kernel.org, linux-nvme@lists.infradead.org Cc: Li Nan , Xiao Ni , Guoqing Jiang , Leon Romanovsky , Jason Gunthorpe , Kiran Kumar Modukuri , Chaitanya Kulkarni , Logan Gunthorpe , Bjorn Helgaas , Shivaji Kant , Pranjal Shrivastava , Henrique Carvalho , linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v4 6/9] md/raid1,raid10: keep REQ_NOMERGE on narrow_write_error() retry clones Date: Wed, 22 Jul 2026 20:58:38 +0200 Message-ID: <20260722185841.449934-7-mykola@meshstor.io> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260722185841.449934-1-mykola@meshstor.io> References: <20260722185841.449934-1-mykola@meshstor.io> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit narrow_write_error() re-issues a failed write in badblock-granularity chunks, cloning from the master bio and resetting bi_opf to a bare REQ_OP_WRITE. For a P2PDMA bio that reset drops REQ_NOMERGE, which is the only request-level protection against the member queue merging P2PDMA segments across pgmaps or with host memory (see the preceding md_submit_bio() fix): the retry path would quietly reopen the hole the submission path closes. Restore the flag on P2PDMA retry clones. Fixes: 02666132403a ("md: propagate BLK_FEAT_PCI_P2PDMA from member devices to RAID device") Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Mykola Marzhan Reviewed-by: Logan Gunthorpe --- drivers/md/raid1.c | 3 +++ drivers/md/raid10.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index f07edeac6e5a..19c4dec450de 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -2561,6 +2561,9 @@ static void narrow_write_error(struct r1bio *r1_bio, int i) } wbio->bi_opf = REQ_OP_WRITE; + /* Keep P2PDMA retry bios unmergeable, like the original */ + if (md_bio_is_p2pdma(wbio)) + wbio->bi_opf |= REQ_NOMERGE; wbio->bi_iter.bi_sector = r1_bio->sector; wbio->bi_iter.bi_size = r1_bio->sectors << 9; diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 5b63175fb382..428bddddfe71 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -2823,6 +2823,9 @@ static void narrow_write_error(struct r10bio *r10_bio, int i) wbio->bi_iter.bi_sector = wsector + choose_data_offset(r10_bio, rdev); wbio->bi_opf = REQ_OP_WRITE; + /* Keep P2PDMA retry bios unmergeable, like the original */ + if (md_bio_is_p2pdma(wbio)) + wbio->bi_opf |= REQ_NOMERGE; if (submit_bio_wait(wbio) && !rdev_set_badblocks(rdev, wsector, sectors, 0)) { -- 2.52.0