From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1A3DC2BA1B for ; Wed, 8 Apr 2020 17:23:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7CACB208E4 for ; Wed, 8 Apr 2020 17:23:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="TMyA+IlC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730542AbgDHRXC (ORCPT ); Wed, 8 Apr 2020 13:23:02 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:43158 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727327AbgDHRXC (ORCPT ); Wed, 8 Apr 2020 13:23:02 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 038H9q2S107158; Wed, 8 Apr 2020 17:22:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2020-01-29; bh=7/ykUqmNCz9n7HAwHH+B2kDQo7m2GeocVwqVZEGYomM=; b=TMyA+IlCznDpQ2pxaEVofFEv9FOtkPK0T5uNhSzW2yW3CEw3dprO/EFhBe4qO17a77kk /r1YvlpWxwfJWx1ccUkdlcY5QEW9+dOixnur5wZx2rGO8Xn3gNc4GO5aHWkCXgRLHcIb iuvVpukrNlzQZqAvpm4ze5HEuYM3tqFcQC9NSi0GaTlPMefPFXIJUETqnt5kBG2UnNT0 pNdXr0xyiPKD2WyaStmGUQDfleC+CD941IV2Tpqo/emb/lqnxhHWOW2wjk1T5IPx+I7C NVmNce6eiJETAQpfoaLFyirjRMFNP5PjBbZS1XEFIMKd19mxTzarsfqQJh3JKpbiJUxQ Ag== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by aserp2120.oracle.com with ESMTP id 3091m0vxfa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 08 Apr 2020 17:22:57 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 038H7AHL042231; Wed, 8 Apr 2020 17:22:57 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserp3030.oracle.com with ESMTP id 309ag2a0s9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 08 Apr 2020 17:22:57 +0000 Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 038HMud9004358; Wed, 8 Apr 2020 17:22:56 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 08 Apr 2020 10:22:56 -0700 Date: Wed, 8 Apr 2020 10:22:55 -0700 From: "Darrick J. Wong" To: Filipe Manana Cc: fstests , linux-btrfs , Filipe Manana Subject: Re: [PATCH 4/4] fsx: move range generation logic into a common helper Message-ID: <20200408172255.GA6749@magnolia> References: <20200408103627.11514-1-fdmanana@kernel.org> <20200408154843.GC6740@magnolia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9584 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0 malwarescore=0 phishscore=0 mlxscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004080129 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9584 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxlogscore=999 mlxscore=0 priorityscore=1501 phishscore=0 suspectscore=0 bulkscore=0 lowpriorityscore=0 impostorscore=0 malwarescore=0 clxscore=1015 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004080129 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On Wed, Apr 08, 2020 at 05:57:26PM +0100, Filipe Manana wrote: > On Wed, Apr 8, 2020 at 4:48 PM Darrick J. Wong wrote: > > > > On Wed, Apr 08, 2020 at 11:36:27AM +0100, fdmanana@kernel.org wrote: > > > From: Filipe Manana > > > > > > We have very similar code that generates the destination range for clone, > > > dedupe and copy_file_range operations, so avoid duplicating the code three > > > times and move it into a helper function. > > > > > > Signed-off-by: Filipe Manana > > > --- > > > ltp/fsx.c | 91 +++++++++++++++++++++++++-------------------------------------- > > > 1 file changed, 36 insertions(+), 55 deletions(-) > > > > > > diff --git a/ltp/fsx.c b/ltp/fsx.c > > > index 89a5f60e..8873cd01 100644 > > > --- a/ltp/fsx.c > > > +++ b/ltp/fsx.c > > > @@ -1930,6 +1930,36 @@ range_overlaps( > > > return llabs((unsigned long long)off1 - off0) < size; > > > } > > > > > > +static void generate_dest_range(unsigned long op, > > > + unsigned long max_range_end, > > > + unsigned long *src_offset, > > > + unsigned long *size, > > > + unsigned long *dst_offset) > > > +{ > > > + int tries = 0; > > > + > > > + TRIM_OFF_LEN(*src_offset, *size, file_size); > > > + if (op == OP_COPY_RANGE) { > > > > It feels funny that we pass in @op just to let COPY RANGE relax the > > block size alignment requirements. How about passing a block_align > > parameter (instead of op) which would be the subject of the if test? > > This way we concentrate the alignment requirement knowlege of each type > > of call in the "case OP_FOO" part of the code instead of scattering it? > > You mean something like the following: > > https://pastebin.com/e2NZKbZV > > ? Yep. --D > > > > > --D > > > > > + *src_offset -= *src_offset % readbdy; > > > + if (o_direct) > > > + *size -= *size % readbdy; > > > + } else { > > > + *src_offset = *src_offset & ~(block_size - 1); > > > + *size = *size & ~(block_size - 1); > > > + } > > > + > > > + do { > > > + if (tries++ >= 30) { > > > + *size = 0; > > > + break; > > > + } > > > + *dst_offset = random(); > > > + TRIM_OFF(*dst_offset, max_range_end); > > > + *dst_offset = *dst_offset & ~(block_size - 1); > > > + } while (range_overlaps(*src_offset, *dst_offset, *size) || > > > + *dst_offset + *size > max_range_end); > > > +} > > > + > > > int > > > test(void) > > > { > > > @@ -2004,63 +2034,14 @@ test(void) > > > keep_size = random() % 2; > > > break; > > > case OP_CLONE_RANGE: > > > - { > > > - int tries = 0; > > > - > > > - TRIM_OFF_LEN(offset, size, file_size); > > > - offset = offset & ~(block_size - 1); > > > - size = size & ~(block_size - 1); > > > - do { > > > - if (tries++ >= 30) { > > > - size = 0; > > > - break; > > > - } > > > - offset2 = random(); > > > - TRIM_OFF(offset2, maxfilelen); > > > - offset2 = offset2 & ~(block_size - 1); > > > - } while (range_overlaps(offset, offset2, size) || > > > - offset2 + size > maxfilelen); > > > - break; > > > - } > > > + generate_dest_range(op, maxfilelen, &offset, &size, &offset2); > > > + break; > > > case OP_DEDUPE_RANGE: > > > - { > > > - int tries = 0; > > > - > > > - TRIM_OFF_LEN(offset, size, file_size); > > > - offset = offset & ~(block_size - 1); > > > - size = size & ~(block_size - 1); > > > - do { > > > - if (tries++ >= 30) { > > > - size = 0; > > > - break; > > > - } > > > - offset2 = random(); > > > - TRIM_OFF(offset2, file_size); > > > - offset2 = offset2 & ~(block_size - 1); > > > - } while (range_overlaps(offset, offset2, size) || > > > - offset2 + size > file_size); > > > - break; > > > - } > > > + generate_dest_range(op, file_size, &offset, &size, &offset2); > > > + break; > > > case OP_COPY_RANGE: > > > - { > > > - int tries = 0; > > > - > > > - TRIM_OFF_LEN(offset, size, file_size); > > > - offset -= offset % readbdy; > > > - if (o_direct) > > > - size -= size % readbdy; > > > - do { > > > - if (tries++ >= 30) { > > > - size = 0; > > > - break; > > > - } > > > - offset2 = random(); > > > - TRIM_OFF(offset2, maxfilelen); > > > - offset2 -= offset2 % writebdy; > > > - } while (range_overlaps(offset, offset2, size) || > > > - offset2 + size > maxfilelen); > > > - break; > > > - } > > > + generate_dest_range(op, maxfilelen, &offset, &size, &offset2); > > > + break; > > > } > > > > > > have_op: > > > -- > > > 2.11.0 > > >