From patchwork Tue Mar 1 01:44:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: CGEL X-Patchwork-Id: 12763962 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 DBB74C433EF for ; Tue, 1 Mar 2022 01:44:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DFB5E8D0002; Mon, 28 Feb 2022 20:44:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DAB5B8D0001; Mon, 28 Feb 2022 20:44:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C9BCA8D0002; Mon, 28 Feb 2022 20:44:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.a.hostedemail.com [64.99.140.24]) by kanga.kvack.org (Postfix) with ESMTP id BC0B38D0001 for ; Mon, 28 Feb 2022 20:44:14 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 839C823914 for ; Tue, 1 Mar 2022 01:44:14 +0000 (UTC) X-FDA: 79194122028.14.0BFD7B8 Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by imf09.hostedemail.com (Postfix) with ESMTP id 142B2140005 for ; Tue, 1 Mar 2022 01:44:13 +0000 (UTC) Received: by mail-qt1-f176.google.com with SMTP id w1so8772721qtj.2 for ; Mon, 28 Feb 2022 17:44:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ijVtiJoCX033kgglssHFDQK/4oP5FPrgwPvKftWG7NU=; b=ol4DQL0ca5JemLcFkQ8DxS87cD8v1ik9zyBS6qePe4NhbB1LmjzqdSFTsT5TMCtPeJ Y1363nX8zXjBQBQe6XDnw3x3+PfXuKZcGgnxG8WkPZmLftKMniKr1DpFEh3ZYH+QAiDe vTwLrG/UqXyTQWVdWqGkRGEQapO/1QmYLn0swRkhFvo0hGEVwJxo9/XX4nUP/PqE0yed ckWU3gq/c9umPznNczYWFwZdywTmLrsZ5f2McdXZMoVCCjPMO3zHNaquJt6Ey7A3RTLa j7JDCGy17bZR2YE1vQaYiDGWpoagd4qLTyTIDxKnkVfYuBboVFkPkPQYpgB4bicQJ6cU ddww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ijVtiJoCX033kgglssHFDQK/4oP5FPrgwPvKftWG7NU=; b=FjP+GU/lQUjlbXbl9alYL8VrKUowxU61D26TrkYCBnsCsOyJUkRlqCnSVMgCeC/jbZ 6e8a2tojWtMV7aZg2+NLZDlqTS9hrEeVaTdwLhMHG+Ge9IPs67I8zgAZaFaDJJ9Zw0iu XvwAFcdmO1eIZ4AUDp031yMF/427grvqi4ioU7Dy31h9Nu294Slr8rdXwJPQ3jhDcDDf pTq9XSmuYncMXntRv8p7lI4tHGqGKEu2XhfQSaOBnxDjrulafvGhGNARhGzI34NWKVpZ CfVx/IdCrVwT3ge4MkxwWZt12lPckD+/EyfY1SuXhD7oaEnlWLw+Nu/VVfZOpnrqB5ru el1A== X-Gm-Message-State: AOAM532U7evDngVvEwK6k1HI+1Rd+WttKitrEO2w9fVpCpwv7EFxMX9+ AyPZ7ZXqn2oA2bBqK4uVuwc= X-Google-Smtp-Source: ABdhPJyxWuV2ytRAvxyA9QC3jVUgo0v+W1A5Mo1+hRGqwRivfKaS8N8n31zbv1Ynuht0e2JMNYBuUA== X-Received: by 2002:a05:622a:4ca:b0:2de:91c4:3d7c with SMTP id q10-20020a05622a04ca00b002de91c43d7cmr19030405qtx.618.1646099053438; Mon, 28 Feb 2022 17:44:13 -0800 (PST) Received: from localhost.localdomain ([193.203.214.57]) by smtp.gmail.com with ESMTPSA id l19-20020a05622a051300b002dff3437923sm6492305qtx.11.2022.02.28.17.44.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 17:44:13 -0800 (PST) From: cgel.zte@gmail.com X-Google-Original-From: lv.ruyi@zte.com.cn To: akpm@linux-foundation.org Cc: shuah@kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, "Lv Ruyi (CGEL ZTE)" , Zeal Robot Subject: [PATCH] selftests: vm: remove duplicated macro and use swap() to make code cleaner Date: Tue, 1 Mar 2022 01:44:04 +0000 Message-Id: <20220301014404.2052655-1-lv.ruyi@zte.com.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 142B2140005 X-Stat-Signature: fd18e7f1hcuget6a3nwefxsqq77cbaxz Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=ol4DQL0c; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf09.hostedemail.com: domain of cgel.zte@gmail.com designates 209.85.160.176 as permitted sender) smtp.mailfrom=cgel.zte@gmail.com X-HE-Tag: 1646099053-582787 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: "Lv Ruyi (CGEL ZTE)" The macro is duplicated, so remove one. And use swap to make code cleaner. Reported-by: Zeal Robot Signed-off-by: Lv Ruyi (CGEL ZTE) --- tools/testing/selftests/vm/userfaultfd.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c index ab394e6bff43..100f08362164 100644 --- a/tools/testing/selftests/vm/userfaultfd.c +++ b/tools/testing/selftests/vm/userfaultfd.c @@ -121,9 +121,6 @@ struct uffd_stats { #define swap(a, b) \ do { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0) -#define swap(a, b) \ - do { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0) - const char *examples = "# Run anonymous memory test on 100MiB region with 99999 bounces:\n" "./userfaultfd anon 100 99999\n\n" @@ -1424,7 +1421,6 @@ static void userfaultfd_pagemap_test(unsigned int test_pgsize) 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]; @@ -1535,13 +1531,8 @@ static int userfaultfd_stress(void) count_verify[nr], nr); /* prepare next bounce */ - 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; + swap(area_src, area_dst); + swap(area_src_alias, area_dst_alias); uffd_stats_report(uffd_stats, nr_cpus); }