From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7F5FD12B73 for ; Sun, 25 May 2025 15:53:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748188408; cv=none; b=FbsVHaEgGYnHJCF9rvDJSnXq/4a9FXLWUQamwPnVLB6eQl6eRqlEvb9jAZ7F+IF9d18w5DcssH9WIXwYiTtFP9FFGCOGOKaQA4gp7wbbC74X8JTrOLelsfKI09VZhT2gjEiPPrBvONgidp8M5IqQvcFgn0e+FEOHrZVSZ2vwzog= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748188408; c=relaxed/simple; bh=+beQk7iofbXfuvxyD9wI06wOPGZdep0uGgwVcEnDhVs=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=mx5iMc3Zzp8qRISpHDGpgZUyPe0OwaXHbf43s7H0Dn5n2n5lTicDOmOFV2w66pBKqcx5mDb0ra0fGecgATdGMo4AkH9iFOAsoeeF4PlrTOU/7mAGnNDdGPqfspjxAWWFmmHEThdWCdbnyifF1DK/3NUhxHh4+UuhRcnlnpbDIgU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=EmUK0+U6; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="EmUK0+U6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748188405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RfF8+8Y3CMDfplODDB2yfBcIHi+PCSzAf7h2lCPnkI8=; b=EmUK0+U6bHnxRHdNdrSI5PMcqyUGI5FG200ND6ug0s/weJbUOipNNVue+794qTaM29W9Kd HuTNT58oEXroxRitygWRpAYx1vQ+2T4h8gF1gMBTAeHEr5ITpb+CLmHMMDp1vwumV7OUhW kAlkC8LsazDcroasmE4/c//pts/pQfk= Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-2-ULCw5izMOuqNweb2TqH4AA-1; Sun, 25 May 2025 11:53:24 -0400 X-MC-Unique: ULCw5izMOuqNweb2TqH4AA-1 X-Mimecast-MFC-AGG-ID: ULCw5izMOuqNweb2TqH4AA_1748188403 Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-32927576bddso7401961fa.1 for ; Sun, 25 May 2025 08:53:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748188402; x=1748793202; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RfF8+8Y3CMDfplODDB2yfBcIHi+PCSzAf7h2lCPnkI8=; b=k5tMl/sq394KClt/PJRk+d/3QYXC0jtg1yKk951HH9MgWTyQf9XueLHlKUMwtziCR/ jt57E27OezyscnGUziMtGouuX4LpLMh5Ut0WRjB+P8KTkfBJqRBAqsyi+16rbSXmFTp7 VvJFFkpO+sjwkdqZ4bX2HncgulwpIf1GFe3/nXcDZQNALBNjGehz49Zfp7weEFmdtwrA UvQfeTHAjYfCWNoyn7hIAJdf7xuQTYvUhjAKL+tiB0tFDxQwZIp8jPsKqv2kDkA5qQIV f6QYRENQXL8oWR53ctYD2KX+SC8GubClYnXJnCK2IzC6DvnLNwTWFee7dQJ1JjacUoDt s/fA== X-Forwarded-Encrypted: i=1; AJvYcCWT3oHuI2lQH10Cda4DKJAScZiRMHaJ5V8iem6t7K+d54dhVWe3vNTlCAaUtLu46fcZ8sk7pqP0E68=@vger.kernel.org X-Gm-Message-State: AOJu0YxQtgBgyazwW71bBCxFwsDkGNVdPY5Kh9YeJ595quUEwnBiXhkx kGX821TTneoZoRa33/4UDdBzxuBzVFA8L0OSWgAxtdJgVGtWFQLui06uLzITE2vphOLyM79y2xB WnYcfmRmEGgfyCIrjKHUCmkQxKMFi4sEaBZ56kbsn2DzYV2Th5bOLRaIpj2KhmDbm/WjozJd0BC KXBW/wg5yaT7xQYuYm4odx6XSvbnYplKPamFSm X-Gm-Gg: ASbGnctsITBcDYjNCMpFUQRBpjeWMsWUyaQ/wUePpM+gh/0M2zG36zWOzLLROl0LaXU EMO+9zJp+u8Dg6B8ULzbPaMPKs8LyZTxAartykK10zeQrK+LbWTcW/d05dghh21xWpBUNBw== X-Received: by 2002:a2e:be1d:0:b0:329:2657:c98 with SMTP id 38308e7fff4ca-3294f7df620mr28726281fa.15.1748188402430; Sun, 25 May 2025 08:53:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEj4ilIq/lThsnnYfPBwAxQ+tUGxulkQvIvbb615Hm/PjSiYnfC1C+kwjnlDi8kPfx37cJirZyp9TcAYPdEIuQ= X-Received: by 2002:a2e:be1d:0:b0:329:2657:c98 with SMTP id 38308e7fff4ca-3294f7df620mr28726161fa.15.1748188402015; Sun, 25 May 2025 08:53:22 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20250524061320.370630-1-yukuai1@huaweicloud.com> <20250524061320.370630-5-yukuai1@huaweicloud.com> In-Reply-To: <20250524061320.370630-5-yukuai1@huaweicloud.com> From: Xiao Ni Date: Sun, 25 May 2025 23:53:10 +0800 X-Gm-Features: AX0GCFtMMUph9jWUAowxw0wR7qBlq2PZcZtIwBdTVWYAeVV_UCLavZfGsNoSARw Message-ID: Subject: Re: [PATCH 04/23] md/md-bitmap: support discard for bitmap ops To: Yu Kuai Cc: hch@lst.de, colyli@kernel.org, song@kernel.org, yukuai3@huawei.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, yi.zhang@huawei.com, yangerkun@huawei.com, johnny.chenyi@huawei.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, May 24, 2025 at 2:19=E2=80=AFPM Yu Kuai w= rote: > > From: Yu Kuai > > Use two new methods {start, end}_discard to handle discard IO, prepare > to support new md bitmap. > > Signed-off-by: Yu Kuai > --- > drivers/md/md-bitmap.c | 3 +++ > drivers/md/md-bitmap.h | 12 ++++++++---- > drivers/md/md.c | 15 +++++++++++---- > drivers/md/md.h | 1 + > 4 files changed, 23 insertions(+), 8 deletions(-) > > diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c > index 2997e09d463d..848626049dea 100644 > --- a/drivers/md/md-bitmap.c > +++ b/drivers/md/md-bitmap.c > @@ -2991,6 +2991,9 @@ static struct bitmap_operations bitmap_ops =3D { > > .start_write =3D bitmap_start_write, > .end_write =3D bitmap_end_write, > + .start_discard =3D bitmap_start_write, > + .end_discard =3D bitmap_end_write, > + > .start_sync =3D bitmap_start_sync, > .end_sync =3D bitmap_end_sync, > .cond_end_sync =3D bitmap_cond_end_sync, > diff --git a/drivers/md/md-bitmap.h b/drivers/md/md-bitmap.h > index 9474e0d86fc6..4d804c07dbdd 100644 > --- a/drivers/md/md-bitmap.h > +++ b/drivers/md/md-bitmap.h > @@ -70,6 +70,9 @@ struct md_bitmap_stats { > struct file *file; > }; > > +typedef void (md_bitmap_fn)(struct mddev *mddev, sector_t offset, > + unsigned long sectors); > + > struct bitmap_operations { > struct md_submodule_head head; > > @@ -90,10 +93,11 @@ struct bitmap_operations { > void (*end_behind_write)(struct mddev *mddev); > void (*wait_behind_writes)(struct mddev *mddev); > > - void (*start_write)(struct mddev *mddev, sector_t offset, > - unsigned long sectors); > - void (*end_write)(struct mddev *mddev, sector_t offset, > - unsigned long sectors); > + md_bitmap_fn *start_write; > + md_bitmap_fn *end_write; > + md_bitmap_fn *start_discard; > + md_bitmap_fn *end_discard; > + > bool (*start_sync)(struct mddev *mddev, sector_t offset, > sector_t *blocks, bool degraded); > void (*end_sync)(struct mddev *mddev, sector_t offset, sector_t *= blocks); > diff --git a/drivers/md/md.c b/drivers/md/md.c > index 04a659f40cd6..466087cef4f9 100644 > --- a/drivers/md/md.c > +++ b/drivers/md/md.c > @@ -8845,18 +8845,24 @@ EXPORT_SYMBOL_GPL(md_submit_discard_bio); > static void md_bitmap_start(struct mddev *mddev, > struct md_io_clone *md_io_clone) > { > + md_bitmap_fn *fn =3D unlikely(md_io_clone->rw =3D=3D STAT_DISCARD= ) ? > + mddev->bitmap_ops->start_discard : > + mddev->bitmap_ops->start_write; > + > if (mddev->pers->bitmap_sector) > mddev->pers->bitmap_sector(mddev, &md_io_clone->offset, > &md_io_clone->sectors); > > - mddev->bitmap_ops->start_write(mddev, md_io_clone->offset, > - md_io_clone->sectors); > + fn(mddev, md_io_clone->offset, md_io_clone->sectors); > } > > static void md_bitmap_end(struct mddev *mddev, struct md_io_clone *md_io= _clone) > { > - mddev->bitmap_ops->end_write(mddev, md_io_clone->offset, > - md_io_clone->sectors); > + md_bitmap_fn *fn =3D unlikely(md_io_clone->rw =3D=3D STAT_DISCARD= ) ? > + mddev->bitmap_ops->end_discard : > + mddev->bitmap_ops->end_write; > + > + fn(mddev, md_io_clone->offset, md_io_clone->sectors); > } > > static void md_end_clone_io(struct bio *bio) > @@ -8895,6 +8901,7 @@ static void md_clone_bio(struct mddev *mddev, struc= t bio **bio) > if (bio_data_dir(*bio) =3D=3D WRITE && md_bitmap_enabled(mddev)) = { > md_io_clone->offset =3D (*bio)->bi_iter.bi_sector; > md_io_clone->sectors =3D bio_sectors(*bio); > + md_io_clone->rw =3D op_stat_group(bio_op(*bio)); > md_bitmap_start(mddev, md_io_clone); > } > > diff --git a/drivers/md/md.h b/drivers/md/md.h > index c241119e6ef3..13e3f9ce1b79 100644 > --- a/drivers/md/md.h > +++ b/drivers/md/md.h > @@ -850,6 +850,7 @@ struct md_io_clone { > unsigned long start_time; > sector_t offset; > unsigned long sectors; > + enum stat_group rw; > struct bio bio_clone; > }; > > -- > 2.39.2 > > Reviewed-by: Xiao Ni