From:   Yihao Han <hanyihao@vivo.com>
To:     Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Jesper Dangaard Brouer <hawk@kernel.org>,
        John Fastabend <john.fastabend@gmail.com>,
        Shuah Khan <shuah@kernel.org>,
        Andrii Nakryiko <andrii@kernel.org>,
        Martin KaFai Lau <kafai@fb.com>,
        Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>,
        KP Singh <kpsingh@kernel.org>, netdev@vger.kernel.org,
        bpf@vger.kernel.org, linux-kselftest@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     kernel@vivo.com, Yihao Han <hanyihao@vivo.com>
Subject: [PATCH] selftests/bpf: use swap() to make code cleaner
Date:   Thu, 11 Nov 2021 19:27:04 -0800
Message-Id: <20211112032704.4658-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?YsGT45sooI1+NkxbbY0/MEmW9tWJ2XwWJBYoX88WlTvp2FTs9yhw12hPfF2l?=
 =?us-ascii?Q?JMrFhn6IR2lp1uZzm1Spl+fz7ut521DbSfrSw+EXQj9h5bDZZQO3NACeuO4H?=
 =?us-ascii?Q?k/WNt8LLrCRZPV6im2VXcHVdEkFcFgLAQNoOgrvGcJ8J753nUemOwnuz2BH9?=
 =?us-ascii?Q?jKflA2o4WeS7URfinHsyz/OPe0eaotjLorx8LEBTtwegleBtBriVKMjAq32M?=
 =?us-ascii?Q?6X7vqUi/5j9fpCjdmJ7be1bj2Cd+8uiB47qQ4DBolXmLb5kxoRUGwOjG4kM9?=
 =?us-ascii?Q?Ht/TVzEUBziUQELX7n19lQGigtemz7ARN5katPlUm7C0/s/UE37hYrJ2rRhT?=
 =?us-ascii?Q?Lj8Fo96RCF8Iw4JtekR0aPKJ4A21eKJY2nmqcJEKvUKkxQWKiDIWRpIhVcqU?=
 =?us-ascii?Q?OFcttiaHosr+FRxkn2ZRVWTGj7HC0kG0aETw63vV8Crcz5JFZuS34HIHEZfU?=
 =?us-ascii?Q?EuBilPhHvU+8xIjsPc9BHkb4fLRZ0RSZpLnrE1lC07Mzb8X/Zk9dZpjSMSJZ?=
 =?us-ascii?Q?BkliQPC09IqoGDFNkyccOso6KzT3Yu2OtlU5XN4kCEhwW4QNr6kaBSDK2qJw?=
 =?us-ascii?Q?emIAZFSVC9qHyJHkc8P+jVUvHm9nun8ebAsX9YGaf92rt2ZaOHi25F+KkE9P?=
 =?us-ascii?Q?yak29PBIUO29OQzFXfM7GVav+IcpgAzov4CzysLQeF/oW5chpA1FLwfPRNaQ?=
 =?us-ascii?Q?MaGIidNB7WCh1eL96sfhcpiUdSmAXKlei8dMch4KlWD9NP7Foe89ZQTgspmd?=
 =?us-ascii?Q?j13X5etARHroZ+Ib54O7MNy+L31bAWMFMgkGZVXYsVUy616zl3OOSZe0eTzt?=
 =?us-ascii?Q?fONVI77yczP2A4TnwEy5XRo0ulbdDoAjE7anAFok464rinLUNubSJ/0ayYKu?=
 =?us-ascii?Q?yMnYnU+St1N1eI1xmmJav1disdUvuJ7yyubxT2FgHX/xI0iEmgbdaFGBN9Lq?=
 =?us-ascii?Q?wydATx9GXrX8/DqZT7nJSjVs5/PfS6AiJnApLeiAkLhAAeDyrOnPifJtpwWZ?=
 =?us-ascii?Q?pnlehZF43ucFfBgYsdzz553cIVuyp7jK/Ou6OV76iTVm7+vNloKHxu+e7+ed?=
 =?us-ascii?Q?xgcFIuPHMTWys3rGSDyVWa+eOjBzP5gwsgmceGEVX1VArdv0Az4NuKOf162H?=
 =?us-ascii?Q?S6SFOt9Z8fKPc039KhUwsBzlN0Px6iMDpKc+25rj2jIFSbBgsmeruSI9BL/W?=
 =?us-ascii?Q?sDfdIE7Rx8iIltm9RpqrcVSo4gN36M4l/9oD8ukeZV/oddc1IDjb++JKk9fx?=
 =?us-ascii?Q?ToTt9OuRmpKjF9QsJYnyWEQBQvNhzWq8+b1ywSeP/8dQPrKEQ7zKBkV4IBj9?=
 =?us-ascii?Q?Ed/5ohzmJJadkt6ATMJs9w+/WSZcQ4e24wEXm/zM1lYG7IbmUIi6ItjwXyVa?=
 =?us-ascii?Q?SebuzUJv60X7bCq2ClsYtRk01zmRw1yiwQ47nWWzyOE3/z8dzAy1FSBPOyg/?=
 =?us-ascii?Q?6y4xo3ZxC0UGidUD0lJRR+DIkB5J3hcV5lhXpUwoCBW9SKH1NcdhSpdwh/8j?=
 =?us-ascii?Q?8BHcMWdzms5w9Slu7Y+1jdTtE0Rn/O2ArAhjIoOwX3khgIIZxInHgpUf93yx?=
 =?us-ascii?Q?LoueCQ+BtV/l/DUh72ap7vnmE0fqcSYO11XCBVJJ+JOwmWlmZ23SC8IZwW6q?=
 =?us-ascii?Q?pr5mpJsIofVy8delUPkAw8M=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dbfba109-8c89-4bb3-a900-08d9a58c543f
X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB4173.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 03:27:18.1220
 (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: lAJEP6HUhRxFTIDqJnk291JcVOkLEtbbHDDKHmhgImU8wo9TPW75bbSEbg5HPysPQwh3+Vh7PwPPNcRUNl74tg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY2PR06MB3614
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Use the macro 'swap()' defined in 'include/linux/minmax.h' to avoid
opencoding it.

Signed-off-by: Yihao Han <hanyihao@vivo.com>
---
 tools/testing/selftests/bpf/progs/test_xdp_noinline.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tools/testing/selftests/bpf/progs/test_xdp_noinline.c b/tools/testing/selftests/bpf/progs/test_xdp_noinline.c
index 596c4e71bf3a..6d9972168a7c 100644
--- a/tools/testing/selftests/bpf/progs/test_xdp_noinline.c
+++ b/tools/testing/selftests/bpf/progs/test_xdp_noinline.c
@@ -428,7 +428,6 @@ int send_icmp_reply(void *data, void *data_end)
 {
 	struct icmphdr *icmp_hdr;
 	__u16 *next_iph_u16;
-	__u32 tmp_addr = 0;
 	struct iphdr *iph;
 	__u32 csum1 = 0;
 	__u32 csum = 0;
@@ -444,9 +443,7 @@ int send_icmp_reply(void *data, void *data_end)
 	icmp_hdr->type = 0;
 	icmp_hdr->checksum += 0x0007;
 	iph->ttl = 4;
-	tmp_addr = iph->daddr;
-	iph->daddr = iph->saddr;
-	iph->saddr = tmp_addr;
+	swap(iph->daddr, iph->saddr);
 	iph->check = 0;
 	next_iph_u16 = (__u16 *) iph;
 #pragma clang loop unroll(full)
-- 
2.17.1