From nobody Thu Apr 3 11:59:56 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=1741384661; cv=none; d=zohomail.com; s=zohoarc; b=FSCZsP48T6016IxLJi1+kxm5//6IR1Gd7YCgDlzSgFmZUoTsopPRMG7KPUY01n6s0NteptSMmsn9b2ha2SXFhi/nFqfvB5FBwWSGYxUWJGc17gwnZqPGUhxfOZfVegVMYKx7QQrcyRVz6khXya6Z/h/hmMWgFx+TLNhZ1PVlmPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741384661; h=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=sfg9fp/d1PdwCXS3veKjw2zFmzOBBZVU57mmT0JR/f0=; b=co9jfL9so71A+t0WaUvMm+7RlBncVP7zfudGrPEB5LtEsIS5Ly+G8woJhoSThHxZU2ucX3kPm5mJdw+8mVtxQZoMRdTG9YygScKkw0We7A68qqpnehgz2kpNdHHZ3bnpwVdSepX6JBkKbbfH+dc5gO6AKsf0lmlx0L6tWSdqFnk= 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 1741384661279925.2534148441954; Fri, 7 Mar 2025 13:57:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tqfgQ-0004zz-Nm; Fri, 07 Mar 2025 16:56:42 -0500 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 1tqfgP-0004zJ-78 for qemu-devel@nongnu.org; Fri, 07 Mar 2025 16:56:41 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqfgN-0001jy-8l for qemu-devel@nongnu.org; Fri, 07 Mar 2025 16:56:40 -0500 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-223959039f4so49592215ad.3 for ; Fri, 07 Mar 2025 13:56:38 -0800 (PST) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736ac9247dcsm2000927b3a.125.2025.03.07.13.56.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 13:56:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741384598; x=1741989398; 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=sfg9fp/d1PdwCXS3veKjw2zFmzOBBZVU57mmT0JR/f0=; b=YYmn9/zuZMOhGFwgKNWqsx9Ax995GFn7L/kLtP6q9okJi8p2DTsDHr/K4/vG7xG+z2 XNnZQPheP/MBDEry1D2yo7Lnuya6oSxyda4+A+dL+jxXw4/Kbbj7fCLRXejmlr2lj1aC iWuqoi96lHuHM95nmtVH9SS4U3P9bapLFpKaQGBBWdBwiRqYdVGCs+en7XaCv4geUOqt +/7SW1GNH6Vey2ecMbONR48FlPfnvb9KHbfCF17LJdu/0i2SEZGAAusfYsoeUd2rwPMF NMc9u0RTqTVFqz/BnTiQWYrPEFaL3xcOBt90osMU/X4zSz/N1xxuSKfErBlUVH4T/h5g UnHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741384598; x=1741989398; 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=sfg9fp/d1PdwCXS3veKjw2zFmzOBBZVU57mmT0JR/f0=; b=F+cBKta2IMu/vGwWJaPmuPLXS4mjpNzPaS16JxVU2pUjnzWaLo28MsdlRHUR1mHr3H D6kWvrf49lzO1XEHraMESrV0Addq9dwagP+jkS22Iky4M+WxVgJ67HcI4iBO+IKedZ7K w9nM1UNcaEdMe4WlieP9s7Qq799E3LKkc0hLSipYWQ68gllZJtWl+CJsVGRcmoBkUBsH dyBZki/Ak7ddxeEzzWSUyYZU7vy/U14TzkFWvropIe5iW0uM1PXnZmhG8xJf/0UYJFSh jqT46PFRIxXj1VHuzVu5Gen/oG74H3AruPUAJT9s7kGcgs5GXcTJB2LvF172uxaoaf9i fvRA== X-Gm-Message-State: AOJu0YzDMTnvv0ryjNtCo7Sxf8zlUhUpctAPleO+3v1ilaUCzeIB5A9J 5/5+VHzhfCQSYA4OcOVz5DAOLNWg35oQtOjwSRZuobg3OT92kMNw+9Cb/vy2fU1i5Ahk0F8DSCs A X-Gm-Gg: ASbGncvWWfOU8+WfI0GkyZNVIN22xADpcXxoNPojeRpqgafoh85gAX+Xrd0YjAs19YE GxmpyijxPfhO3vgRW8cX5Lli/7w1ZOEzCTfoJKbSDLUQ7i1zEegN8FlUeSY/rgmIlMqW40ofcPy 7d/kGoIZLJNWosyPQo2dp3hFB+LNJ0qhTTbHWcx5sQOa87zxWgBSg7QwLNYjEm+rw9YLEypPh0z tENTF4Ga1tEla4OrtDMWt4aANV+ULYbBA8/KxKREAXE6OmvS7dN9BISbRWDdVsEUUt+sh6HEpFs PG/8m5YPdlVz6grTS6jYNofFCPCm5YhpejryASV6sLCd X-Google-Smtp-Source: AGHT+IGX5pfQXW7bvmwqA+NptD1rpRnsLsnmq6044IHwx1QKIiIQW9IhEs7zgPLZDe/E6y36RfvBrw== X-Received: by 2002:a05:6a00:1817:b0:736:3979:369e with SMTP id d2e1a72fcca58-736aa9f1fcdmr6571296b3a.9.1741384596537; Fri, 07 Mar 2025 13:56:36 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Paolo Bonzini , pierrick.bouvier@linaro.org, kvm@vger.kernel.org, alex.bennee@linaro.org, Marcelo Tosatti , "Maciej S. Szmigiero" , richard.henderson@linaro.org, manos.pitsidianakis@linaro.org Subject: [PATCH v4 3/7] hw/hyperv/vmbus: common compilation unit Date: Fri, 7 Mar 2025 13:56:19 -0800 Message-Id: <20250307215623.524987-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250307215623.524987-1-pierrick.bouvier@linaro.org> References: <20250307215623.524987-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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=2607:f8b0:4864:20::62e; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62e.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=ham 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: 1741384663542019100 Content-Type: text/plain; charset="utf-8" Replace TARGET_PAGE.* by runtime calls. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- hw/hyperv/vmbus.c | 50 +++++++++++++++++++++---------------------- hw/hyperv/meson.build | 2 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index 12a7dc43128..109ac319caf 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -18,7 +18,7 @@ #include "hw/hyperv/vmbus.h" #include "hw/hyperv/vmbus-bridge.h" #include "hw/sysbus.h" -#include "cpu.h" +#include "exec/target_page.h" #include "trace.h" =20 enum { @@ -309,7 +309,7 @@ void vmbus_put_gpadl(VMBusGpadl *gpadl) =20 uint32_t vmbus_gpadl_len(VMBusGpadl *gpadl) { - return gpadl->num_gfns * TARGET_PAGE_SIZE; + return gpadl->num_gfns * qemu_target_page_size(); } =20 static void gpadl_iter_init(GpadlIter *iter, VMBusGpadl *gpadl, @@ -323,14 +323,14 @@ static void gpadl_iter_init(GpadlIter *iter, VMBusGpa= dl *gpadl, =20 static inline void gpadl_iter_cache_unmap(GpadlIter *iter) { - uint32_t map_start_in_page =3D (uintptr_t)iter->map & ~TARGET_PAGE_MAS= K; - uint32_t io_end_in_page =3D ((iter->last_off - 1) & ~TARGET_PAGE_MASK)= + 1; + uint32_t map_start_in_page =3D (uintptr_t)iter->map & ~qemu_target_pag= e_mask(); + uint32_t io_end_in_page =3D ((iter->last_off - 1) & ~qemu_target_page_= mask()) + 1; =20 /* mapping is only done to do non-zero amount of i/o */ assert(iter->last_off > 0); assert(map_start_in_page < io_end_in_page); =20 - dma_memory_unmap(iter->as, iter->map, TARGET_PAGE_SIZE - map_start_in_= page, + dma_memory_unmap(iter->as, iter->map, qemu_target_page_size() - map_st= art_in_page, iter->dir, io_end_in_page - map_start_in_page); } =20 @@ -348,17 +348,17 @@ static ssize_t gpadl_iter_io(GpadlIter *iter, void *b= uf, uint32_t len) assert(iter->active); =20 while (len) { - uint32_t off_in_page =3D iter->off & ~TARGET_PAGE_MASK; - uint32_t pgleft =3D TARGET_PAGE_SIZE - off_in_page; + uint32_t off_in_page =3D iter->off & ~qemu_target_page_mask(); + uint32_t pgleft =3D qemu_target_page_size() - off_in_page; uint32_t cplen =3D MIN(pgleft, len); void *p; =20 /* try to reuse the cached mapping */ if (iter->map) { uint32_t map_start_in_page =3D - (uintptr_t)iter->map & ~TARGET_PAGE_MASK; - uint32_t off_base =3D iter->off & ~TARGET_PAGE_MASK; - uint32_t mapped_base =3D (iter->last_off - 1) & ~TARGET_PAGE_M= ASK; + (uintptr_t)iter->map & ~qemu_target_page_mask(); + uint32_t off_base =3D iter->off & ~qemu_target_page_mask(); + uint32_t mapped_base =3D (iter->last_off - 1) & ~qemu_target_p= age_mask(); if (off_base !=3D mapped_base || off_in_page < map_start_in_pa= ge) { gpadl_iter_cache_unmap(iter); iter->map =3D NULL; @@ -368,10 +368,10 @@ static ssize_t gpadl_iter_io(GpadlIter *iter, void *b= uf, uint32_t len) if (!iter->map) { dma_addr_t maddr; dma_addr_t mlen =3D pgleft; - uint32_t idx =3D iter->off >> TARGET_PAGE_BITS; + uint32_t idx =3D iter->off >> qemu_target_page_bits(); assert(idx < iter->gpadl->num_gfns); =20 - maddr =3D (iter->gpadl->gfns[idx] << TARGET_PAGE_BITS) | off_i= n_page; + maddr =3D (iter->gpadl->gfns[idx] << qemu_target_page_bits()) = | off_in_page; =20 iter->map =3D dma_memory_map(iter->as, maddr, &mlen, iter->dir, MEMTXATTRS_UNSPECIFIED); @@ -382,7 +382,7 @@ static ssize_t gpadl_iter_io(GpadlIter *iter, void *buf= , uint32_t len) } } =20 - p =3D (void *)(uintptr_t)(((uintptr_t)iter->map & TARGET_PAGE_MASK= ) | + p =3D (void *)(uintptr_t)(((uintptr_t)iter->map & qemu_target_page= _mask()) | off_in_page); if (iter->dir =3D=3D DMA_DIRECTION_FROM_DEVICE) { memcpy(p, buf, cplen); @@ -591,9 +591,9 @@ static void ringbuf_init_common(VMBusRingBufCommon *rin= gbuf, VMBusGpadl *gpadl, uint32_t begin, uint32_t end) { ringbuf->as =3D as; - ringbuf->rb_addr =3D gpadl->gfns[begin] << TARGET_PAGE_BITS; - ringbuf->base =3D (begin + 1) << TARGET_PAGE_BITS; - ringbuf->len =3D (end - begin - 1) << TARGET_PAGE_BITS; + ringbuf->rb_addr =3D gpadl->gfns[begin] << qemu_target_page_bits(); + ringbuf->base =3D (begin + 1) << qemu_target_page_bits(); + ringbuf->len =3D (end - begin - 1) << qemu_target_page_bits(); gpadl_iter_init(&ringbuf->iter, gpadl, as, dir); } =20 @@ -734,7 +734,7 @@ static int vmbus_channel_notify_guest(VMBusChannel *cha= n) unsigned long *int_map, mask; unsigned idx; hwaddr addr =3D chan->vmbus->int_page_gpa; - hwaddr len =3D TARGET_PAGE_SIZE / 2, dirty =3D 0; + hwaddr len =3D qemu_target_page_size() / 2, dirty =3D 0; =20 trace_vmbus_channel_notify_guest(chan->id); =20 @@ -743,7 +743,7 @@ static int vmbus_channel_notify_guest(VMBusChannel *cha= n) } =20 int_map =3D cpu_physical_memory_map(addr, &len, 1); - if (len !=3D TARGET_PAGE_SIZE / 2) { + if (len !=3D qemu_target_page_size() / 2) { res =3D -ENXIO; goto unmap; } @@ -1038,14 +1038,14 @@ static int sgl_from_gpa_ranges(QEMUSGList *sgl, VMB= usDevice *dev, } len -=3D sizeof(range); =20 - if (range.byte_offset & TARGET_PAGE_MASK) { + if (range.byte_offset & qemu_target_page_mask()) { goto eio; } =20 for (; range.byte_count; range.byte_offset =3D 0) { uint64_t paddr; uint32_t plen =3D MIN(range.byte_count, - TARGET_PAGE_SIZE - range.byte_offset); + qemu_target_page_size() - range.byte_offse= t); =20 if (len < sizeof(uint64_t)) { goto eio; @@ -1055,7 +1055,7 @@ static int sgl_from_gpa_ranges(QEMUSGList *sgl, VMBus= Device *dev, goto err; } len -=3D sizeof(uint64_t); - paddr <<=3D TARGET_PAGE_BITS; + paddr <<=3D qemu_target_page_bits(); paddr |=3D range.byte_offset; range.byte_count -=3D plen; =20 @@ -1804,7 +1804,7 @@ static void handle_gpadl_header(VMBus *vmbus, vmbus_m= essage_gpadl_header *msg, * anything else and simplify things greatly. */ if (msg->rangecount !=3D 1 || msg->range[0].byte_offset || - (msg->range[0].byte_count !=3D (num_gfns << TARGET_PAGE_BITS))) { + (msg->range[0].byte_count !=3D (num_gfns << qemu_target_page_bits(= )))) { return; } =20 @@ -2240,10 +2240,10 @@ static void vmbus_signal_event(EventNotifier *e) return; } =20 - addr =3D vmbus->int_page_gpa + TARGET_PAGE_SIZE / 2; - len =3D TARGET_PAGE_SIZE / 2; + addr =3D vmbus->int_page_gpa + qemu_target_page_size() / 2; + len =3D qemu_target_page_size() / 2; int_map =3D cpu_physical_memory_map(addr, &len, 1); - if (len !=3D TARGET_PAGE_SIZE / 2) { + if (len !=3D qemu_target_page_size() / 2) { goto unmap; } =20 diff --git a/hw/hyperv/meson.build b/hw/hyperv/meson.build index f4aa0a5ada9..c855fdcf04c 100644 --- a/hw/hyperv/meson.build +++ b/hw/hyperv/meson.build @@ -1,6 +1,6 @@ specific_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c')) specific_ss.add(when: 'CONFIG_HYPERV_TESTDEV', if_true: files('hyperv_test= dev.c')) -specific_ss.add(when: 'CONFIG_VMBUS', if_true: files('vmbus.c')) +system_ss.add(when: 'CONFIG_VMBUS', if_true: files('vmbus.c')) specific_ss.add(when: 'CONFIG_SYNDBG', if_true: files('syndbg.c')) specific_ss.add(when: 'CONFIG_HV_BALLOON', if_true: files('hv-balloon.c', = 'hv-balloon-page_range_tree.c', 'hv-balloon-our_range_memslots.c')) system_ss.add(when: 'CONFIG_HV_BALLOON', if_false: files('hv-balloon-stub.= c')) --=20 2.39.5