From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BCCFC433DF for ; Mon, 12 Oct 2020 12:54:40 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E889C21BE5 for ; Mon, 12 Oct 2020 12:54:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="jGEv3F24" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E889C21BE5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 8E88894000D; Mon, 12 Oct 2020 08:54:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8705694000C; Mon, 12 Oct 2020 08:54:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6EA9794000D; Mon, 12 Oct 2020 08:54:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0189.hostedemail.com [216.40.44.189]) by kanga.kvack.org (Postfix) with ESMTP id 3A32894000C for ; Mon, 12 Oct 2020 08:54:39 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id D2F458249980 for ; Mon, 12 Oct 2020 12:54:38 +0000 (UTC) X-FDA: 77363267436.30.drain54_0903bb6271fa Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id B0EE1180B3AA7 for ; Mon, 12 Oct 2020 12:54:38 +0000 (UTC) X-HE-Tag: drain54_0903bb6271fa X-Filterd-Recvd-Size: 3576 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf12.hostedemail.com (Postfix) with ESMTP for ; Mon, 12 Oct 2020 12:54:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602507277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x476fsOPtDKoPzdDWx2OPPtKsSqlx/nZAGKrnlXmEL8=; b=jGEv3F24F7KHbFNr6bKOeWSXf61hvF7R7QIMbQ8RKMokxFxGTcJTvLgHgq2IxjWlEWhDk2 KurrHrJo7MeBTP33bwfuKYZZy6LZsZ0ilKVk9AyTNwCZsBTP3hCA0l2xJmX7kDwPpCfS52 tD15+Roh9fHN4xBos3LHyh/qCadfWKk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-587-8V6AV1PQPDGtM5KwMzCx3Q-1; Mon, 12 Oct 2020 08:54:34 -0400 X-MC-Unique: 8V6AV1PQPDGtM5KwMzCx3Q-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AEC8080B713; Mon, 12 Oct 2020 12:54:32 +0000 (UTC) Received: from t480s.redhat.com (ovpn-113-251.ams2.redhat.com [10.36.113.251]) by smtp.corp.redhat.com (Postfix) with ESMTP id D6A2360C07; Mon, 12 Oct 2020 12:54:30 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, virtualization@lists.linux-foundation.org, Andrew Morton , "Michael S . Tsirkin" , David Hildenbrand , Jason Wang , Pankaj Gupta Subject: [PATCH v1 07/29] virtio-mem: generalize virtio_mem_overlaps_range() Date: Mon, 12 Oct 2020 14:53:01 +0200 Message-Id: <20201012125323.17509-8-david@redhat.com> In-Reply-To: <20201012125323.17509-1-david@redhat.com> References: <20201012125323.17509-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Avoid using memory block ids. While at it, use uint64_t for address/size. Cc: "Michael S. Tsirkin" Cc: Jason Wang Cc: Pankaj Gupta Signed-off-by: David Hildenbrand --- drivers/virtio/virtio_mem.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index 821143db14fe..37a0e338ae4a 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -489,14 +489,10 @@ static int virtio_mem_translate_node_id(struct virt= io_mem *vm, uint16_t node_id) * Test if a virtio-mem device overlaps with the given range. Can be cal= led * from (notifier) callbacks lockless. */ -static bool virtio_mem_overlaps_range(struct virtio_mem *vm, - unsigned long start, unsigned long size) +static bool virtio_mem_overlaps_range(struct virtio_mem *vm, uint64_t st= art, + uint64_t size) { - unsigned long dev_start =3D virtio_mem_mb_id_to_phys(vm->first_mb_id); - unsigned long dev_end =3D virtio_mem_mb_id_to_phys(vm->last_mb_id) + - memory_block_size_bytes(); - - return start < dev_end && dev_start < start + size; + return start < vm->addr + vm->region_size && vm->addr < start + size; } =20 /* --=20 2.26.2