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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24179C433F5 for ; Fri, 4 Feb 2022 04:49:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A3BB56B0081; Thu, 3 Feb 2022 23:49:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9EBD56B0082; Thu, 3 Feb 2022 23:49:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8B32E6B0083; Thu, 3 Feb 2022 23:49:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0140.hostedemail.com [216.40.44.140]) by kanga.kvack.org (Postfix) with ESMTP id 7A1126B0081 for ; Thu, 3 Feb 2022 23:49:49 -0500 (EST) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 18526824C447 for ; Fri, 4 Feb 2022 04:49:49 +0000 (UTC) X-FDA: 79103869698.05.F5EBDBF Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf30.hostedemail.com (Postfix) with ESMTP id B0BBF80004 for ; Fri, 4 Feb 2022 04:49:48 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0510361B51; Fri, 4 Feb 2022 04:49:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31A87C004E1; Fri, 4 Feb 2022 04:49:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1643950187; bh=lF8DoC9XFDibW5PMa0160z5XrJHiPaP5hlSQbu4HXcI=; h=Date:To:From:In-Reply-To:Subject:From; b=N138r+8d3Csc3ShDsM/Y5qqS/cabwqiw1L2Fm8aehaasa/g/x+KcI1chDXnIs4aIa 7TCBlun3CXU64Q1vYk6oOL5TlferdC4EMEDpR2+s7SShQwoEwZvpurqiFl0ZkGAM0O Lnz8I6MK18yP8do9i2LwtaxGLkthZUNIOKalI4Nc= Received: by hp1 (sSMTP sendmail emulation); Thu, 03 Feb 2022 20:49:45 -0800 Date: Thu, 03 Feb 2022 20:49:45 -0800 To:shuah@kernel.org,chi.minghao@zte.com.cn,skhan@linuxfoundation.org,akpm@linux-foundation.org,linux-mm@kvack.org,mm-commits@vger.kernel.org,torvalds@linux-foundation.org,akpm@linux-foundation.org From: Andrew Morton In-Reply-To: <20220203204836.88dcebe504f440686cc63a60@linux-foundation.org> Subject: [patch 10/10] kselftest/vm: revert "tools/testing/selftests/vm/userfaultfd.c: use swap() to make code cleaner" Message-Id: <20220204044946.31A87C004E1@smtp.kernel.org> X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: B0BBF80004 X-Stat-Signature: egaascsd96m17sk4xh7df1cuewij8xmk Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=N138r+8d; dmarc=none; spf=pass (imf30.hostedemail.com: domain of akpm@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@kernel.org X-Rspam-User: nil X-HE-Tag: 1643950188-734526 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Shuah Khan Subject: kselftest/vm: revert "tools/testing/selftests/vm/userfaultfd.c: use swap() to make code cleaner" With this change, userfaultfd fails to build with undefined reference swap() error: userfaultfd.c: In function `userfaultfd_stress': userfaultfd.c:1530:17: warning: implicit declaration of function `swap'; did you mean `swab'? [-Wimplicit-function-declaration] 1530 | swap(area_src, area_dst); | ^~~~ | swab /usr/bin/ld: /tmp/ccDGOAdV.o: in function `userfaultfd_stress': userfaultfd.c:(.text+0x549e): undefined reference to `swap' /usr/bin/ld: userfaultfd.c:(.text+0x54bc): undefined reference to `swap' collect2: error: ld returned 1 exit status Revert the commit to fix the problem. Link: https://lkml.kernel.org/r/20220202003340.87195-1-skhan@linuxfoundation.org Fixes: 2c769ed7137a ("tools/testing/selftests/vm/userfaultfd.c: use swap() to make code cleaner") Signed-off-by: Shuah Khan Cc: Shuah Khan Cc: Minghao Chi Signed-off-by: Andrew Morton --- tools/testing/selftests/vm/userfaultfd.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) --- a/tools/testing/selftests/vm/userfaultfd.c~kselftest-vm-revert-tools-testing-selftests-vm-userfaultfdc-use-swap-to-make-code-cleaner +++ a/tools/testing/selftests/vm/userfaultfd.c @@ -1417,6 +1417,7 @@ static void userfaultfd_pagemap_test(uns static int userfaultfd_stress(void) { void *area; + char *tmp_area; unsigned long nr; struct uffdio_register uffdio_register; struct uffd_stats uffd_stats[nr_cpus]; @@ -1527,9 +1528,13 @@ static int userfaultfd_stress(void) count_verify[nr], nr); /* prepare next bounce */ - swap(area_src, area_dst); - - swap(area_src_alias, area_dst_alias); + tmp_area = area_src; + area_src = area_dst; + area_dst = tmp_area; + + tmp_area = area_src_alias; + area_src_alias = area_dst_alias; + area_dst_alias = tmp_area; uffd_stats_report(uffd_stats, nr_cpus); } _