From nobody Mon Feb 9 16:06:53 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 523881F4708 for ; Tue, 7 Jan 2025 15:43:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736264641; cv=none; b=pdQUXw8w5JkVVAlLsfixRo0+qHVfpxvQFAKH/VZuIEY81ZWXDqdiDG4YSw+YcLskZtgYNnbk2raAhQnQbA0PlYG3iuLDajvLIY0uElC039Rph4Ppl/lZJFVh9HuF4w6QYqafI9+AWgvg3PxpV/0tuUKxrnzpcygWPrqASQWv2kg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736264641; c=relaxed/simple; bh=L+CPO+OXcYMowj2nsp4a3RdcFfWPLoQzNe/QJrtHqCA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y9lpKPUgr/wPUsxjQigp8Vy9Tjji/ZqAGC+2QcbCplci9Ro9s5dg9BuL9ktHXKVx2cgUSt79xij19FI0/qEZx0m9QNGI0nPDSjmt9y1xYlz4utsZ9dgLUWqRqsdiy9mhypJocRsRSC18xVwJNjO66uUKADf52Ga+xfSw3MgZrXQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=RsHtS/dD; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RsHtS/dD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736264638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SuA9xO+YQCmgV3vJM4yzlrCIirQZOm8j6HpoB+CK45c=; b=RsHtS/dDWs5pPgBx+Z3zRkycqS2cO3zron57483E4VlotD+qJ9EHDLx9eZepOottRmdBE/ BpmhWuscAzD7K+JcxWlPrRBu0+cf+i6/8majo7RQ/tanaVcQyf8nkxWSuDpSZ42d7hPJuY atEtNCLqRcwdVyfZ/PEy/JIK7mgy9/s= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-253-hax2gtSKNo-tdx9q1iv97w-1; Tue, 07 Jan 2025 10:43:57 -0500 X-MC-Unique: hax2gtSKNo-tdx9q1iv97w-1 X-Mimecast-MFC-AGG-ID: hax2gtSKNo-tdx9q1iv97w Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4362153dcd6so44022095e9.2 for ; Tue, 07 Jan 2025 07:43:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736264633; x=1736869433; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SuA9xO+YQCmgV3vJM4yzlrCIirQZOm8j6HpoB+CK45c=; b=bv/0QBSjWhuDYLd+bhBKz1st5V2FAA9/fbL1AmDgLOzBxA1jPey3y8xMxI3v+mXZRe K4urBohcRZ5QlxskGdtKVh5vqQevtbOqNKveFg4dJvFi9DbOhA+8Wur4pSlsbfNQwupn 4h/UlRvi5w8hpbMV74hRba88Dyxg3J9egp9A2awM5yF7QNGu+yaM4i6gQl2XBydnwgGe tYAQn0fzdsdIC+qw5FV3sPy7mZ21JncCQsDWFtYF4OdCpW677HS5aDKd5sRiPt4nOURU 5Yh68jyAlsqsdjjRw/cetQQUWwV+sNvdkCSv91B9Bi7KhgzzlKTcO76y87x+1XguTN/X valw== X-Gm-Message-State: AOJu0YyCe4Mv+dMVMVEnylRPSg/iE75uRyhBNpnSZD9km6OP+7Pcnfj+ lFPQOw79OtK/i2BBWHPGhs5Dz5VeAvimMWJmpbfYkshYAQimOIGZWHVaeMbkfYXwfRNiBAXS3Ts 1H6yVMIeTHT9/NQRMdSO+/XbDtcudAa/U7t7jqnY0rm6jWVUjzdpqbFXLDywJc0kojdybM4JPUi 296mjBCLqePXu8AbmKsxDC1wrI2UDrk+0pbi0JB6cD6A== X-Gm-Gg: ASbGnctopdeJMPbscAjAmkN9+2NPS4v32s8QgKyCRp26n+hbwSunVNoF34ce9HCSQFr qno3NDbCy3YH2kV7bpNfrXiDY1e5fZj88NU+It8Vp1knDMvNRK1GOLCsU99eb9zUn9aHU8kskpU DZR2g10ADDJoWW24n/d2FlHLH98/76DIacmYoqMbcj758Md94CgNDN/BZU8DeWOwqyIjZDf8V+5 tIlRDqt4W+B0cTJOEg0aY3uU/40twE5VTZk5jHt5e+4N2n1VKx18YMBMQkmc97o4PWX/8eQlOIe 40tPfcodOjH26WcinUJ2cIAe5l+yrOjcOghLqv7MRg== X-Received: by 2002:a05:600c:4f92:b0:436:488f:50a with SMTP id 5b1f17b1804b1-43668646896mr573017765e9.17.1736264633516; Tue, 07 Jan 2025 07:43:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IEh8YfTHFHS4ct6XJT1582QW2xCuoEvw06dxSlo9D6j1V3t/nUHTzhQ92uwlzN3QPUXJktBRA== X-Received: by 2002:a05:600c:4f92:b0:436:488f:50a with SMTP id 5b1f17b1804b1-43668646896mr573017315e9.17.1736264632960; Tue, 07 Jan 2025 07:43:52 -0800 (PST) Received: from localhost (p200300cbc719170056dc6a88b509d3f3.dip0.t-ipconnect.de. [2003:cb:c719:1700:56dc:6a88:b509:d3f3]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-43656b013ecsm635054145e9.16.2025.01.07.07.43.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 Jan 2025 07:43:51 -0800 (PST) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, David Hildenbrand , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Sven Schnelle , Thomas Huth , "Matthew Wilcox (Oracle)" Subject: [PATCH v1 3/4] KVM: s390: vsie: stop messing with page refcount Date: Tue, 7 Jan 2025 16:43:43 +0100 Message-ID: <20250107154344.1003072-4-david@redhat.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250107154344.1003072-1-david@redhat.com> References: <20250107154344.1003072-1-david@redhat.com> 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" Let's stop messing with the page refcount, and use a flag that is set / cleared atomically to remember whether a vsie page is currently in use. Note that we could use a page flag, or a lower bit of the scb_gpa. Let's keep it simple for now, we have sufficient space. While at it, stop passing "struct kvm *" to put_vsie_page(), it's unused. Signed-off-by: David Hildenbrand --- arch/s390/kvm/vsie.c | 46 +++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index 00cd9a27fd8fc..29fdffeab635d 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -23,6 +23,10 @@ #include "kvm-s390.h" #include "gaccess.h" =20 +enum vsie_page_flags { + VSIE_PAGE_IN_USE =3D 0, +}; + struct vsie_page { struct kvm_s390_sie_block scb_s; /* 0x0000 */ /* @@ -52,7 +56,12 @@ struct vsie_page { * radix tree. */ gpa_t scb_gpa; /* 0x0258 */ - __u8 reserved[0x0700 - 0x0260]; /* 0x0260 */ + /* + * Flags: must be set/cleared atomically after the vsie page can be + * looked up by other CPUs. + */ + unsigned long flags; /* 0x0260 */ + __u8 reserved[0x0700 - 0x0268]; /* 0x0268 */ struct kvm_s390_crypto_cb crycb; /* 0x0700 */ __u8 fac[S390_ARCH_FAC_LIST_SIZE_BYTE]; /* 0x0800 */ }; @@ -1351,6 +1360,20 @@ static int vsie_run(struct kvm_vcpu *vcpu, struct vs= ie_page *vsie_page) return rc; } =20 +/* Try getting a given vsie page, returning "true" on success. */ +static inline bool try_get_vsie_page(struct vsie_page *vsie_page) +{ + if (test_bit(VSIE_PAGE_IN_USE, &vsie_page->flags)) + return false; + return !test_and_set_bit(VSIE_PAGE_IN_USE, &vsie_page->flags); +} + +/* Put a vsie page acquired through get_vsie_page / try_get_vsie_page. */ +static void put_vsie_page(struct vsie_page *vsie_page) +{ + clear_bit(VSIE_PAGE_IN_USE, &vsie_page->flags); +} + /* * Get or create a vsie page for a scb address. * @@ -1369,15 +1392,15 @@ static struct vsie_page *get_vsie_page(struct kvm *= kvm, unsigned long addr) rcu_read_unlock(); if (page) { vsie_page =3D page_to_virt(page); - if (page_ref_inc_return(page) =3D=3D 2) { + if (try_get_vsie_page(vsie_page)) { if (vsie_page->scb_gpa =3D=3D addr) return vsie_page; /* * We raced with someone reusing + putting this vsie * page before we grabbed it. */ + put_vsie_page(vsie_page); } - page_ref_dec(page); } =20 /* @@ -1394,7 +1417,7 @@ static struct vsie_page *get_vsie_page(struct kvm *kv= m, unsigned long addr) return ERR_PTR(-ENOMEM); } vsie_page =3D page_to_virt(page); - page_ref_inc(page); + __set_bit(VSIE_PAGE_IN_USE, &vsie_page->flags); kvm->arch.vsie.pages[kvm->arch.vsie.page_count] =3D page; kvm->arch.vsie.page_count++; } else { @@ -1402,9 +1425,8 @@ static struct vsie_page *get_vsie_page(struct kvm *kv= m, unsigned long addr) while (true) { page =3D kvm->arch.vsie.pages[kvm->arch.vsie.next]; vsie_page =3D page_to_virt(page); - if (page_ref_inc_return(page) =3D=3D 2) + if (try_get_vsie_page(vsie_page)) break; - page_ref_dec(page); kvm->arch.vsie.next++; kvm->arch.vsie.next %=3D nr_vcpus; } @@ -1417,7 +1439,7 @@ static struct vsie_page *get_vsie_page(struct kvm *kv= m, unsigned long addr) =20 /* Double use of the same address or allocation failure. */ if (radix_tree_insert(&kvm->arch.vsie.addr_to_page, addr >> 9, page)) { - page_ref_dec(page); + put_vsie_page(vsie_page); mutex_unlock(&kvm->arch.vsie.mutex); return NULL; } @@ -1431,14 +1453,6 @@ static struct vsie_page *get_vsie_page(struct kvm *k= vm, unsigned long addr) return vsie_page; } =20 -/* put a vsie page acquired via get_vsie_page */ -static void put_vsie_page(struct kvm *kvm, struct vsie_page *vsie_page) -{ - struct page *page =3D pfn_to_page(__pa(vsie_page) >> PAGE_SHIFT); - - page_ref_dec(page); -} - int kvm_s390_handle_vsie(struct kvm_vcpu *vcpu) { struct vsie_page *vsie_page; @@ -1489,7 +1503,7 @@ int kvm_s390_handle_vsie(struct kvm_vcpu *vcpu) out_unpin_scb: unpin_scb(vcpu, vsie_page, scb_addr); out_put: - put_vsie_page(vcpu->kvm, vsie_page); + put_vsie_page(vsie_page); =20 return rc < 0 ? rc : 0; } --=20 2.47.1