From patchwork Thu Nov 11 06:46:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yihao Han X-Patchwork-Id: 12614275 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11AB6C433F5 for ; Thu, 11 Nov 2021 06:46:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8F6DB6128E for ; Thu, 11 Nov 2021 06:46:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8F6DB6128E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=vivo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id EF2586B00A7; Thu, 11 Nov 2021 01:46:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E7CB36B00A9; Thu, 11 Nov 2021 01:46:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CA6B96B00AB; Thu, 11 Nov 2021 01:46:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0050.hostedemail.com [216.40.44.50]) by kanga.kvack.org (Postfix) with ESMTP id A9AD16B00A7 for ; Thu, 11 Nov 2021 01:46:35 -0500 (EST) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 4F3DA18522FF9 for ; Thu, 11 Nov 2021 06:46:35 +0000 (UTC) X-FDA: 78795715950.12.D63AC38 Received: from APC01-PU1-obe.outbound.protection.outlook.com (mail-eopbgr1320102.outbound.protection.outlook.com [40.107.132.102]) by imf04.hostedemail.com (Postfix) with ESMTP id B361E50000BE for ; Thu, 11 Nov 2021 06:46:23 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BuECx8DIEqNqb5mO9mwhuKXakqsv9T7RiQ12/IImB+W3DEJr9GuUjSrfxUHvmZuqOkNaI9EVXuC+Tw5PkWgzSxvhrPamBCU99ybRoWcjM4YrwFrWitW7MKussT10cd0cxcuAK3pz4PY5u87DXh7IQwCnebG6FX1U3l5TriT6soUaouG1uDHdvo6IkrMIy166Afnr3oLjQpCbg/27uQycAomtFj7WYXLHiklwh7yaLj3lQkUpJY8u1G7ZUxp9U+4CEaTXPso5T764AxbuO54UKICA+7KfWqHiam+BbW2SDSp+GKwja0zESbsP7qvmkKk9DwTv28LDunwCcHd2ERg/Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0Rb0fEVVPRfLkfggrMZ+0O9SFO104LaNF7gS+qQdrsU=; b=OU8boVi4Azea0YbjnvML/TxarmsYdmeBODGvZmeE+HRsIJLPw5Kv/asLpRXmhdBBwLhUGWoCMPnW2eEAF3xYUhbCS3SOx4PNY+cFYLB0/V1F2WYIB8PYDYLrYauAgtVNu5d3wjQb611o78jK3Je17ILTVvVxjNCJGYUUS43Wb7cr7Pc8vcynPq89Zad3ZEJQYAVI3QNXb/4CF38VgW/7BNlcYgRlTGMuXg4r/DMs4g5knOfft3e0ZMbMdxLDqZRJRh0MzGoUxqXJxrw0Bgy2FyKXvzmqON4VzTPRciKqydepI2eY95a4kZ91vtFmmxyL33THWphD4w2D5ei3yvWpJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo0.onmicrosoft.com; s=selector2-vivo0-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0Rb0fEVVPRfLkfggrMZ+0O9SFO104LaNF7gS+qQdrsU=; b=O1/pv71+KHc71s+ysqs9Fkv39ac/+cDVspIMFYRATe/mcRebujbb3ESkZpxHyFaJXPSWCvzsy8luOLjRQiSfGt4+24w9SvdZTXzIyxVI0zp/ASd4m6xF3oLq7aVh1YY8v/8GbZ8MXrmpJ8XnPPmwYbKLgGb/uxwZwrsU3o1/Ucg= Received: from TYZPR06MB4173.apcprd06.prod.outlook.com (2603:1096:400:26::14) by TY2PR06MB3648.apcprd06.prod.outlook.com (2603:1096:404:fa::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Thu, 11 Nov 2021 06:46:30 +0000 Received: from TYZPR06MB4173.apcprd06.prod.outlook.com ([fe80::5e:78e1:eba3:7d0e]) by TYZPR06MB4173.apcprd06.prod.outlook.com ([fe80::5e:78e1:eba3:7d0e%8]) with mapi id 15.20.4669.016; Thu, 11 Nov 2021 06:46:30 +0000 From: Yihao Han To: SeongJae Park , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: kernel@vivo.com, Yihao Han Subject: [PATCH v2] mm/damon/vaddr: remove swap_ranges() and replace it with swap() Date: Wed, 10 Nov 2021 22:46:17 -0800 Message-Id: <20211111064617.4729-1-hanyihao@vivo.com> X-Mailer: git-send-email 2.17.1 X-ClientProxiedBy: HK2PR02CA0203.apcprd02.prod.outlook.com (2603:1096:201:20::15) To TYZPR06MB4173.apcprd06.prod.outlook.com (2603:1096:400:26::14) MIME-Version: 1.0 Received: from ubuntu.localdomain (103.220.76.181) by HK2PR02CA0203.apcprd02.prod.outlook.com (2603:1096:201:20::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Thu, 11 Nov 2021 06:46:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 80a05415-eed5-4698-5e63-08d9a4defe21 X-MS-TrafficTypeDiagnostic: TY2PR06MB3648: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u2lHn6KxF9l65Di3T/PMC8djIE1N41fW1NWRpVlMvGbhOR43FzWU8LcKHxyyUPbw6C4sBZI3pTfAAK6sWKbPXpGPOwRiluTO2fVa3YhHdJ/mX3L4xCIVYnft+1XTSSClh67xIJA/jJjaCWRdjaLGom2rv2dhJHeXT6UNBlmmUd0f0fwOcmizqSFOkEFoSWVTGrV9ZdTKhHDAahMRZa8CXF+3bynve15FLtiWiLd8piy90fKtOWUCIJtgEQkYGFlhee2fasgH589xsudoNj8T0DKv/i6U9ZvmU/l8c2Mi/EEMNWtfKdoTYm22zmw+PHRXRkxTYoYIwz4wWm/5I6xIvbSqe2uIoW/pObCLDdNo9VqqXt8BpmPbAvVB9K9XLSkA5iVsVcLO5cSUdmXSCiFSH+Jbzmws8otArMeWVzVntLUPTRf+GUH716alaBXjAfAwR5vH6rZgwnIjHaNzrTmQgnOkMKZ80JyBs0zR12vyu/X/c+Fr2KR4/wN3ukPfGf8gm9peQwFoq0DZDn9lqduZGBJJKcd5wVYD9he70MgqAGEcMG4VreF3RcutuQQuxkIE0oOYc0fPeXMDIEUk5pmHi4sHkC11FR9CJqhf4MN20VWBZSVNesOOG6BW/u1KeEFzCmLGXgk0DE03+iYucTZTrZ1/LAq6pQfP7bXIws8dROpNaBvtROD2N4/WDVQ3HmZ8Llca7rPxAYhiUNPM/CyzkA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYZPR06MB4173.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(110136005)(6512007)(316002)(38100700002)(1076003)(4326008)(66946007)(8676002)(6506007)(107886003)(2906002)(26005)(2616005)(5660300002)(83380400001)(956004)(52116002)(508600001)(66556008)(6666004)(186003)(86362001)(8936002)(66476007)(6486002)(38350700002)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YlJ1nUoovEWy3a6H6FQf19xNvZ1otwFeN1sfu43S79xxMw7lOLG4VKi/OaHjEBgU1Ddip8CWD69ME8FMsM2ODN5AvrjCgZlqdUDPJ1ydMD1YUWgQVE+kX2Ykxm9m10Qs7TUxu1QmPUA+fUCYgwD6huu81CkdkB4eF23CyOiTC9gCOYug7d0bSsaX8x5AO2u2yeuvj9ytxe7DRHlMzHY1rPaqU5jTzUPOnqx8aF/TMnguPzkpbOpuI5YKoeGZPPoiPQujmjToGY7bKccP2aqR9q4KuzbkdI3HoO/iW3xzuv8qRdWxDNpYzqZXDYfV+pA3fC5LEDA7JEhMaVzlfao5Q9prUiVXw0cH5h2O0aWroK9rvQ8aCRYq9y1wvmXQD+iiXCmZX+wBU2CJCUBUnXBi6J+TaYGTKXfoDJVanVX+Ul76X424ZlHRuOVQeHoOJ/6kvt/NsWtZJWYUJxd7j6QW19pIoX+64VxT4zBZ0q0VYtTL0ys80600y0t6VVNVDwn5IGE5MNxk67f+jmtjuug7jsqYZvMVPc5JHkwCSPiCueebksSqfNLezMQyc6FV2Vw4AFLO1JYYGR5pgFdgJ4JD13rIHMrS8bNc3JSfI//1qVGlBCpRKpbkaqdMejfESm2CcX8hDy6gs/t66pny+g2EuWmLGZspai86ooOcpDRlaArpb0psXnw+HHa6bwi30c8fte8Z8ShVJbfhP+mGz/jnIb46Nt15C0A5RlD/XayQ+m3cpTdNPRNcYQVtZRYbCWqntlaletRNlqjYkt9d2XRX72sPFtX/RYfZRhp1I0VIF+Yzlr3pgq14oxZOlx2zZGxadtC75ahwUch+EyhAwHZVryiiDW+GeT+m4qfMZXIra7+NRSRiOyj7pYyEShaFR7PhxBSrCVxb6m80VKCoovEFduQgai6xxlaYRPr91ZgnmfzjaTy2V7bh6m12KQqHZaanltTJoa+pfp2OiLWtA0VikPo4w1p4JGkwF/9jO6kK0TCK+oQ0fp4OtExHixBDa5vDDwOoTR3hK3o+A96tRuaMKo1xshNRmRFC3vECS6kqKNaSJIDw0Hpd9s6Fd4xVjoGbCQJvh4W5mQ0upSjvTaKCa+DQD07xbLr4rHTgvNubzpF2J3l8hSP8Fh1tEJsyIMaU7K+ZC1zLRLK67eOzy2Dmd99YYqGVlWDXafbXI4w1rGQVSUrG0pjtle3umlvNtXoLCkexMJaFFzD8GxtZaXeIp+OT7u2jBuUCaoJZJveAwckzTJ9mc/p18/KuTQ2l+TcDOR6eXJ9GiH5peACEmYVhuiwI2UoaXsVAN8vtts0ISFPAM50RSAOAHjHEv0Ytrxm94dgpoVZcpYvQ0Xuq6hp1L2zyqrMvRWsg0ZZIx0Yl0h+eNz4AjOmQFD+BBIfN9WbMgHixWX3hMnoeTvUgvzvFMJ7BV6tXpbrXLQLYOuSH586fECRzcPAxmRMdn3RB8RJ6dQoHjsRgu6A0Ptad9JlQ4zGMO0Pi48WVAr/FLMvOx10Q0RCmNKhkJY2znYrjmaiDkKo7cjcGoUXJtD7uUVXiTMJmyDtALadrRoN6ZH/M670DatM9NRllZ+unG5+3Il44dwVFKEDXAr+Di7ZHlsmN6L0xZr1WHFJ24BoMRQAWwCA= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80a05415-eed5-4698-5e63-08d9a4defe21 X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB4173.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2021 06:46:30.3886 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: LPk1PeP2g3FWwNIvF7LYdyA+x+bymG/lw01nQzOa/4t/9L6XaYGkQtpO5UfgsHAtcV4iZZdJ80yqNJ9d3408GA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY2PR06MB3648 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: B361E50000BE X-Stat-Signature: jizsptcgi3gg53wy34hbyzzoopq575gc Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=vivo0.onmicrosoft.com header.s=selector2-vivo0-onmicrosoft-com header.b="O1/pv71+"; spf=pass (imf04.hostedemail.com: domain of hanyihao@vivo.com designates 40.107.132.102 as permitted sender) smtp.mailfrom=hanyihao@vivo.com; dmarc=pass (policy=none) header.from=vivo.com X-HE-Tag: 1636613183-854925 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000357, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Remove 'swap_ranges()' and replace it with the macro 'swap()' defined in 'include/linux/minmax.h' to simplify code and improve efficiency Changes in v2: - Remove the 'swap_ranges()' function and replace it with 'swap()' rather than changing the 'swap_ranges()' itself Reviewed-by: Muchun Song Signed-off-by: Yihao Han Reviewed-by: SeongJae Park --- mm/damon/vaddr.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/mm/damon/vaddr.c b/mm/damon/vaddr.c index 35fe49080ee9..814dc811d7c4 100644 --- a/mm/damon/vaddr.c +++ b/mm/damon/vaddr.c @@ -97,16 +97,6 @@ static unsigned long sz_range(struct damon_addr_range *r) return r->end - r->start; } -static void swap_ranges(struct damon_addr_range *r1, - struct damon_addr_range *r2) -{ - struct damon_addr_range tmp; - - tmp = *r1; - *r1 = *r2; - *r2 = tmp; -} - /* * Find three regions separated by two biggest unmapped regions * @@ -145,9 +135,9 @@ static int __damon_va_three_regions(struct vm_area_struct *vma, gap.start = last_vma->vm_end; gap.end = vma->vm_start; if (sz_range(&gap) > sz_range(&second_gap)) { - swap_ranges(&gap, &second_gap); + swap(gap, second_gap); if (sz_range(&second_gap) > sz_range(&first_gap)) - swap_ranges(&second_gap, &first_gap); + swap(second_gap, first_gap); } next: last_vma = vma; @@ -158,7 +148,7 @@ static int __damon_va_three_regions(struct vm_area_struct *vma, /* Sort the two biggest gaps by address */ if (first_gap.start > second_gap.start) - swap_ranges(&first_gap, &second_gap); + swap(first_gap, second_gap); /* Store the result */ regions[0].start = ALIGN(start, DAMON_MIN_REGION);