From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (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 C2A8838D403 for ; Mon, 1 Jun 2026 09:03:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780304613; cv=none; b=XWzKb4CJzSzaIYvLFp55bfP0le3rs0c2C5vMuySKtgdyEpvRjX2TcdZS0Xai2qZRrZmt6kLpa4SIqwdkLhozuFgi2IpeRdfAjJE+RE+N/L5DmPnhlgcThC+1v/pvrXaDJbHGFifDXh8CHEO7AXnnNa/2UNkSSB8epYqTL2KJo68= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780304613; c=relaxed/simple; bh=vD7+fS4n6xxyWC+h2kpZsaWcAegfna/Ovaba2MnAGGs=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=JlQS7eKsNMoPGOEIrxkUBnj+nHcV4rH/HfFCdHWfI1Mj6C6Y9psL+D1ildYxuZcY7DvRP9D2RtdGp2PcaBd8z0DgziIy6I1r2YzW0NI9i/+8hTgUgVFtpqAC+NNnekLgkFczzLKZJd0nFzUd/V6bzyKoYtOgVLZvl9VWrW8/obo= 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=okI4E1WV; arc=none smtp.client-ip=209.85.221.45 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="okI4E1WV" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-45ebafde87cso6425646f8f.3 for ; Mon, 01 Jun 2026 02:03:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780304610; x=1780909410; darn=vger.kernel.org; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=FCD2fd71JEkzJVC0PFR3+O4hOvwrepEdxpDr+tJYldg=; b=okI4E1WVz72DCN4fK0BEVPy3+YPcZfMW2tiMhmsekV/fc9Xg8M2mned0wZQsSOtngS tg1nzhI0TXw1JrP2MC7BT0tJcPt1Sz9mMz3np2PA8dtiwq4+kpOYVJU6tUS3r/WGYmQW +lSNpTQQ0VW2m0wkrMxz7+sz+v4QL2P3zGzTUcnvQJXfW11fmdz2O88XCaXiIaeoWVnT 5ht6v86Jx6KfbST4LfOss+HD5K94Y7Zl/zTq14gMsiQlOY454devStPCQwksZsji3FUz pQ1PDVfN9IHgZXw4JunVd+hcKQfjoYYRwnCpYPdeaQzdgm52T09KVhv804U1RCqZWldK Z9lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780304610; x=1780909410; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FCD2fd71JEkzJVC0PFR3+O4hOvwrepEdxpDr+tJYldg=; b=M5zbxjIYwVsZcFDqXBLFv7hkgnF2952L9v+CF9RO9tdIilJbnz5oB2V4EQBP/x5riY LLNqIKvFHooKbqFGBSEs3UeLYFAXDd3fK81CGbcOVVucGmQZS7s5rKEX9vz+ZNg4XGhO obvcNP5brhnaa2kBUxVI+F9p5Dpf4+iP4QCfPykXNaNTlgrQOqRt7f0grA1ROUJrdw90 pMuJLZa2I6OtkMRPaBK83bGsK05GHiWj5h3uistw4buLD+Na0kL6uZ8XlCPTRv1ES6aW 8K4lIOGiJ//lR4AQCfEviG/93J1R5uv5ulat0zMq3XwBuCqq7MbKtWhp1dP9H4uayCFk wWTQ== X-Forwarded-Encrypted: i=1; AFNElJ/3SdftuaBOTBtpyAXMqxr/wBlIP4UYAabrdluBuFPLBEmriOsAZhobCJcOu2RXSxSCFGBAoi//AxaeOBo=@vger.kernel.org X-Gm-Message-State: AOJu0YyKTpHWdL22XQVWJqCpWTRiLh03DL175FfHBSYwIPZjA/sMm3QV RS/h381K/kMSezOkc/clWyuywdIcXtl0GUyut+S6NjeVAa1+FB0OpyZQKieVmcgl X-Gm-Gg: Acq92OGq3UpwN4wyXZ/ujgSfj1N3u9MH/qgPqAL+hJ1v6duLsG2jJgePinExejHypdU qshuEu/kvTkOtIlZjMFAJHpK6veX9OYEIUSRPpihnAZSxCjJjpyFnyw5MYYCuMUlGjMWk3zABFb 3DlKcPgoZE9n+Syo7SUZ9IVg6HKY2hDUmCG/4NCkM60OsoSUNp/Wfrz55haR9CfLoeK9X/Q5Gjs ruCHGNMuHTKq4HTS5OqNOX+88wuklsWGq6Yf6msd19612ZSfXVT1vVxKd2/eAJY6xU9oHOyoFxN gev4x4tjhJtsyutjwC4wQopdk63NKFPS/o4cJWD9pF4vKpCsXF4i1RAdHMmlvZozPBVLG1cJOXD sAMg4vOGeY7jvkwQHMMq3IlSiPqKLwxAPvGnmuDOCB3uEPpXcYI776QhJViOQzr5nEjJnsjhtqm RQtglhYRo6TMmGNnA6zKvrw+lLNxHlQiuHD6FvvEQy/9VyShmRZn1WZsedvkNZJ+R3fiewg1K0k LNddVj/jS0wGQ== X-Received: by 2002:a05:6000:40cd:b0:439:c18f:5aaf with SMTP id ffacd0b85a97d-45ef6b96607mr17259268f8f.34.1780304609702; Mon, 01 Jun 2026 02:03:29 -0700 (PDT) Received: from Abds-MacBook-Air.local ([2a02:3037:60b:2e65:8d3:ed5d:6174:8946]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45ef356b129sm29754388f8f.32.2026.06.01.02.03.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2026 02:03:29 -0700 (PDT) From: Abd-Alrhman Masalkhi To: John Garry , song@kernel.org, yukuai@fnnas.com, linan122@huawei.com, martin.petersen@oracle.com, axboe@kernel.dk Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] raid1: fix nr_pending leak in REQ_ATOMIC bad-block error path In-Reply-To: References: <20260530151411.4119-1-abd.masalkhi@gmail.com> Date: Mon, 01 Jun 2026 11:03:25 +0200 Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain hi, Thank you for the feedback. On Mon, Jun 01, 2026 at 09:43 +0100, John Garry wrote: > On 30/05/2026 16:14, Abd-Alrhman Masalkhi wrote: >> In raid1_write_request(), each per-mirror loop iteration begins by >> incrementing rdev->nr_pending. If a REQ_ATOMIC write encounters a >> badblock within the requested range, the code jumps to err_handle >> without dropping the reference taken for the current mirror. >> >> err_handle's cleanup loop will only decrements for k < i and >> r1_bio->bios[k] is non-NULL. The current slot is therefore skipped, >> leaving its nr_pending reference leaked permanently. The reference >> prevents the rdev from ever being removed, since raid1_remove_conf() >> refuses to remove an rdev with nr_pending > 0. >> >> Fix this by calling rdev_dec_pending() before jumping to err_handle. >> >> Fixes: f2a38abf5f1c ("md/raid1: Atomic write support") >> Signed-off-by: Abd-Alrhman Masalkhi > > FWIW, > > Reviewed-by: John Garry > >> --- >> drivers/md/raid1.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c >> index 181400e147c0..0084bbc24076 100644 >> --- a/drivers/md/raid1.c >> +++ b/drivers/md/raid1.c >> @@ -1580,8 +1580,10 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, >> * complexity of supporting that is not worth >> * the benefit. >> */ >> - if (bio->bi_opf & REQ_ATOMIC) >> + if (bio->bi_opf & REQ_ATOMIC) { >> + rdev_dec_pending(rdev, mddev); > > It's not so nice that we have 2x locations that does the > rdev_dec_pending work > Are you suggesting deferring atomic_inc(&rdev->nr_pending) until after the if (test_bit(WriteErrorSeen, &rdev->flags)) {..} block? The patch is already in md-7.2; should I send a separate cleanup patch? >> goto err_handle; >> + } >> >> good_sectors = first_bad - r1_bio->sector; >> if (good_sectors < max_sectors) > -- Best Regards, Abd-Alrhman