From patchwork Mon Jan 15 12:56:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 188163 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2614:b0:101:6a76:bbe3 with SMTP id mm20csp1707098dyc; Mon, 15 Jan 2024 05:39:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IE1kfFQx5CD/nLnv+syd7J6f+uaOTQKzVovUbdCD6FqvziP6T4nsQIIapL/ykJ6LvTgkD7k X-Received: by 2002:a17:906:179a:b0:a2c:33ce:8c92 with SMTP id t26-20020a170906179a00b00a2c33ce8c92mr2443615eje.39.1705325981392; Mon, 15 Jan 2024 05:39:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705325981; cv=none; d=google.com; s=arc-20160816; b=j1T5QeMsokTqdNiKCtigmpen1BTlARoxolwYrfzrxia/Sy16wQd7bX4nd2du6TjPl3 nMk1zS7LiK06cTx0TlN4jjOI2Y2KFhlgB+AHjPROtB1AcgwBIVPHyq3TSeH84P5c3XpL zLtmcCo99MRx3vHISMsBT/JkWPZhDxEuJ/M322YdVev1hgnnGN/MhbqVY+S1MQZNIB8g aq1qUC7BfhFeWVX7mz8n19CEDIbDmcahRiYhvhPww+d2g+4E/o0qbZZCLAtsNT2XNUFZ rbOxk0HX2hJi+F2QAYUS4R4kM3kuZIwLprdsy62FG3M8D84oAfcmcIQFi/UuMrIEdUzO pbqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=iyqOFrP3aGKoiCQ7WXZlsE4e+dflFfzsWYBVMlCow44=; fh=aAPqvXm40pY9772UiBOljEePwtz/3Q0zIOpw238tj3M=; b=xKv40o9Bg7NfZhwtY6h4UFk/jigS76aa7MmaMHoj8R+RGfovdxa1hcJd9bcPRsixhV Bi1qBQ06rIMCVkM6jIYDVmjLcKsxVyRDFu4xfTQpkB2CJHaDJnyNHjE2LHe3hdKV1BB2 Dx7DwWZEHoTzblWRvWVeY26l0WFdhqOC1D7sJiW9p9O6FhbrChM9k7G9ui5/8ukUrJby vz8YXWjrcAxjNnYdvJXCANM5Lvm0Pm6GHscaBNhvoS20clzKvIJ95rZMQMoXhlujhVTP NLR6bUax7NfnQqpL0kxc9mOyoMf0zvpmoZTRP+mRTUExerwccMLelA0zTh8qoA7JIqps Pugw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@xen.org header.s=20200302mail header.b=IMTrAe7j; spf=pass (google.com: domain of linux-kernel+bounces-26039-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26039-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id k17-20020a170906681100b00a2da5b570a2si1129615ejr.996.2024.01.15.05.39.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 05:39:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-26039-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@xen.org header.s=20200302mail header.b=IMTrAe7j; spf=pass (google.com: domain of linux-kernel+bounces-26039-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26039-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 0277B1F22671 for ; Mon, 15 Jan 2024 13:39:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 23773179A6; Mon, 15 Jan 2024 13:38:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=xen.org header.i=@xen.org header.b="IMTrAe7j" Received: from mail.xenproject.org (mail.xenproject.org [104.130.215.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3428E1773D; Mon, 15 Jan 2024 13:38:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xen.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From; bh=iyqOFrP3aGKoiCQ7WXZlsE4e+dflFfzsWYBVMlCow44=; b=IMTrAe7jUUZ3nReNth3tWWJbgv RhweXiVrXxeg2hE9Qgh+9zDs6DhyUoZ6gitWhitBYcSSl1iej18Ecyjl0eXed7ryLj1aXbYuTXhiH hr0enhb4+o+CRoYhfp2m42cnSINd2mwHs56r2dDy0WV7wBk4R3sgKx6PaWldTtrjXQzA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rPMXE-0002jt-3i; Mon, 15 Jan 2024 12:57:48 +0000 Received: from 54-240-197-231.amazon.com ([54.240.197.231] helo=REM-PW02S00X.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rPMXD-0002kM-PX; Mon, 15 Jan 2024 12:57:48 +0000 From: Paul Durrant To: Paolo Bonzini , Jonathan Corbet , Sean Christopherson , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , David Woodhouse , Paul Durrant , Shuah Khan , kvm@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v12 06/20] KVM: pfncache: stop open-coding offset_in_page() Date: Mon, 15 Jan 2024 12:56:53 +0000 Message-Id: <20240115125707.1183-7-paul@xen.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240115125707.1183-1-paul@xen.org> References: <20240115125707.1183-1-paul@xen.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788163896405844657 X-GMAIL-MSGID: 1788163896405844657 From: Paul Durrant Some code in pfncache uses offset_in_page() but in other places it is open- coded. Use offset_in_page() consistently everywhere. Signed-off-by: Paul Durrant Reviewed-by: David Woodhouse --- Cc: Sean Christopherson Cc: Paolo Bonzini Cc: David Woodhouse v8: - New in this version. --- virt/kvm/pfncache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/virt/kvm/pfncache.c b/virt/kvm/pfncache.c index 6f4b537eb25b..0eeb034d0674 100644 --- a/virt/kvm/pfncache.c +++ b/virt/kvm/pfncache.c @@ -48,7 +48,7 @@ bool kvm_gpc_check(struct gfn_to_pfn_cache *gpc, unsigned long len) if (!gpc->active) return false; - if ((gpc->gpa & ~PAGE_MASK) + len > PAGE_SIZE) + if (offset_in_page(gpc->gpa) + len > PAGE_SIZE) return false; if (gpc->generation != slots->generation || kvm_is_error_hva(gpc->uhva)) @@ -192,7 +192,7 @@ static kvm_pfn_t hva_to_pfn_retry(struct gfn_to_pfn_cache *gpc) gpc->valid = true; gpc->pfn = new_pfn; - gpc->khva = new_khva + (gpc->gpa & ~PAGE_MASK); + gpc->khva = new_khva + offset_in_page(gpc->gpa); /* * Put the reference to the _new_ pfn. The pfn is now tracked by the @@ -213,7 +213,7 @@ static int __kvm_gpc_refresh(struct gfn_to_pfn_cache *gpc, gpa_t gpa, unsigned long len) { struct kvm_memslots *slots = kvm_memslots(gpc->kvm); - unsigned long page_offset = gpa & ~PAGE_MASK; + unsigned long page_offset = offset_in_page(gpa); bool unmap_old = false; unsigned long old_uhva; kvm_pfn_t old_pfn;