From patchwork Thu Nov 11 03:22:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yihao Han X-Patchwork-Id: 12613995 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 7C758C433F5 for ; Thu, 11 Nov 2021 03:22:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D3955611AD for ; Thu, 11 Nov 2021 03:22:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D3955611AD 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 2DA5A6B00B8; Wed, 10 Nov 2021 22:22:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 28AE06B00BB; Wed, 10 Nov 2021 22:22:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1520F6B00BD; Wed, 10 Nov 2021 22:22:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0188.hostedemail.com [216.40.44.188]) by kanga.kvack.org (Postfix) with ESMTP id 057276B00B8 for ; Wed, 10 Nov 2021 22:22:43 -0500 (EST) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id B1E8D184B4528 for ; Thu, 11 Nov 2021 03:22:42 +0000 (UTC) X-FDA: 78795202164.25.04AA312 Received: from APC01-PU1-obe.outbound.protection.outlook.com (mail-eopbgr1320122.outbound.protection.outlook.com [40.107.132.122]) by imf29.hostedemail.com (Postfix) with ESMTP id 7E6E0900026F for ; Thu, 11 Nov 2021 03:22:41 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GDRj3H/o7gFNunt+P+lxyLP41NhqJylJdSyXe8tvsU92h1YTPEMF4SRduC030vs39Co8Aq3mK1Ry8MQqM6lW2w9tXkusoFaMst8pAyjF7W1HcPjgbjzBKQwlfwA5cwQJ1Rul3j6S24rwAtzzZ+UQo1lPlJxxHR+bTfj+TlW9IGFEqAXWGlcQ1tC3wyRp+VYiK3M4Ut8+mzLPSbWwFreESfiJnbIFcgOV8szUrG/u/VBlbVkxcCtJAJSR5C1flV4TQYI2O9m9NHngP5udDOvoCljhHT+1UJVW+14/MQY2UhaFFGN8n8ZIDNSzzEqKnkWjR+dMPrIN7P+F4d9SBuO8Eg== 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=EQhviZWO6pizPwFBvpxXzj9SdkygfsvuMMlLK/KALr8=; b=WByYsyScZ/vgDUPLpnFIXEf2j3c2BrYZhKYqzmf2d9dYFxi8oM2kF6qgSGcFMdzcwI3ORLFhFSfmFEeeR/gQB5UG/x4eMsTNpUm6TIur//dITv6IWF20ugmbuIjB0TogTzV4ii4h7mqHUIvYEv6MLitgbk0V7zx1+duRLd8HmoLb9j6kDBIAJnGgVcPovu/hY4GLb4lK8/OZLIVju1LF7v4XSTwe/UDf0wclrJHp7Bk3P6d3WWoqtEsfybIBISs1xjJzC+FGaChGKhWitzuIP+rIrpEFFA9mWswX791iz57Ao1m9njyk1g1oCJV1RIgrtGo+I4fLKZ4oe8wP9oFAsw== 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=EQhviZWO6pizPwFBvpxXzj9SdkygfsvuMMlLK/KALr8=; b=GREnIbovPqJVUsY7gatxD/XW43GUS5H9/oLY7RtzLu1K5OaR67zizrOcb5HIpwQ/xyrvHasrNB+P3ePwPPI0YJIiBL368Ay/upnvFEkxy3It305hEq5E1bDu7bGHkEIZDqOsrxZPuNTK7Td1VtdpPDh/T28CrTFO5CAwtHHEGI8= Received: from TYZPR06MB4173.apcprd06.prod.outlook.com (2603:1096:400:26::14) by TY2PR06MB2526.apcprd06.prod.outlook.com (2603:1096:404:46::9) 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 03:22:37 +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 03:22:37 +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] mm/damon/vaddr: remove swap_ranges() and replace it with swap() Date: Wed, 10 Nov 2021 19:22:03 -0800 Message-Id: <20211111032204.3721-1-hanyihao@vivo.com> X-Mailer: git-send-email 2.17.1 X-ClientProxiedBy: SG2PR03CA0108.apcprd03.prod.outlook.com (2603:1096:4:7c::36) To TYZPR06MB4173.apcprd06.prod.outlook.com (2603:1096:400:26::14) MIME-Version: 1.0 Received: from ubuntu.localdomain (218.213.202.189) by SG2PR03CA0108.apcprd03.prod.outlook.com (2603:1096:4:7c::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.7 via Frontend Transport; Thu, 11 Nov 2021 03:22:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a1abd4af-748e-48fa-7b9b-08d9a4c282c6 X-MS-TrafficTypeDiagnostic: TY2PR06MB2526: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0dpagRTLJn759c2QETD5P8iSekJJneGRt9ixIlJsqJD2y5zbWMzwd6Zbq0oqjuYulFDY8PoV5GAuM98+5np4S+CQxsr/J6S2sc12qb9T/K4nWfmlAoBXxwCLMm8TUI//KJrOSv9qLKuD4D6vYL0aCecER7fXbNZkJlESxWtUuZjyjUpTSf8+bU+XFWEWLs4nVWvhrn0pxG8h99c0i5HQnRByWSc4Z7FbqeuRygE8uEh7YgnfToKykG4OEeGg6bWENADwaP1yIDXXtyU5ZZgY1B/D70jbLLPUZlAQpuLcdnPLOLo7PJL6V7nQPBwPnjKDh8NsU5Ca4fTK0OWhWSPKwtTexXhC2FsQd44VYYkIVOAiSFukLxtzCRgtZOodvv9gwrby4QPiVMpNrB3t/emBk5tph39/bS1zHgp1FsYBWmQOSIJhnDMRxvJOZjsthsT4GGlWCoP8SwomPcsSN2uWNmQUdsn05JYnP44gRC6YBAC2PoEA8Ztc5k3lwvn5PeLm3sIXVDcYNkTFtQnTg5Nlnm+WIn2pG1/eQVv7MbxoQJQaBWDcFwiCt589wDoaw2ZrEDLzYjWjBU0Iuq5/ptUMlGqhwCgIh7oqgTgiuS2tKb4Iz6TRSybH2Dw/UiYtJ1reJ844x5p00IEf7/Fg4CVoN8MiB0g958/eZ/hy4tX177QTM8d+PJ/yNPvU1ZXFk2Iwc1PJ/RXOffFaUJWWeoUGiw== 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)(52116002)(66946007)(2906002)(4326008)(186003)(36756003)(6506007)(6512007)(8676002)(86362001)(1076003)(316002)(26005)(6486002)(6666004)(5660300002)(508600001)(8936002)(66476007)(956004)(107886003)(2616005)(38350700002)(83380400001)(110136005)(38100700002)(66556008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SII8tetE9UxUhMLW3//vb1ggTjDnNfC2ssN6t9VKUhRvwk6+H5LccukFRXQXkoDDi9nzXvcZvtLFByx6n3EpGaHSRTtYaJuBCaj821Dd5Ts7WNmES8unJdYuk4ZEZJqzM3TG/VRfX0BcPeadXQX6lH5i668i29GSLqoV9mmChodU4JBUxD+ssGHKPDhhqxlR6FUy9QJeTRfxAbeNAg0SXXvW83FfLawGNuCyNzPKByAc8eMd9iYCJLZF0pWfavtC7QlWyckW1uBtfqm3cxcgTpW3Vzkfv9f4KEljzOwOQQI9evrSvW+lFXdGgdaNhHXY7A5QWgPr8FYGAR4GOC7Zepv/tib9JIzkfoGoEEuWjnSHFf/kxKPElvIB78uGRAmXe7FEk7sKGciMWfS+t9/i2L/wgkmtD1ktYYfrZraUkwa2Qtir07JU3s5U/t7Pob05tbVb7KdL0Q39pkSP9TFA5O3F8LW9JsSkRBife6276K7/WoXl3rUdLrlyHcNh5eHMT8Qzzo0jxH5vwxM1Cc3jdB0zf5MYXg2+BFPZG40CJCFFmZ5zDzYjJ3q5gVaxRqTzwk8CHBhjo5h84G2tyQRSRBub9T20aryK6IspDhla4vupAb5WAx+T7vF1mYu30pkYhzYzI0Ky8Y6MpUmenoGWs0kOKlinvB+59DYc+l4w4Jmv4jsPveAtuN3pHauBufr+udw3XJyiaUVEBEmnAcAq1cCdA5+1dw5ThqRBN14gRJDkNDQhqmK0iyx8dAjVmUN7cQQa1nZ1Ne7C92tc7y/EDxHq6G2Zt0YmfG3uZdj94n9rpyA3NkCM/3t2raoACZnXlc9hLRnmUR82auJCIK30WRo0IdIKAAnF9NJBNx7GjLUGzuLybNK8GYFyQvRaoB68HxBdxAYQxlIYbRGzkgROqu2RVCgA0mbSt/F0tJhndA25cjyDyWtTLxVIgS3FuU7fTBY+HweBQGO3zXFHaTfRQdxBD4Qp9Wpe8teoeQVi/3hfi7XE8YSyYejfiufCDnhjcK6O0St6PeQfofk/fEhYTqgJHe9cShz1/t6RY/XyXh55GB9DwzYCulsqGLWUpAOEaXBSrDiuJqVnSLYj/JVsxo+B50nNWLQrvc7FiBoIOYyrourq6yBhCPSe9enHyFCf/8EkL3s8GNlGbP/6TvqAo8rzcpJzWrDlL0VWthQfEmqTR74UtZ7RJnr3y5cVvpjZDN0uReUaNHD3jxNrd0e+GHBTFMvj+rj0bqdxu0jV1eZDThqW/4Hv0Rch/V7MrosDRCd5WdepVkdrsujQaolqz1eEB8QZG0opXHeZBr4Aig8kdfNI63MN3AH8VNv7tS9SjqcXG0iTBeG1olv93KT7rntN9qy9vdeXERK9CrKItkp44qR9LnQIw1BahXzwhqso25eV7vLNhpv3ugWb82pQjmJKQU26Kat02ibTuFsPkPq5ZmgeXqi5BqtikKyqulQj5ghHuaCH/ku05jFC3FP33fPFBh/pI3+8T8o/Z2A3p96/zsYirSg26qUL4WRFzBKyFzzGKexnrDcd8SsWhZyfJ35OKO5DxFhv9u80B0tBtmFRx/Bi9HqWlNCXlPHaas1d07alCcgIAgqpGhkKYL7AvkYOKSOlhW6b5J2REaSlFZg= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1abd4af-748e-48fa-7b9b-08d9a4c282c6 X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB4173.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2021 03:22:37.6661 (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: eTXIH4/53sboLiDxGpPa4Rfg7Xl1OlhqECmU07vqNYBD2eBYmfft7bAGZFpH+FZAms2S+tu2SJIZtPG0nOgowg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY2PR06MB2526 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 7E6E0900026F X-Stat-Signature: afwkam1k9unoej16mjm3pb9dqfuqqnez Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=vivo0.onmicrosoft.com header.s=selector2-vivo0-onmicrosoft-com header.b=GREnIbov; spf=pass (imf29.hostedemail.com: domain of hanyihao@vivo.com designates 40.107.132.122 as permitted sender) smtp.mailfrom=hanyihao@vivo.com; dmarc=pass (policy=none) header.from=vivo.com X-HE-Tag: 1636600961-891027 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000310, 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 Reviewed-by: SeongJae Park Reviewed-by: Muchun Song Signed-off-by: Yihao Han Reviewed-by: Muchun Song --- 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);