From patchwork Thu Oct 5 03:42:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 729695 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a4e:0:b0:31d:da82:a3b4 with SMTP id v14csp677772wrs; Wed, 4 Oct 2023 20:43:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFV7KvhZHDbar1+uweXMvPtTTh8nHg9aEt9HUUhq/+Ve9s5KbD/CB+5Ubni77BWs09dDFXG X-Received: by 2002:a0c:b304:0:b0:647:21d2:21d2 with SMTP id s4-20020a0cb304000000b0064721d221d2mr3253191qve.14.1696477423704; Wed, 04 Oct 2023 20:43:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696477423; cv=none; d=google.com; s=arc-20160816; b=Y0e9BMDL+n4s9ucHr+aJ10gf0JmBGTNX107/gHcQ3MI86gGrLri7wmq9CbEZxODDkX s3hiH3RURcpwUH/qVkYYrglZ4PHImO5zln84oMRiYJUdTQtu7cFsiIfJQywLYdOgF1Qf A8yk9RUhzbNX/Rm9l9Y3MXA/M4Rp5vg/HwU4idSTHVXu2MMRKub5AO0ecmqgSBc4RspW ggSCozMEe1bmc7Taz8FkeuEjMMgoqQwN54K1NqMH84ID0gWhNsUWr4JsNS5D3TiD24zw U3uAmWsZeDtLzmlEjxdKmSDxazQdhW7bzSwWzbF4ygV52U2c2MzByvNVQFRRhbTrUBeM St3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=g3XainUJVMKa+Hs4fQFDx+vYokCoMuU5n+RMYZYnWdU=; fh=zhzFgY8F88gmLqhr0Gjm2ulsyPFhXBed6tbGp+K0bf4=; b=XD7J6lnNtjLPLYvgpLvi1mwmplhD7uGO19tds2RTr3EFBQp6XGbXI9Fvr9mUPnoBZC C/pTGqYIv6uqK0IK812i0YUBJHoWq1GH8kpsktcJ4v8AV4ukZlSbxdcRcTgqsOl/9hOd Tm14RsI6kgh0OIOQDuQDm/z6sKfG5EszWhOUlApAnRdWRZoj1z+MNQAaF3MaFzPxCK8m +XvkLiOsTQ7d8Woas31YBoxoldZIA3JitkVxTffExogmYBrYK6oxIWqJCWqIos/POZUz ySxmjLN8OPMTd69GM99aBcKVoydC9e1dyFQRNocNIBv8zdOvQ/f3ASFRjGjzNKfc+o2O tuNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=CnO5siIQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m6-20020a0cf186000000b0065b22760974si326340qvl.504.2023.10.04.20.43.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Oct 2023 20:43:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=CnO5siIQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoFGF-0001D8-8p; Wed, 04 Oct 2023 23:42:51 -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 1qoFGE-0001Ch-2f for qemu-devel@nongnu.org; Wed, 04 Oct 2023 23:42:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoFGC-0007yd-MJ for qemu-devel@nongnu.org; Wed, 04 Oct 2023 23:42:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696477367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g3XainUJVMKa+Hs4fQFDx+vYokCoMuU5n+RMYZYnWdU=; b=CnO5siIQZFD+l3pBY2kYJBrw5BLyKycwGg8iqsuUSClU0/Dy06FWIPxfunb6NS6Ry/FTWY Q4qNBWePpHoNoewKUOio84F/dsWOfTaCzz98YKaiWm/oGZD7dOuXl2Z3+p2o4d7f+6jmXU +axfYsiUG/V683RXYubxCrWLenhAGdc= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-18-fnbvjn0bNjCYSit5ZEMirg-1; Wed, 04 Oct 2023 23:42:41 -0400 X-MC-Unique: fnbvjn0bNjCYSit5ZEMirg-1 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-30e4943ca7fso462436f8f.3 for ; Wed, 04 Oct 2023 20:42:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696477359; x=1697082159; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=g3XainUJVMKa+Hs4fQFDx+vYokCoMuU5n+RMYZYnWdU=; b=cQr1rDJbS2idipLLdBLxlEDMOVycleCiN85IrcQJxIsV1ZNtlBtUtlA+PfMmeKIFvg 9+g+WVWVY/CCFWxDtN1dwJ9zRZyXvcNoiQ4MBI31/mzlMpdXvMqWd0BFGV55J4kScSg7 40/obFxetS1B3CmNceBeDCTrWQocq2XF9B5+ce4zv45/aXAbROnqqn/AyeInwR7YJNiG rgLuj21ZpjgMmCf25yrQ4qo6eGbgmZGsZpqRCYzKXoMQk5I61dzwA16W9W8rvEVVkTzj eYz40/xkAhIaLlY7Bv4TBE8j1cxo9AyW+G/URdzHk4S2WQ5sdxnXoK6v5Mq/nv3cHS+o 5TWw== X-Gm-Message-State: AOJu0YxvBLVoTU/T219lZ1bSd6e39b/bkJ76T8a2Ym9dm1O1EPrahLp6 QzYLGJ01D0eN7/5GEwUedrECxe1w2GBSq9tX7B2O1SvkJOpiYA0ZJS6IOmMhCzEvA5rJ8feXQq8 UVithWhfooJOqXenM5hNrYRgE2MpM1sSUf5JPaAlct57Z9tE+Xh1ynIKjSYnd+v6S/B3h X-Received: by 2002:a5d:46cf:0:b0:31f:8e7c:6ebe with SMTP id g15-20020a5d46cf000000b0031f8e7c6ebemr3975115wrs.5.1696477359748; Wed, 04 Oct 2023 20:42:39 -0700 (PDT) X-Received: by 2002:a5d:46cf:0:b0:31f:8e7c:6ebe with SMTP id g15-20020a5d46cf000000b0031f8e7c6ebemr3975103wrs.5.1696477359540; Wed, 04 Oct 2023 20:42:39 -0700 (PDT) Received: from redhat.com ([2.52.137.96]) by smtp.gmail.com with ESMTPSA id v2-20020a5d4b02000000b00326028b4dd5sm621110wrq.113.2023.10.04.20.42.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 20:42:38 -0700 (PDT) Date: Wed, 4 Oct 2023 23:42:35 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Philippe =?utf-8?q?Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson Subject: [PULL v2 04/53] hw/virtio/vhost-vdpa: Inline TARGET_PAGE_ALIGN() macro Message-ID: <1dca36fb3d4f07354c9f6bc38b6e5c72fe1e9855.1696477105.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Use TARGET_PAGE_SIZE to calculate TARGET_PAGE_ALIGN (see the rationale in previous commits). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230710094931.84402-4-philmd@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/vhost-vdpa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 3ab0dc0b5b..0e0ed6d7ac 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -331,7 +331,7 @@ static void vhost_vdpa_listener_region_add(MemoryListener *listener, return; } - iova = TARGET_PAGE_ALIGN(section->offset_within_address_space); + iova = ROUND_UP(section->offset_within_address_space, TARGET_PAGE_SIZE); llend = vhost_vdpa_section_end(section, TARGET_PAGE_MASK); if (int128_ge(int128_make64(iova), llend)) { return; @@ -415,7 +415,7 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener, return; } - iova = TARGET_PAGE_ALIGN(section->offset_within_address_space); + iova = ROUND_UP(section->offset_within_address_space, TARGET_PAGE_SIZE); llend = vhost_vdpa_section_end(section, TARGET_PAGE_MASK); trace_vhost_vdpa_listener_region_del(v, iova,