From nobody Sat Dec 13 22:56:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751908654670446.61722036576657; Mon, 7 Jul 2025 10:17:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uYpSh-0004Gi-4a; Mon, 07 Jul 2025 13:17:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uYpN1-0005xL-7C for qemu-devel@nongnu.org; Mon, 07 Jul 2025 13:11:12 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uYpMy-0003du-QF for qemu-devel@nongnu.org; Mon, 07 Jul 2025 13:11:10 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-453749af004so16684885e9.1 for ; Mon, 07 Jul 2025 10:11:08 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-454a9969409sm148563205e9.4.2025.07.07.10.11.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 07 Jul 2025 10:11:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1751908266; x=1752513066; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+5gveKaTQGbAOFhr1P2VwAZhRZKOx4EdeZA5gTT2oDQ=; b=jGOVA9mW9NDkr7SAROGiJ68YKS8cf5TTWye4yTdbT4HpR+e/MGHG7zdLgDTwZd/DRd 5U5LOZ55bhY1ICm06lC46CJpq9VbG/0yM/3VUwcn4O0W90nQAAF9fAK0wRIrS5OWGn9Q IoPHak5v2GMLyyKWbm7Affc75m7q3hWJ+/rFt5/GwplBi6BWS8Igzmn5XONDBjvCsau8 qMPV4nerWzPGlEC8V0rd1ButEDdhNIizHwRKZ41nKOSTzsic3SzMcN722UNjruDWv68O 3rogmyKkbJ/H9LTIOs1BvkxH23gXv0/h69oO+dNXgBweS8t4mU2BB67Qh171/Z8NRNem fK2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751908266; x=1752513066; 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=+5gveKaTQGbAOFhr1P2VwAZhRZKOx4EdeZA5gTT2oDQ=; b=BAuCqxktNEJ4xleqhCtyW8hDqWwsJfVAdeCmP+lJDFqiTP4wf5Urt5JuN9uq+L9EFp 2i9V2YFgIBqZdmmo1SeS68YPixrXWxOCBgCqXYddrvwIfLadhpNAGKTuD8f3JEDsoeu9 1elmY5korFD3ryQntthp3ErQs0y5HiM246fFG15uvU9ROFykOV58MUWApWbSZlLN/uUt pwZ0jMsOABJkORiDWk1/vM8i4hHx2drlQvXcCYJToyjFW8aj+oa+7cVpHRzqionMqrvI HVGNroa3A1u0XvV694HbEhhvic9yDxLMipBYxjwUYOq+q6sdR25QYx2SyOp6PJeUOWfe 6cbg== X-Gm-Message-State: AOJu0Yy1/ybMW6Ni3FwpNzAEDFL0m2slxyJYae7spKMSJNqROh4wH2yQ PRgIBSkoMnP6qdSLAA8wjyY1DB0zzqpMrDUeo0NBxxbQD87/B0+3mrUIKrUfM5PHLRbirYlgQC6 5Zu1xF0U= X-Gm-Gg: ASbGnctCbreYNBW5TeJ3a8HjjxPBLEX+Us8d89rJsAIMtoW4dOtKoVjiuxqnQBHMam/ dzWNQOTbCi5td4VVwt/C3NuZQABOmBBN5MlHFgSNidI6FWdmSKByce+rusBTZ9bDR/AYMo+5geR eEL+hEjgE+zE0pkqVO450lvqG/I78lLgFnvxpsmvFkZuXmdiZNXTFEUphSHN9ZD/M89nVhwoSgk X9ueRovpU9JiCndIlurxcNux440YzsA89dqRtg8/WAaL5k222Ls26Y7ryueHYMHKPvlndI5e6at 3xa0cnQW7iWFow9yT4R/UtMOwFw4BFXZQU1S+J7WTCxXKm59VB6a7VjH1o49EsVw34PMeTRWYjQ ix2UXH2bEqwvpY+84fXZZpx3G8jLxzzw5Lr4w X-Google-Smtp-Source: AGHT+IEEb/h+UxgV3XqriG0+dkluAf1QoTdj7Yxw4hd2kco9TJ1Bx9m0kZehwLigc9UxJDgaeKM60Q== X-Received: by 2002:a05:6000:310d:b0:3a8:6260:ea91 with SMTP id ffacd0b85a97d-3b49aa7ab3dmr7115912f8f.40.1751908266490; Mon, 07 Jul 2025 10:11:06 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Matthew Rosato , Eric Farman , Richard Henderson , David Hildenbrand , Ilya Leoshkevich , Thomas Huth , qemu-s390x@nongnu.org, Christian Borntraeger , Pierrick Bouvier , Halil Pasic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/2] target/s390x/kvm: Use vaddr in find/insert_hw_breakpoint() Date: Mon, 7 Jul 2025 19:10:58 +0200 Message-ID: <20250707171059.3064-2-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250707171059.3064-1-philmd@linaro.org> References: <20250707171059.3064-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1751908668807116600 Since commit b8a6eb1862a both kvm_arch_insert_hw_breakpoint() and kvm_arch_remove_hw_breakpoint() use a vaddr type. Use the same type for the callees. Fixes: b8a6eb1862a ("sysemu/kvm: Use vaddr for kvm_arch_[insert|remove]_hw_= breakpoint") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/s390x/kvm/kvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c index 67d9a1977c0..491cc5f9756 100644 --- a/target/s390x/kvm/kvm.c +++ b/target/s390x/kvm/kvm.c @@ -889,7 +889,7 @@ int kvm_arch_remove_sw_breakpoint(CPUState *cs, struct = kvm_sw_breakpoint *bp) return 0; } =20 -static struct kvm_hw_breakpoint *find_hw_breakpoint(target_ulong addr, +static struct kvm_hw_breakpoint *find_hw_breakpoint(vaddr addr, int len, int type) { int n; @@ -904,7 +904,7 @@ static struct kvm_hw_breakpoint *find_hw_breakpoint(tar= get_ulong addr, return NULL; } =20 -static int insert_hw_breakpoint(target_ulong addr, int len, int type) +static int insert_hw_breakpoint(vaddr addr, int len, int type) { int size; =20 --=20 2.49.0 From nobody Sat Dec 13 22:56:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1751908641; cv=none; d=zohomail.com; s=zohoarc; b=irAVORS2WtQUHx5N7x8XotzWa0PkPfLytohQ0+nNVy3Ti3+4/2reXCaEAEweyrVsST6/8O3J0yROxiWpFQUE1HLsNxbTCqTK//xVEMNkzoCSIC/vcVXRKaR9tdHhkJOUjdNnKRl9z551B3bdn9H9pad+MXOWOs8UzBuw4b9gNJA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751908641; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9fEGrFzvbkD7rsSOvZ5d7uO6zmQ0v7qQeSAC4Ag5E10=; b=oCQ8OmPNSnvZ6PIdlFtOxZrI2KPDt5Id/tljFBAGdPa/dnM9Hp0An60+9euAPJmUWZbXd4/Gs2T0YsPdXejSYh9BSYqioEIO1Nox+PUugSA75tlhHT5vn0vidn3yamAtu5+/UELzSE2db0k+Na0EOBophslQCBLE9q+K5H7kmR0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751908640996747.4097592906098; Mon, 7 Jul 2025 10:17:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uYpSl-0004gQ-Gq; Mon, 07 Jul 2025 13:17:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uYpN6-000653-Jc for qemu-devel@nongnu.org; Mon, 07 Jul 2025 13:11:16 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uYpN3-0003eS-Dg for qemu-devel@nongnu.org; Mon, 07 Jul 2025 13:11:16 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-450ce3a2dd5so30746555e9.3 for ; Mon, 07 Jul 2025 10:11:12 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-454b162a3ccsm117727735e9.12.2025.07.07.10.11.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 07 Jul 2025 10:11:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1751908271; x=1752513071; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9fEGrFzvbkD7rsSOvZ5d7uO6zmQ0v7qQeSAC4Ag5E10=; b=D6OZx2lHYc0AIO3CXQnT36Nbwex+L9sgPkbw9dVVeFQl4k6m4Ppa/uWS/TqOGrnlVf Qi1K4RSWtNJbOE1viOYp3j4uwPlvpLwHtBR/bBOabu9Xd+kP1BNrDjRmMSV1wEiENLp1 LqIOjIvas/MRKDxT2k5F/MpXdyj85HckG3P8ntDKQEiaDAm/JA2NHeX+Nxg6luBqbtRV 19sRE7UZ0DKhQqiiItGHw+keSns0IQVDgjExRo3cMCmFGcvcGCmHD97QRAJMYIZWUXin t30Pn4E4BTSnY8IxZUytNW7y558VVnB2TfpbR1gZiPiU6Aeiw10SJZfyOjC35+EMWu7B Xidg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751908271; x=1752513071; 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=9fEGrFzvbkD7rsSOvZ5d7uO6zmQ0v7qQeSAC4Ag5E10=; b=lG5MLLPeN+SRS54VsJTVDGUn0FUTke+QT61AAc0UKEoYprlQhhtpZvZSDUJM02wDiC 6p3udCVxcj1SekJ0uB1rbtvJpu4+SE/NSqPSClNvd5XljauG8KpaGFAPIPpnpjgU9XNd MZIlbfSpVE6h89Jdr3Ea+nQVMt3xrYjEvJA5NhJLDN6Km8Rde4C6CxI95h5QoDULAd4l nHkw5YrmeP120DwzDLpJY3UlvBImwwGU1lFNRpzyM7GcXRYEnERF4KIdxFEJgpOFwpo7 eJLp4g7LlDHdz+6Mb3RLq9sE0/QcL9R1rQjO4p3SeI96RjOeFOUNVJjxvv1Qr/q1ru2p SBUw== X-Gm-Message-State: AOJu0YyVE5Buoil/3ju9iwBg1ZcWeR1QwwNYtohelpBExPA/3FUVgzwc VxB+r7b7b+1JzzBUukRC2yWS86SNNPG6IYcGHQX7J2k6+qx+FWBSlClFAZv+iW2ZL9TtU1ZljdF bJNAzvp0= X-Gm-Gg: ASbGncsV75s0irexEu0+zOdIwDBTx8kIcUjbVTWPxNFXF8AcNXkzOZj7C8jvoW4EF7+ Pml3s3q/yqbUgCSu3TbXNsY1FKH3RJl7neGdXEUfGcUvoADRppTQG7JxvhMmlK9VNnh6Y6Ptq8z C8FM41Qe/iBelmXgqcxdl5oLtZZgL1CkOXrFhEtmptRHfCNyXd+Txhj041TlWx9xSyvQMwVd/Xd 4N1qFc9dAT4jHh2xP6fu8U1yL/wxdZ7awhKr7xMZIJHbnjE0F1aLUk255wBuYI8QnAuXgXKVS9n 23W3CieDdOqtV3e+jk2qP3uRQKfhDyjb9nCEDS31ax2zWCVUf7rJitVAPXJVdQdOm2effNP3VqM Kp5g1UlQq37DMYFbp+Cz3v+kKvt+kiLjMXKOw X-Google-Smtp-Source: AGHT+IEHuGUPWHX9daOsthlGvHjGQ/5le0kVE/naEFhfF+YwPcLnorNFJqFxxynz1JGE/W+ciHLjWQ== X-Received: by 2002:a05:600c:648a:b0:43d:878c:7c40 with SMTP id 5b1f17b1804b1-454b4e769e4mr128829825e9.10.1751908271206; Mon, 07 Jul 2025 10:11:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Matthew Rosato , Eric Farman , Richard Henderson , David Hildenbrand , Ilya Leoshkevich , Thomas Huth , qemu-s390x@nongnu.org, Christian Borntraeger , Pierrick Bouvier , Halil Pasic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/2] target/s390x/tcg: Use vaddr in s390_probe_access() Date: Mon, 7 Jul 2025 19:10:59 +0200 Message-ID: <20250707171059.3064-3-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250707171059.3064-1-philmd@linaro.org> References: <20250707171059.3064-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1751908642350116600 Commit 70ebd9ce1cb ("s390x/tcg: Fault-safe memset") passed vaddr type to access_prepare(), and commit b6c636f2cd6 ("s390x/tcg: Fault-safe memmove") to do_access_get_byte(), but declared S390Access::vaddr[1,2] as target_ulong. Directly declare these as vaddr type, and have s390_probe_access() use that type as argument. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/s390x/tcg/mem_helper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index a03609a1406..f1acb1618f7 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -126,8 +126,8 @@ static inline void cpu_stsize_data_ra(CPUS390XState *en= v, uint64_t addr, =20 /* An access covers at most 4096 bytes and therefore at most two pages. */ typedef struct S390Access { - target_ulong vaddr1; - target_ulong vaddr2; + vaddr vaddr1; + vaddr vaddr2; void *haddr1; void *haddr2; uint16_t size1; @@ -148,7 +148,7 @@ typedef struct S390Access { * For !CONFIG_USER_ONLY, the TEC is stored stored to env->tlb_fill_tec. * For CONFIG_USER_ONLY, the faulting address is stored to env->__excp_add= r. */ -static inline int s390_probe_access(CPUArchState *env, target_ulong addr, +static inline int s390_probe_access(CPUArchState *env, vaddr addr, int size, MMUAccessType access_type, int mmu_idx, bool nonfault, void **phost, uintptr_t ra) @@ -258,7 +258,7 @@ static void access_memset(CPUS390XState *env, S390Acces= s *desta, static uint8_t access_get_byte(CPUS390XState *env, S390Access *access, int offset, uintptr_t ra) { - target_ulong vaddr =3D access->vaddr1; + vaddr vaddr =3D access->vaddr1; void *haddr =3D access->haddr1; =20 if (unlikely(offset >=3D access->size1)) { @@ -278,7 +278,7 @@ static uint8_t access_get_byte(CPUS390XState *env, S390= Access *access, static void access_set_byte(CPUS390XState *env, S390Access *access, int offset, uint8_t byte, uintptr_t ra) { - target_ulong vaddr =3D access->vaddr1; + vaddr vaddr =3D access->vaddr1; void *haddr =3D access->haddr1; =20 if (unlikely(offset >=3D access->size1)) { --=20 2.49.0