From:   Yihao Han <hanyihao@vivo.com>
To:     SeongJae Park <sj@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org
Cc:     kernel@vivo.com, Yihao Han <hanyihao@vivo.com>
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>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SII8tetE9UxUhMLW3//vb1ggTjDnNfC2ssN6t9VKUhRvwk6+H5LccukFRXQX?=
 =?us-ascii?Q?koDDi9nzXvcZvtLFByx6n3EpGaHSRTtYaJuBCaj821Dd5Ts7WNmES8unJdYu?=
 =?us-ascii?Q?k4ZEZJqzM3TG/VRfX0BcPeadXQX6lH5i668i29GSLqoV9mmChodU4JBUxD+s?=
 =?us-ascii?Q?sGHKPDhhqxlR6FUy9QJeTRfxAbeNAg0SXXvW83FfLawGNuCyNzPKByAc8eMd?=
 =?us-ascii?Q?9iYCJLZF0pWfavtC7QlWyckW1uBtfqm3cxcgTpW3Vzkfv9f4KEljzOwOQQI9?=
 =?us-ascii?Q?evrSvW+lFXdGgdaNhHXY7A5QWgPr8FYGAR4GOC7Zepv/tib9JIzkfoGoEEuW?=
 =?us-ascii?Q?jnSHFf/kxKPElvIB78uGRAmXe7FEk7sKGciMWfS+t9/i2L/wgkmtD1ktYYfr?=
 =?us-ascii?Q?ZraUkwa2Qtir07JU3s5U/t7Pob05tbVb7KdL0Q39pkSP9TFA5O3F8LW9JsSk?=
 =?us-ascii?Q?RBife6276K7/WoXl3rUdLrlyHcNh5eHMT8Qzzo0jxH5vwxM1Cc3jdB0zf5MY?=
 =?us-ascii?Q?Xg2+BFPZG40CJCFFmZ5zDzYjJ3q5gVaxRqTzwk8CHBhjo5h84G2tyQRSRBub?=
 =?us-ascii?Q?9T20aryK6IspDhla4vupAb5WAx+T7vF1mYu30pkYhzYzI0Ky8Y6MpUmenoGW?=
 =?us-ascii?Q?s0kOKlinvB+59DYc+l4w4Jmv4jsPveAtuN3pHauBufr+udw3XJyiaUVEBEmn?=
 =?us-ascii?Q?AcAq1cCdA5+1dw5ThqRBN14gRJDkNDQhqmK0iyx8dAjVmUN7cQQa1nZ1Ne7C?=
 =?us-ascii?Q?92tc7y/EDxHq6G2Zt0YmfG3uZdj94n9rpyA3NkCM/3t2raoACZnXlc9hLRnm?=
 =?us-ascii?Q?UR82auJCIK30WRo0IdIKAAnF9NJBNx7GjLUGzuLybNK8GYFyQvRaoB68HxBd?=
 =?us-ascii?Q?xAYQxlIYbRGzkgROqu2RVCgA0mbSt/F0tJhndA25cjyDyWtTLxVIgS3FuU7f?=
 =?us-ascii?Q?TBY+HweBQGO3zXFHaTfRQdxBD4Qp9Wpe8teoeQVi/3hfi7XE8YSyYejfiufC?=
 =?us-ascii?Q?DnhjcK6O0St6PeQfofk/fEhYTqgJHe9cShz1/t6RY/XyXh55GB9DwzYCulsq?=
 =?us-ascii?Q?GLWUpAOEaXBSrDiuJqVnSLYj/JVsxo+B50nNWLQrvc7FiBoIOYyrourq6yBh?=
 =?us-ascii?Q?CPSe9enHyFCf/8EkL3s8GNlGbP/6TvqAo8rzcpJzWrDlL0VWthQfEmqTR74U?=
 =?us-ascii?Q?tZ7RJnr3y5cVvpjZDN0uReUaNHD3jxNrd0e+GHBTFMvj+rj0bqdxu0jV1eZD?=
 =?us-ascii?Q?ThqW/4Hv0Rch/V7MrosDRCd5WdepVkdrsujQaolqz1eEB8QZG0opXHeZBr4A?=
 =?us-ascii?Q?ig8kdfNI63MN3AH8VNv7tS9SjqcXG0iTBeG1olv93KT7rntN9qy9vdeXERK9?=
 =?us-ascii?Q?CrKItkp44qR9LnQIw1BahXzwhqso25eV7vLNhpv3ugWb82pQjmJKQU26Kat0?=
 =?us-ascii?Q?2ibTuFsPkPq5ZmgeXqi5BqtikKyqulQj5ghHuaCH/ku05jFC3FP33fPFBh/p?=
 =?us-ascii?Q?I3+8T8o/Z2A3p96/zsYirSg26qUL4WRFzBKyFzzGKexnrDcd8SsWhZyfJ35O?=
 =?us-ascii?Q?KO5DxFhv9u80B0tBtmFRx/Bi9HqWlNCXlPHaas1d07alCcgIAgqpGhkKYL7A?=
 =?us-ascii?Q?vkYOKSOlhW6b5J2REaSlFZg=3D?=
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
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 <sj@kernel.org>
Reviewed-by: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: Yihao Han <hanyihao@vivo.com>
---
 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);
-- 
2.17.1