From patchwork Fri Mar 7 19:09:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14007021 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 3597F24EF9A for ; Fri, 7 Mar 2025 19:10:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741374615; cv=none; b=cxfEwE6CGsLDxOSoB3EDM79JbnpSM7emXr7MLPNTzrEATVuzPGMStCNiFFm/8fg2FYy5EXQFdPNCLtlTzypXqpgcTzFe7iDv/dfjpUGfOLJyM46gko0gi5d1BGyk8kIP42GldzckRfq387z6oV5UxL7XojvV7xfv5afEfk5soiI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741374615; c=relaxed/simple; bh=N9IiMExxiXgXPoqm4k5CCKl5YvodRMWS+HiDAjO9yyI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=U0ZuRLZFez8AKTtpDx/+28hnTH7n1r/VRY92Vfx6bG8/MZdmKe7pENXzHmEzZ6ZRn8IhgsmQE9pPVtBYsl5r67m51nylUK1n5Vu6C1yMnnL6aqavIASZJN0C52VOs5WZ0aE6GfXqI3zKq/oiY8hqYTrBdijskrGH9vG/YTREA4A= 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=z5Vc1fJD; arc=none smtp.client-ip=209.85.214.181 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="z5Vc1fJD" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-22403cbb47fso44399635ad.0 for ; Fri, 07 Mar 2025 11:10:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741374613; x=1741979413; 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=a4g6UCTPF7xt6XmRoqdLfJpuJ3HLau+yVZ65YGfmCxA=; b=z5Vc1fJD10+F+d0d1Tx8CLNvSY+gxj+RjXx/4kjaVAH7RrSRH8ty3PKOPlso2mhLzK VmUm32py/c154JUFNsf/9GKW/EzkaU4R7Eyb3Ayo/AU6dKHz1k/4RlMAnOeGt34LWlgT PEHzL3Zeg9mRS1pd7Yh+Vz0REFiSggIkyNzSv3QBafMPrCJaVRB8cNnP/040DBMMXALi MRG93zOdaU34dUiw0FzV7zgvv9I/kXvVvwPlktE3J7lBNmxokSFFEAD6J1Zdk32EU2lY Y0v+0DsRjZvOFg6CoNj3HiruJbZ8LF5fOLEmR2q+Z+AR3UgEMRqfvUMGsOO+GCC3w1jp +Unw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741374613; x=1741979413; 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=a4g6UCTPF7xt6XmRoqdLfJpuJ3HLau+yVZ65YGfmCxA=; b=vhiBvzxhgZEgO8cFeLhqSwOrWODwXcrmoxv4ZMxRx/qPfY+5/liWJkikZJOx7Ot/GI FpwbSq1Y5Y9wymSmGaLMtv3+HM2jWPHD+/C5S+TIzuDpPpteSe6LKVMh8r7bxr8DuRny ojoMZ30wkRnvawzVpf+LEhR13ESdTSVBVX8OvJLX8IbirkVMgG4xipPpcOgcs3OyDNRg UsGvYOLBSARqT4jNTuCuqtBl8ks+9GU3GG1eiRovCUXKyOip0vcLLz2CljWI3USLQC3q g0RjDtyH+boqoIi/S9VWthRSxx5/vaPkmpI+n0/daRr2kdvyOSE7PJIUzx6WtelCjtM+ sHfw== X-Forwarded-Encrypted: i=1; AJvYcCVkKTlVzOnCsf/D5TZQmxH4BnMkCkfjR1mmnTXS3ZJWsYiunc7a+RX199L2gCfYFfQG56E=@vger.kernel.org X-Gm-Message-State: AOJu0YzouZY0I8B/84pcmT4O0aUG1xsi+7sWi83NxMLrfSNzAFz6OsZ8 U6BRzYMoS61e83Qh6GLEO6w5yY3rGAWE4Aroc41SkQ73UtyBf8T0CjHbS4qIZ1Q= X-Gm-Gg: ASbGncvF2DKzr4TykmP7iGUzsqiIuAAuxlbOD9ZkVNK90BDl2QywzpaKRqE3PjlkE92 nwBamVcPtBgaVpdN4zLCkV0vR9ig4epJ48NvMZYwIdLCkqKFk/SbexIJIuAMHLoxHFdrIZWlAu1 P+PPe7So6/lN8MqSM6hpx17N/3ATK6UqUiNXoUwf8q9UC30aJ7wkXJvoXpLHfkB31Skv4Rz27BC h61Fx7mGaWc21SOEWbp1BDHi5MVI8Xptb8+4ULUcg7zYuWzwzDu32b6nSuai+r8cFhbC/gpRB53 Dbme0UtzAIpTTjGxuAA+O//06dDxjzZLdhWh0xd2mD3C X-Google-Smtp-Source: AGHT+IFnlkYAU+Fl+or8q5/5Ez8FOWAJY+J0G6nErFHZrDkXADqcLKYjEFGG1vZq2KfLjm5Y0Sxy1A== X-Received: by 2002:a05:6a00:1401:b0:736:34a2:8a23 with SMTP id d2e1a72fcca58-736aaabee7amr5968829b3a.15.1741374613437; Fri, 07 Mar 2025 11:10:13 -0800 (PST) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736b2da32c6sm1449895b3a.149.2025.03.07.11.10.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 11:10:13 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: philmd@linaro.org, "Maciej S. Szmigiero" , pierrick.bouvier@linaro.org, alex.bennee@linaro.org, kvm@vger.kernel.org, Paolo Bonzini , Marcelo Tosatti , richard.henderson@linaro.org, manos.pitsidianakis@linaro.org Subject: [PATCH v2 3/7] hw/hyperv/vmbus: common compilation unit Date: Fri, 7 Mar 2025 11:09:59 -0800 Message-Id: <20250307191003.248950-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250307191003.248950-1-pierrick.bouvier@linaro.org> References: <20250307191003.248950-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. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- 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'))