From nobody Sun May 24 19:33:42 2026 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 62E62191F91 for ; Sat, 23 May 2026 05:02:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779512571; cv=none; b=lQnM2pzYe0vexOiOszzfiYp7EXj4o3W6nqWheHsQfu5m78D0D4EqbDWvcEaDdD0tvNb4k/mVzJ5PpFmNrNM7PoM+iAbT3mWuoaFwVEJLULP1d5hWRaPxwRuzoZa7ySqawn/FozHm757aLLGpAem9ns64sc7337myIsLfrN/oRjw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779512571; c=relaxed/simple; bh=W9ITGv3qxa+WYkFAH41yDgqAQyYvdortQve2uFX62yw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=MEfWYLFrwMFLJlA6/aNTnDwcOIlBBeeQJSzVf00QBWTdM/cNAIiHpcc84NGrh23k6rKYVRnvkXnEYXRYPP0MttTHOluTodh8xRgRcNtAIqOqHUo9voc7ypqRoXgnsRHEakJBFoPdQa+s4B2NSFIJplbKl/fGH7KcLYFGilaJ3DA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=YJDQg9/J; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YJDQg9/J" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2be1dd4af34so66401305ad.1 for ; Fri, 22 May 2026 22:02:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779512569; x=1780117369; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=leshpFjJpw+iFa3BTxU37ORXazCVi1TrfBnEvsNvsW8=; b=YJDQg9/JzFJWM32RnK5Y9NGwKryyiupV/9oed/ENeX9SlLVIMUzjDnu75j+k3LsFiV dee1FEtJx75a9VC87lU/4+pprcAREUkeDD73/u5K6az9i+nsyVcYKCWI+bAwfpw9Wdu0 UfHpy/z2pZPJJsc8UoOSAc4B8t1+I9s9z6KgtuHRirahHFaB4BF3YyrH02tisKPdiE5b bCom/j+/DrTZXJlX14HGpbuliSH+0xXKnHCMzpkrw8PdKkaj4An5JlV33Rsy5lkDqFDA GhGdVuWaew0/UtSFk9HPg7J54AWTTQpO5lhfgg6QxFMo2+DYCoA0ul1umVqHlbTUpOLf OAqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779512569; x=1780117369; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=leshpFjJpw+iFa3BTxU37ORXazCVi1TrfBnEvsNvsW8=; b=L0DwAAvE4C42sN2UOfFHJM2IN23QRQSFYwefFdKb7/palsVoWxjrE0Yh8uMWI/udFx QB/Qx0zB7+wqFCVXZoraOPGplFAHnIo/lUUAbds3kMfcDfc1UloJXUjt/Pp7Ee/BDRGe jW2fH5lhNnnKu2zzbqE988YONdyvEi5ot0360OPxe700iZrPZCjM5AArG1PDIyh8Pj9K qdaizxFWVcxegcs4h9vfCOR319OgGPtjsIVOj4zD/jZ8MHyHc5EQoYdREHCo8busyfBA omgsAAMZ4jnzE30IWXhj6oTpjSNEA7BgEzQVVNjKzNE17XlSr+6PcPAkszv8JfC36BSY janw== X-Forwarded-Encrypted: i=1; AFNElJ+0wqdoluG1E/XYzi270C4mfWRuuA2TmXBLIS6el2kCXr4Wm+zaZmye9iN0+SCSzSPN2l8T9pA8Li0CIC0=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/Br86DRNA7lI+wk/wzaFE3yELwzJPlq4qNwdFbHQTjPh5MTid Pa5qdpin75FCSYFn+zugZtoARVnUrsZzYwUqPm5LkXkfVVv3m7ERVT4Y X-Gm-Gg: Acq92OGEJ+dlERQNh3lYtNiXP+VSU6zvZCjovDr1e2/SzPk1SV6p6bh6VmryNcO++Qu TgWFMFdYhUu/RMaS6tlEi779uooM8chzRHsRupc7naYIsHbsPjGGNMeJeXTV3tF7VKt0daVr3TT i8dPh2btipFjn0dFkY7U/eDmdx9p0Gx3Zz3wRNLsA/W03BC2VllSwcb0HShFLPwdP6+BsL5KLHB +LnqwEofxEQm8X80x7ieGEhid7Gzx7m2r0cNxESnDXVrlnj78ezibs1hEV2PgnynyCiN+72jHTJ gOCFUfeL6denZgZyY5txOUZXwfSMPyOXHQEf8+vOw7dwaqzdPkXB1n9sLV6LNOfTvSalPFVWx7d hsde2UhAk5Ru8q7AvVRvIRD3M0BSRn26+nwDqhaYz3SIWiZFburXAPj8SBIGVMMvM67uyhP0sbV ZQP0coM8n4mCtPFNJUNBh43ku8GoDBIeQ6rzvsnYLgm2UgLsseyda5e3Y= X-Received: by 2002:a17:903:298b:b0:2bd:2de3:51a4 with SMTP id d9443c01a7336-2beb0604f43mr70763195ad.27.1779512569475; Fri, 22 May 2026 22:02:49 -0700 (PDT) Received: from yash-Bravo-15-B5DD.local ([14.99.167.142]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2beb591d102sm32152325ad.81.2026.05.22.22.02.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2026 22:02:49 -0700 (PDT) From: Yash Suthar To: pbonzini@redhat.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: skhan@linuxfoundation.org, me@brighamcampbell.com, Yash Suthar Subject: [PATCH] kvm: vfio: Convert kvm_vfio_file_add() to use CLASS(fd) and guard(mutex) Date: Sat, 23 May 2026 10:32:42 +0530 Message-ID: <20260523050242.41472-1-yashsuthar983@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Convert manual fget/fput call to CLASS(fd, f) and mutex_lock/unlock to guard(mutex). This remove the goto based paths both out_unlock and out_fput. Signed-off-by: Yash Suthar --- virt/kvm/vfio.c | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/virt/kvm/vfio.c b/virt/kvm/vfio.c index 9f9acb66cc1e..bb3694d9c0c4 100644 --- a/virt/kvm/vfio.c +++ b/virt/kvm/vfio.c @@ -144,45 +144,36 @@ static int kvm_vfio_file_add(struct kvm_device *dev, = unsigned int fd) { struct kvm_vfio *kv =3D dev->private; struct kvm_vfio_file *kvf; - struct file *filp; - int ret =3D 0; + struct file *file; + CLASS(fd, f)(fd); =20 - filp =3D fget(fd); - if (!filp) + if (fd_empty(f)) return -EBADF; =20 + file =3D fd_file(f); + /* Ensure the FD is a vfio FD. */ - if (!kvm_vfio_file_is_valid(filp)) { - ret =3D -EINVAL; - goto out_fput; - } + if (!kvm_vfio_file_is_valid(file)) + return -EINVAL; =20 - mutex_lock(&kv->lock); + guard(mutex)(&kv->lock); =20 list_for_each_entry(kvf, &kv->file_list, node) { - if (kvf->file =3D=3D filp) { - ret =3D -EEXIST; - goto out_unlock; - } + if (kvf->file =3D=3D file) + return -EEXIST; } =20 kvf =3D kzalloc_obj(*kvf, GFP_KERNEL_ACCOUNT); - if (!kvf) { - ret =3D -ENOMEM; - goto out_unlock; - } + if (!kvf) + return -ENOMEM; =20 - kvf->file =3D get_file(filp); + kvf->file =3D get_file(file); list_add_tail(&kvf->node, &kv->file_list); =20 kvm_vfio_file_set_kvm(kvf->file, dev->kvm); kvm_vfio_update_coherency(dev); =20 -out_unlock: - mutex_unlock(&kv->lock); -out_fput: - fput(filp); - return ret; + return 0; } =20 static int kvm_vfio_file_del(struct kvm_device *dev, unsigned int fd) --=20 2.43.0