From patchwork Fri Mar 7 19:37:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14007075 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 F02CE2561D2 for ; Fri, 7 Mar 2025 19:37:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741376247; cv=none; b=jO1PlrzKkOKg50/dwPO5eXSUVexdJx+5gcGg7e5lxj/ADmk7jJK/C76eWuOUaRT3JeKSWdevux6veLWN/f3bpS9D/tQd8VkXHzzacHekg8Fi/JvcznO3i2UTvjWbq1FT0Qr+uWLAdcplMVMCkR1EBLnh4HnCMMoNJw1jonWonIA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741376247; c=relaxed/simple; bh=zp4c5q93rtLl5JHXbK/T+hj4e4a57opk8mw9PvBNMqs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EBLhADlRwh0kvqtkSE7oiZ+djAtbJOAyfZHoi0SSFKK2UEpEMcAAQkvciKfDV4sVQYki3q7xYQVYwlhO8HzDTh0B4ZCgjTRQ7RvHIjKxUclYC+5+C94wYj7L5m6fz9ro8bxyTKu10xyQ2QxayubVCo5VE2epIszmH0VkrWGlgd4= 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=uS9fpUWH; arc=none smtp.client-ip=209.85.214.173 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="uS9fpUWH" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-22438c356c8so12141985ad.1 for ; Fri, 07 Mar 2025 11:37:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741376245; x=1741981045; darn=vger.kernel.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=uS9fpUWHvCp7c+TVij3gMrotkDGshwZyap3Kc8/Z/O/8iWeOqGZJubxgA2nh7ObAFX Jf5S7t8hDF79sQAEKInYpscbBFZDNoP9dNyB6b2qc3R5IfixiJTSzY33SRWjVqRzijT0 uNLbShNIwAAruzkNh4H6VDN6bjLlnF9oqJ+k/bP1Sld3Pqp3VjiAxwgfv4I9YYfES6tC 6BXepPmKg4psb+19qQHWtC3ER5O5u/nJLhXZqa1fLhSJRoVjjQ+WwDH2NgxStS7HqCBx j2273OC5YfHoMtI14Ix20GJLLmm4Jr51aq7t+J/dPH8m3Ouawr8i316EKcOiTl1wvtjZ xH9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741376245; x=1741981045; 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=pM4GjHKBxuaDtslrjmyTi8wq/IUnL0h3o1euR3ZJ5S3lPymbvLs5r5IF1r4w2Kw5a5 G1OndLbj9cYgfJeFGcFzb+ZR7Cx0Evx+HnsR71mYwxUEA03BJ+GnDLi0T5xonNwGRyEM dhOCIIcdolelYyCwAJtS5g7DDiYVcJn0LKuoB8zW/Z/ETHyyUiphTGAbsDJzz1GjCF3f /8kg0xWoRDyR4LcH+8eMcjI927tZNN+4z36xpOIMn1EOsvYoeSHCSCRvPtBBCs2Ul/EK 55EUC1WtbFDRoxw5sevPwHti0tQ9iRmhV7+Xowy1WrhDp9KfyRLdhQnlWEsABLcg++MQ mZCA== X-Forwarded-Encrypted: i=1; AJvYcCWlxAiwLZFpK/6twp/6/UtmJsUIFH1BHb1n1U37acADdudNtiMA1zlfH+fJ4+jGbPBnGyI=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6h+yVxvNDAQFd+3PakcgPQLMNFYJKTjXOW8oxYAit1k8AZuQG IiaCsCd8KnpFQ7U/ec4FUMXsWyv9s6wKcvcW5A8DU/JPE6UFSQvkA7IY67zorEg= X-Gm-Gg: ASbGncsWXYJZd8XjFxvy6mQ5Psx8pEZ9tJmdcKlWUPKFWdHZeQXt1uau/I1ZYX0gifH dIhiuBTvYLDk2YMyAanVdsttZ99YqbepaFt9BqyaKl4A7Hx8+soKBJNb6szIsvvFK4gjnVmrOA+ hXpqRYBsQUdoAyVcAJKJ2NrJ61GHk1VYK7DVpKsRGZnAIML/NFlo1jErHb6NBDoouQdQWop/IHI XlqDMD8D2ohC252bGJDRFQ/kTIyDeoBYzUpJuCkLToYhEakjyEy+HmFq4ZxkEdhoN0sddTnhFRp GRQYdRMVYI3/YBmPnD8okV9IvXGM9K8Jv80/7+N8q2Rf X-Google-Smtp-Source: AGHT+IG/Cs/7jguUQxnpsh7chCHttVnF2BIWXPHq+mbdcgvzPmEQkaG/XQxPrsdd/q4ZyMSNtVdLIQ== X-Received: by 2002:a17:903:192:b0:21f:507b:9ad7 with SMTP id d9443c01a7336-22428a89081mr74798445ad.25.1741376245255; Fri, 07 Mar 2025 11:37:25 -0800 (PST) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ff693739ecsm3821757a91.26.2025.03.07.11.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 11:37:24 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, philmd@linaro.org, kvm@vger.kernel.org, richard.henderson@linaro.org, "Maciej S. Szmigiero" , Paolo Bonzini , manos.pitsidianakis@linaro.org, pierrick.bouvier@linaro.org, Marcelo Tosatti Subject: [PATCH v3 3/7] hw/hyperv/vmbus: common compilation unit Date: Fri, 7 Mar 2025 11:37:08 -0800 Message-Id: <20250307193712.261415-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250307193712.261415-1-pierrick.bouvier@linaro.org> References: <20250307193712.261415-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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" enum { @@ -309,7 +309,7 @@ void vmbus_put_gpadl(VMBusGpadl *gpadl) uint32_t vmbus_gpadl_len(VMBusGpadl *gpadl) { - return gpadl->num_gfns * TARGET_PAGE_SIZE; + return gpadl->num_gfns * qemu_target_page_size(); } static void gpadl_iter_init(GpadlIter *iter, VMBusGpadl *gpadl, @@ -323,14 +323,14 @@ static void gpadl_iter_init(GpadlIter *iter, VMBusGpadl *gpadl, static inline void gpadl_iter_cache_unmap(GpadlIter *iter) { - uint32_t map_start_in_page = (uintptr_t)iter->map & ~TARGET_PAGE_MASK; - uint32_t io_end_in_page = ((iter->last_off - 1) & ~TARGET_PAGE_MASK) + 1; + uint32_t map_start_in_page = (uintptr_t)iter->map & ~qemu_target_page_mask(); + uint32_t io_end_in_page = ((iter->last_off - 1) & ~qemu_target_page_mask()) + 1; /* 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); - 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_start_in_page, iter->dir, io_end_in_page - map_start_in_page); } @@ -348,17 +348,17 @@ static ssize_t gpadl_iter_io(GpadlIter *iter, void *buf, uint32_t len) assert(iter->active); while (len) { - uint32_t off_in_page = iter->off & ~TARGET_PAGE_MASK; - uint32_t pgleft = TARGET_PAGE_SIZE - off_in_page; + uint32_t off_in_page = iter->off & ~qemu_target_page_mask(); + uint32_t pgleft = qemu_target_page_size() - off_in_page; uint32_t cplen = MIN(pgleft, len); void *p; /* try to reuse the cached mapping */ if (iter->map) { uint32_t map_start_in_page = - (uintptr_t)iter->map & ~TARGET_PAGE_MASK; - uint32_t off_base = iter->off & ~TARGET_PAGE_MASK; - uint32_t mapped_base = (iter->last_off - 1) & ~TARGET_PAGE_MASK; + (uintptr_t)iter->map & ~qemu_target_page_mask(); + uint32_t off_base = iter->off & ~qemu_target_page_mask(); + uint32_t mapped_base = (iter->last_off - 1) & ~qemu_target_page_mask(); if (off_base != mapped_base || off_in_page < map_start_in_page) { gpadl_iter_cache_unmap(iter); iter->map = NULL; @@ -368,10 +368,10 @@ static ssize_t gpadl_iter_io(GpadlIter *iter, void *buf, uint32_t len) if (!iter->map) { dma_addr_t maddr; dma_addr_t mlen = pgleft; - uint32_t idx = iter->off >> TARGET_PAGE_BITS; + uint32_t idx = iter->off >> qemu_target_page_bits(); assert(idx < iter->gpadl->num_gfns); - maddr = (iter->gpadl->gfns[idx] << TARGET_PAGE_BITS) | off_in_page; + maddr = (iter->gpadl->gfns[idx] << qemu_target_page_bits()) | off_in_page; iter->map = 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) } } - p = (void *)(uintptr_t)(((uintptr_t)iter->map & TARGET_PAGE_MASK) | + p = (void *)(uintptr_t)(((uintptr_t)iter->map & qemu_target_page_mask()) | off_in_page); if (iter->dir == DMA_DIRECTION_FROM_DEVICE) { memcpy(p, buf, cplen); @@ -591,9 +591,9 @@ static void ringbuf_init_common(VMBusRingBufCommon *ringbuf, VMBusGpadl *gpadl, uint32_t begin, uint32_t end) { ringbuf->as = as; - ringbuf->rb_addr = gpadl->gfns[begin] << TARGET_PAGE_BITS; - ringbuf->base = (begin + 1) << TARGET_PAGE_BITS; - ringbuf->len = (end - begin - 1) << TARGET_PAGE_BITS; + ringbuf->rb_addr = gpadl->gfns[begin] << qemu_target_page_bits(); + ringbuf->base = (begin + 1) << qemu_target_page_bits(); + ringbuf->len = (end - begin - 1) << qemu_target_page_bits(); gpadl_iter_init(&ringbuf->iter, gpadl, as, dir); } @@ -734,7 +734,7 @@ static int vmbus_channel_notify_guest(VMBusChannel *chan) unsigned long *int_map, mask; unsigned idx; hwaddr addr = chan->vmbus->int_page_gpa; - hwaddr len = TARGET_PAGE_SIZE / 2, dirty = 0; + hwaddr len = qemu_target_page_size() / 2, dirty = 0; trace_vmbus_channel_notify_guest(chan->id); @@ -743,7 +743,7 @@ static int vmbus_channel_notify_guest(VMBusChannel *chan) } int_map = cpu_physical_memory_map(addr, &len, 1); - if (len != TARGET_PAGE_SIZE / 2) { + if (len != qemu_target_page_size() / 2) { res = -ENXIO; goto unmap; } @@ -1038,14 +1038,14 @@ static int sgl_from_gpa_ranges(QEMUSGList *sgl, VMBusDevice *dev, } len -= sizeof(range); - if (range.byte_offset & TARGET_PAGE_MASK) { + if (range.byte_offset & qemu_target_page_mask()) { goto eio; } for (; range.byte_count; range.byte_offset = 0) { uint64_t paddr; uint32_t plen = MIN(range.byte_count, - TARGET_PAGE_SIZE - range.byte_offset); + qemu_target_page_size() - range.byte_offset); if (len < sizeof(uint64_t)) { goto eio; @@ -1055,7 +1055,7 @@ static int sgl_from_gpa_ranges(QEMUSGList *sgl, VMBusDevice *dev, goto err; } len -= sizeof(uint64_t); - paddr <<= TARGET_PAGE_BITS; + paddr <<= qemu_target_page_bits(); paddr |= range.byte_offset; range.byte_count -= plen; @@ -1804,7 +1804,7 @@ static void handle_gpadl_header(VMBus *vmbus, vmbus_message_gpadl_header *msg, * anything else and simplify things greatly. */ if (msg->rangecount != 1 || msg->range[0].byte_offset || - (msg->range[0].byte_count != (num_gfns << TARGET_PAGE_BITS))) { + (msg->range[0].byte_count != (num_gfns << qemu_target_page_bits()))) { return; } @@ -2240,10 +2240,10 @@ static void vmbus_signal_event(EventNotifier *e) return; } - addr = vmbus->int_page_gpa + TARGET_PAGE_SIZE / 2; - len = TARGET_PAGE_SIZE / 2; + addr = vmbus->int_page_gpa + qemu_target_page_size() / 2; + len = qemu_target_page_size() / 2; int_map = cpu_physical_memory_map(addr, &len, 1); - if (len != TARGET_PAGE_SIZE / 2) { + if (len != qemu_target_page_size() / 2) { goto unmap; } 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_testdev.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'))