From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: multipart/mixed; boundary="===============9130225879894710401==" MIME-Version: 1.0 From: kernel test robot Subject: [PATCH] userfaultfd: fix swap.cocci warnings Date: Tue, 08 Mar 2022 20:59:25 +0800 Message-ID: <20220308125925.GA46097@c9d76f7cebde> In-Reply-To: <202203082010.aZticNAg-lkp@intel.com> List-Id: To: kbuild@lists.01.org --===============9130225879894710401== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable CC: kbuild-all(a)lists.01.org BCC: lkp(a)intel.com CC: linux-kernel(a)vger.kernel.org TO: Andrea Arcangeli CC: Andrew Morton CC: Linux Memory Management List CC: linux-kernel(a)vger.kernel.org From: kernel test robot mm/userfaultfd.c:743:13-14: WARNING opportunity for swap() Check for opencoded swap() implementation. Generated by: scripts/coccinelle/misc/swap.cocci Fixes: e551a4a9e99d ("userfaultfd: UFFDIO_REMAP uABI") Reported-by: kernel test robot Signed-off-by: kernel test robot --- tree: https://git.kernel.org/pub/scm/linux/kernel/git/andrea/aa.git main head: 597056f5070bec9190a9b6389eb5fcc07ce2cd14 commit: e551a4a9e99d2595c4f1c1ca7b6a62f4b70da1f4 [38/51] userfaultfd: UFFDI= O_REMAP uABI :::::: branch date: 16 hours ago :::::: commit date: 16 hours ago Please take the patch only if it's a positive warning. Thanks! mm/userfaultfd.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -737,12 +737,10 @@ void double_pt_lock(spinlock_t *ptl1, { spinlock_t *ptl_tmp; = - if (ptl1 > ptl2) { + if (ptl1 > ptl2) + = /* exchange ptl1 and ptl2 */ - ptl_tmp =3D ptl1; - ptl1 =3D ptl2; - ptl2 =3D ptl_tmp; - } + swap(ptl1, ptl2); /* lock in virtual address order to avoid lock inversion */ spin_lock(ptl1); if (ptl1 !=3D ptl2) --===============9130225879894710401==--