Date: Fri, 3 May 2024 09:25:00 -0600 From: Warner Losh <imp@bsdimp.com> To: Ronald Klop <ronald-lists@klop.ws> Cc: Warner Losh <imp@freebsd.org>, dev-commits-src-all@freebsd.org, src-committers@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 12117d0e9314 - main - da: Update trim stats for WRITE SAME and ATA TRIM Message-ID: <CANCZdfomJiBfP1njZVLQWfaZGoA1fDqgvWMOB7EXJLk6UX_LQQ@mail.gmail.com> In-Reply-To: <1010899452.10421.1714749653185@localhost> References: <202405031447.443ElgZj051266@gitrepo.freebsd.org> <1010899452.10421.1714749653185@localhost>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000006295d406178e53a1 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, May 3, 2024 at 9:21=E2=80=AFAM Ronald Klop <ronald-lists@klop.ws> w= rote: > Are you sure you used the right PR? > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D277637 > "[NEW PORT] security/enc: Modern and friendly CLI alternative to GnuPG" > Doh! Should have used 277673. </doh!> Warner > > > Regards, > Ronald. > > > > *Van:* Warner Losh <imp@FreeBSD.org> > *Datum:* vrijdag, 3 mei 2024 16:47 > *Aan:* src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, > dev-commits-src-main@FreeBSD.org > *Onderwerp:* git: 12117d0e9314 - main - da: Update trim stats for WRITE > SAME and ATA TRIM > > The branch main has been updated by imp: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D12117d0e9314d1706508386c1c49ace= 2de578b31 > > commit 12117d0e9314d1706508386c1c49ace2de578b31 > Author: Matthew Grooms <mgrooms@shrew.net> > AuthorDate: 2024-05-03 14:41:05 +0000 > Commit: Warner Losh <imp@FreeBSD.org> > CommitDate: 2024-05-03 14:46:59 +0000 > > da: Update trim stats for WRITE SAME and ATA TRIM > > The scsi UNMAP path updated trim stats in the da sysctl, but the ATA > TRIM passthru and WRITE SAME paths did not. Add code so they do. > > PR: 277637 > Reviewed by: imp (tweaked WS path to update ranges) > --- > sys/cam/scsi/scsi_da.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c > index 9b3d706d6168..0daaff9229b0 100644 > --- a/sys/cam/scsi/scsi_da.c > +++ b/sys/cam/scsi/scsi_da.c > @@ -4208,6 +4208,9 @@ da_delete_trim(struct cam_periph *periph, union ccb > *ccb, struct bio *bp) > da_default_timeout * 1000); > ccb->ccb_h.ccb_state =3D DA_CCB_DELETE; > ccb->ccb_h.flags |=3D CAM_UNLOCKED; > + softc->trim_count++; > + softc->trim_ranges +=3D ranges; > + softc->trim_lbas +=3D block_count; > cam_iosched_submit_trim(softc->cam_iosched); > } > > @@ -4268,6 +4271,9 @@ da_delete_ws(struct cam_periph *periph, union ccb > *ccb, struct bio *bp) > da_default_timeout * 1000); > ccb->ccb_h.ccb_state =3D DA_CCB_DELETE; > ccb->ccb_h.flags |=3D CAM_UNLOCKED; > + softc->trim_count++; > + softc->trim_ranges++; > + softc->trim_lbas +=3D count; > cam_iosched_submit_trim(softc->cam_iosched); > } > > > ------------------------------ > > > > --0000000000006295d406178e53a1 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">= <div dir=3D"ltr" class=3D"gmail_attr">On Fri, May 3, 2024 at 9:21=E2=80=AFA= M Ronald Klop <<a href=3D"mailto:ronald-lists@klop.ws">ronald-lists@klop= .ws</a>> wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"marg= in:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1e= x"><div>Are you sure you used the right PR?<br> <br> <a href=3D"https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D277637" targ= et=3D"_blank">https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D277637</a= ><br> "<span id=3D"m_-1572156723909711205summary_container"><span id=3D"m_-1= 572156723909711205short_desc_nonedit_display">[NEW PORT] security/enc: Mode= rn and friendly CLI alternative to GnuPG"<br></span></span></div></blo= ckquote><div><br></div><div>Doh! Should have used 277673. </doh!></di= v><div><br></div><div>Warner <br></div><blockquote class=3D"gmail_quote" st= yle=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padd= ing-left:1ex"><div><span id=3D"m_-1572156723909711205summary_container"><sp= an id=3D"m_-1572156723909711205short_desc_nonedit_display"> <br> <br> Regards,<br> Ronald.</span></span><br> <br> =C2=A0 <p><b>Van:</b> Warner Losh <imp@FreeBSD.org><br> <b>Datum:</b> vrijdag, 3 mei 2024 16:47<br> <b>Aan:</b> src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, de= v-commits-src-main@FreeBSD.org<br> <b>Onderwerp:</b> git: 12117d0e9314 - main - da: Update trim stats for WRIT= E SAME and ATA TRIM</p> <blockquote style=3D"padding-right:0px;padding-left:5px;margin-left:5px;bor= der-left:2px solid rgb(0,0,0);margin-right:0px"> <div id=3D"m_-1572156723909711205P"> <div id=3D"m_-1572156723909711205P.P">The branch main has been updated by i= mp:<br> <br> URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3D12117d0e9314d1706= 508386c1c49ace2de578b31" target=3D"_blank">https://cgit.FreeBSD.org/src/com= mit/?id=3D12117d0e9314d1706508386c1c49ace2de578b31</a><br> <br> commit 12117d0e9314d1706508386c1c49ace2de578b31<br> Author: =C2=A0=C2=A0=C2=A0=C2=A0Matthew Grooms <<a href=3D"mailto:mgroom= s@shrew.net" target=3D"_blank">mgrooms@shrew.net</a>><br> AuthorDate: 2024-05-03 14:41:05 +0000<br> Commit: =C2=A0=C2=A0=C2=A0=C2=A0Warner Losh <imp@FreeBSD.org><br> CommitDate: 2024-05-03 14:46:59 +0000<br> <br> =C2=A0=C2=A0=C2=A0=C2=A0da: Update trim stats for WRITE SAME and ATA TRIM<b= r> =C2=A0=C2=A0=C2=A0=C2=A0<br> =C2=A0=C2=A0=C2=A0=C2=A0The scsi UNMAP path updated trim stats in the da sy= sctl, but the ATA<br> =C2=A0=C2=A0=C2=A0=C2=A0TRIM passthru and WRITE SAME paths did not. Add cod= e so they do.<br> =C2=A0=C2=A0=C2=A0=C2=A0<br> =C2=A0=C2=A0=C2=A0=C2=A0PR: 277637<br> =C2=A0=C2=A0=C2=A0=C2=A0Reviewed by: imp (tweaked WS path to update ranges)= <br> ---<br> =C2=A0sys/cam/scsi/scsi_da.c | 6 ++++++<br> =C2=A01 file changed, 6 insertions(+)<br> <br> diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c<br> index 9b3d706d6168..0daaff9229b0 100644<br> --- a/sys/cam/scsi/scsi_da.c<br> +++ b/sys/cam/scsi/scsi_da.c<br> @@ -4208,6 +4208,9 @@ da_delete_trim(struct cam_periph *periph, union ccb *= ccb, struct bio *bp)<br> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0da_default_timeout * 1000);<br> =C2=A0=C2=A0=C2=A0=C2=A0ccb->ccb_h.ccb_state =3D DA_CCB_DELETE;<br> =C2=A0=C2=A0=C2=A0=C2=A0ccb->ccb_h.flags |=3D CAM_UNLOCKED;<br> + =C2=A0=C2=A0softc->trim_count++;<br> + =C2=A0=C2=A0softc->trim_ranges +=3D ranges;<br> + =C2=A0=C2=A0softc->trim_lbas +=3D block_count;<br> =C2=A0=C2=A0=C2=A0=C2=A0cam_iosched_submit_trim(softc->cam_iosched);<br> =C2=A0}<br> =C2=A0<br> @@ -4268,6 +4271,9 @@ da_delete_ws(struct cam_periph *periph, union ccb *cc= b, struct bio *bp)<br> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0da_= default_timeout * 1000);<br> =C2=A0=C2=A0=C2=A0=C2=A0ccb->ccb_h.ccb_state =3D DA_CCB_DELETE;<br> =C2=A0=C2=A0=C2=A0=C2=A0ccb->ccb_h.flags |=3D CAM_UNLOCKED;<br> + =C2=A0=C2=A0softc->trim_count++;<br> + =C2=A0=C2=A0softc->trim_ranges++;<br> + =C2=A0=C2=A0softc->trim_lbas +=3D count;<br> =C2=A0=C2=A0=C2=A0=C2=A0cam_iosched_submit_trim(softc->cam_iosched);<br> =C2=A0}<br> =C2=A0<br> =C2=A0</div> <hr></div> </blockquote> <br> =C2=A0</div></blockquote></div></div> --0000000000006295d406178e53a1--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfomJiBfP1njZVLQWfaZGoA1fDqgvWMOB7EXJLk6UX_LQQ>