Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp2534513pxp; Mon, 21 Mar 2022 23:51:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwu+K2UP3jwXGOQx1U/l7mE0qf9Cb2fq6RKVyPj+9sVuuMXM3NuL/nwVNZCthaHNqp7TT+f X-Received: by 2002:a17:902:c40e:b0:154:80a7:95c9 with SMTP id k14-20020a170902c40e00b0015480a795c9mr2670470plk.28.1647931864153; Mon, 21 Mar 2022 23:51:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647931864; cv=none; d=google.com; s=arc-20160816; b=ciNvJeDlljFKbycQqWoP/MWtDYAxUSmzrTEQNnZ7esf5A0dTYNK8MnazMR/dDtbYHo KaOlvjeINcOBEsc5V9GHC+AqT/puyXJrilSsP/5Tpj7qwrw2oTRF3e3TNvH4DnQvdpAX hbA4E/2R/DpzgtmFv/3CkmH7n2J0+gXJg0mdKMN6PrBnd3KXQH+8uY7BtJmeBc2Nzytc x1BmmUzc2YiYaOlCX/5X0gvoFc0AP/EY+WWpu2iiFmjbOR4nLmieRGNKVRZ6T8UTPKqC l2Wq66/HJBrtgUhIjHA2+UsVt2Dk/zV0HGdfGk4CTOfM1PX10rFhucpoGKQH10CqFCtV 8sFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=BdN7Nb/13jczag/cdBTqOAoZxfWzMuWzaA4tlsOH5B4=; b=hvX6REvb68SetG8P/ZNAKjf8CEwFKbkxXT8w6CIV+SXPSRy51l7lFq4Ev/S1/e8oTZ ube5yFFeblUDnKrW25zTVU4pT3t6EkxiNowv3aQX8L+exgpZD4T0CGQ0AF8YHK3wjrwC ArVvPvwFO+chcsPBonIj/IVdta/rianSlmrLLAZC7hG9LjAQ1rLDhcD83DTqBdle5qFn ogdUeNKx5Jw/dV2C4aUa6o94Qfk88+U7oxD+yUk5Wm27CRd5ip7kpHERwfTzZyp1HR2a Dlhx+++1iF/x5EP20MEnSEaAqH49+TiQtdv3f67OjDJhu1cZoccqF9Oa+lTwjGS9TvOI 6t2w== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id h12-20020a170902eecc00b00153b2d165c1si12880510plb.457.2022.03.21.23.51.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 23:51:04 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 512AE2654E; Mon, 21 Mar 2022 23:22:11 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236955AbiCVGXb (ORCPT + 99 others); Tue, 22 Mar 2022 02:23:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236917AbiCVGX3 (ORCPT ); Tue, 22 Mar 2022 02:23:29 -0400 Received: from out30-56.freemail.mail.aliyun.com (out30-56.freemail.mail.aliyun.com [115.124.30.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF51D1138; Mon, 21 Mar 2022 23:22:00 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R901e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04426;MF=jiapeng.chong@linux.alibaba.com;NM=1;PH=DS;RN=18;SR=0;TI=SMTPD_---0V7uWHBg_1647930110; Received: from localhost(mailfrom:jiapeng.chong@linux.alibaba.com fp:SMTPD_---0V7uWHBg_1647930110) by smtp.aliyun-inc.com(127.0.0.1); Tue, 22 Mar 2022 14:21:57 +0800 From: Jiapeng Chong To: rostedt@goodmis.org Cc: mingo@redhat.com, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kafai@fb.com, songliubraving@fb.com, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, davem@davemloft.net, kuba@kernel.org, hawk@kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Jiapeng Chong , Abaci Robot Subject: [PATCH] bpf: Use swap() instead of open coding it Date: Tue, 22 Mar 2022 14:21:49 +0800 Message-Id: <20220322062149.109180-1-jiapeng.chong@linux.alibaba.com> X-Mailer: git-send-email 2.20.1.7.g153144c MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Clean the following coccicheck warning: ./kernel/trace/bpf_trace.c:2263:34-35: WARNING opportunity for swap(). ./kernel/trace/bpf_trace.c:2264:40-41: WARNING opportunity for swap(). Reported-by: Abaci Robot Signed-off-by: Jiapeng Chong --- kernel/trace/bpf_trace.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 0009104dca82..36e0f459d152 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -2253,15 +2253,13 @@ static void bpf_kprobe_multi_cookie_swap(void *a, void *b, int size, const void const struct bpf_kprobe_multi_link *link = priv; unsigned long *addr_a = a, *addr_b = b; u64 *cookie_a, *cookie_b; - unsigned long tmp1; - u64 tmp2; cookie_a = link->cookies + (addr_a - link->addrs); cookie_b = link->cookies + (addr_b - link->addrs); /* swap addr_a/addr_b and cookie_a/cookie_b values */ - tmp1 = *addr_a; *addr_a = *addr_b; *addr_b = tmp1; - tmp2 = *cookie_a; *cookie_a = *cookie_b; *cookie_b = tmp2; + swap(*addr_a, *addr_b); + swap(*cookie_a, *cookie_b); } static int __bpf_kprobe_multi_cookie_cmp(const void *a, const void *b) -- 2.20.1.7.g153144c