From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (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 7D2CB18C347 for ; Thu, 8 Aug 2024 12:00:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723118406; cv=none; b=e/YR2RoCUb7e6QR5R7KQ13+g3Xy0tjm+4Sm41+fQhymVXHYCcU+69nwwbqg0Me9M+mDhlVIuAEhI4vMgeCUe/rHMZfwlT6UYKrgN4gt/ymYpktsZEF3JYi2yNK/6dODtGweCGR2bhbLBIbraBxJpu/32L6G/lK4fjHc0wnDY3dg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723118406; c=relaxed/simple; bh=4VJkCGOnJpRwR4YKBH81A1uxdWFs9jOzqwkiDCMslRY=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=HLQmqonp3Maj4no6BbAvDgJnnfAjFxwW/6rWt+NrJXrhSgngZe3GCzTEupSGVzVo5ZKe3MSdHmjt5ApbaWgnt4XAOmnRc5Drj+wYYB1oqvm3Em+j8fnqWDrhqm6fzrbowpI2BNpujwWj8tsQULdCa5ZeeId+NOPNZRoKV6267ho= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=zGzr8n4p; arc=none smtp.client-ip=209.85.221.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="zGzr8n4p" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-3685b3dbcdcso489404f8f.3 for ; Thu, 08 Aug 2024 05:00:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723118403; x=1723723203; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=l8fBZbfSfQMp8/8SurSvfBz+MaimrqNdI2CubOLP3Ew=; b=zGzr8n4pjD1TW6J38rzhxbkp5A4UhJhcFdUMRoKC3AgIdDKG2mBpMVtI2x8AIu+OtB OJOEaNvB7kyLOtwoP++6Zr4KHWs+zkEtkJrybjLqj6rWkyzSWVQmtfT4aSKVynVFFXF/ FxuWOUho+LZFi6bwbE9Szd8vBaxRU14uaXRno+lkKiZzW4rl0Nrpa3w/B+3aEtWDpTAz RPKWqaM4yQzdqZuJq3KdXHdpPUBrxSZRC6sl9+nmBmdhRsS4qxiFmRnXkLZP1T2nUoUJ JbEaJkPwA4k0anB6nltN2kLKtUIkSmkt3puWFpa3P80Up9yFxsjN35NDDX/eXqftEhcq /7cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723118403; x=1723723203; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l8fBZbfSfQMp8/8SurSvfBz+MaimrqNdI2CubOLP3Ew=; b=us5nLyMkEhtbBhZGyLEwC9m8rty7vkuwU53op3iN2Wse2cGJ88qogJbvkO7KFhC9P4 JPj8uTvMnC7sMa0+olZxMc+nbVAAcSfgk1EtjlbzK+SheQjUkc+t3+xl0/C3WZGx26rm +acl0sy/FzXhoYdkC3wExoGpJtkJh9sHvjfjwJ8T3SD/Fv8adc5EWpch3H2YmSyFzWQb K14UjoZHFvInOPd0R/cJ1nOnY2OoQLNL1RSTlSnXhh8QLIka6lFXm244CcmfvmtKg5/9 1q7ZSiIEeS6+oqIQYHkf1fLEYD0okgZSE03/UZBxRrBiA97VD9J3q0/bPL8BdjPBFMK6 JsOg== X-Forwarded-Encrypted: i=1; AJvYcCWNt+fRKh+PJW+ub2MTe1/SOZ59cWoQ+YHfEgjPk2CMK7mnLXoQqLr/G2kAmKbS888VlBtEQUF+seO4l0aWapHzpgRz0i1Wg2UfRg== X-Gm-Message-State: AOJu0Yy6LrzLswn32lzVJce64gBmTeRgqTyHf8h9+GKAxtX556niN5cQ cjt9ObGTzXHwzuid+vlFKNGQK0OnfDw6fxfC6pe3RfEqhcA2xa9lWlogmRHfNms= X-Google-Smtp-Source: AGHT+IHHX2fBYyF3bzrkIN6FI+lRc2WcNWD9HizbtFbwpwdbf6zDJoYFHOfDyhNaZKL5sM+Jijm6XQ== X-Received: by 2002:a5d:698f:0:b0:367:8fee:443b with SMTP id ffacd0b85a97d-36d27561461mr1129489f8f.41.1723118402280; Thu, 08 Aug 2024 05:00:02 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36d27156c8asm1700288f8f.24.2024.08.08.05.00.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Aug 2024 05:00:01 -0700 (PDT) Received: from draig (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 751635F769; Thu, 8 Aug 2024 13:00:00 +0100 (BST) From: =?utf-8?Q?Alex_Benn=C3=A9e?= To: Sean Christopherson Cc: Paolo Bonzini , Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, David Matlack , David Stevens Subject: Re: [PATCH v12 13/84] KVM: Annotate that all paths in hva_to_pfn() might sleep In-Reply-To: <20240726235234.228822-14-seanjc@google.com> (Sean Christopherson's message of "Fri, 26 Jul 2024 16:51:22 -0700") References: <20240726235234.228822-1-seanjc@google.com> <20240726235234.228822-14-seanjc@google.com> Date: Thu, 08 Aug 2024 13:00:00 +0100 Message-ID: <87bk23ql6n.fsf@draig.linaro.org> Precedence: bulk X-Mailing-List: linux-mips@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Sean Christopherson writes: > Now that hva_to_pfn() no longer supports being called in atomic context, > move the might_sleep() annotation from hva_to_pfn_slow() to > hva_to_pfn(). The commentary for hva_to_pfn_fast disagrees. /* * The fast path to get the writable pfn which will be stored in @pfn, * true indicates success, otherwise false is returned. It's also the * only part that runs if we can in atomic context. */ static bool hva_to_pfn_fast(struct kvm_follow_pfn *kfp, kvm_pfn_t *pfn) At which point did it loose the ability to run in the atomic context? I couldn't work it out from the commits. > > Signed-off-by: Sean Christopherson > --- > virt/kvm/kvm_main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 84c73b4fc804..03af1a0090b1 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -2807,8 +2807,6 @@ static int hva_to_pfn_slow(unsigned long addr, bool= *async, bool write_fault, > struct page *page; > int npages; >=20=20 > - might_sleep(); > - > if (writable) > *writable =3D write_fault; >=20=20 > @@ -2947,6 +2945,8 @@ kvm_pfn_t hva_to_pfn(unsigned long addr, bool inter= ruptible, bool *async, > kvm_pfn_t pfn; > int npages, r; >=20=20 > + might_sleep(); > + > if (hva_to_pfn_fast(addr, write_fault, writable, &pfn)) > return pfn; --=20 Alex Benn=C3=A9e Virtualisation Tech Lead @ Linaro