From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3ED9F1A9B46 for ; Wed, 10 Dec 2025 09:00:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765357251; cv=none; b=KMdHBcxQO/8BB7CMaTuDdfBTPLKaKFFuJzu1JNVG2fjNbvTB588FOfieTBq5r/elY5Z/zMl20UqKbGnnBngm6AMfzxTqfeW0HjkSuQkkVWdJbeG7yklztlFwzkhxtghRyFvLtMoegxeBwHP6Ei/ph0gQV/yUf8Eb0ON9NhGM2GA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765357251; c=relaxed/simple; bh=d6Nei3NZn5zSxxP5ybHgwWaCmSFTgXzq/YIC7D8Y0Fc=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=uQFnfLyvvEfD9kymbv9zzvgMO+lHXkU36levRU5Hl1qG01aVRsE4O71PaUgZUSJ+dGsW9J13zfv7u4qmGz+O25kLc1ROBLO7+Hk7HF+NtIcw+0Uj5bKqsdvv6SMt2NzVtZtXEF9pPKHBYKM75hbxzidIEvDCRWTs5SLuXz4TTXY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=bP3TUAcQ; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=Ldcfq+2c; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bP3TUAcQ"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ldcfq+2c" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765357248; 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: in-reply-to:in-reply-to:references:references; bh=X6+jFRyVm6N+FtnOpG1GeL7ww+mTLR6QrTsDrnCLq0I=; b=bP3TUAcQ27y35qgYgiWzQHTimWjdHUfBqjQkEHuxMZ6YrDv3fErGy7Aq22JcRQR0134/wW E0NoLLKliQAe77mjQCSehXGpRc8uHfMFfRHHvdORevBM+d8GrjPH0s0MxN1Oui0Q1ixw42 rV36hMOOpmWURYaqEh6DS8tLRXTSjD8= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-299-W6-gccxcPwCL-Akhe4KRhA-1; Wed, 10 Dec 2025 04:00:46 -0500 X-MC-Unique: W6-gccxcPwCL-Akhe4KRhA-1 X-Mimecast-MFC-AGG-ID: W6-gccxcPwCL-Akhe4KRhA_1765357246 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-47904cdb9bbso5340665e9.1 for ; Wed, 10 Dec 2025 01:00:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1765357245; x=1765962045; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=X6+jFRyVm6N+FtnOpG1GeL7ww+mTLR6QrTsDrnCLq0I=; b=Ldcfq+2cvXzRQ/QlbWiftziE0s+QzSu09w2VUevEYpyVxpXCwENRbCb7Rn94ZGB7jD 5vasTGHp2vURMxloidCZNnz9+lg7BALrh0AOfAeq0HOSorBCdUGHjWY8cBm6DgLlAmjE r7M5U9WdBMmZiIOHYkgeMao86it5ZYOCRHtCAValjU7NkW8/GKwAeFsVgIacE5wi8SDU zqwZMO1akZwVqyy9kUd6R71/ObWux3qToKcR2G5avlZsWw68XjLuoxaqI9jhbx4flBBp SEYmIKzeq25eVVSljl1BQTogWYBFgxE42ic1+iL60kgX451uioz4Ro8jePaEHKn5AoTo PwTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765357245; x=1765962045; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X6+jFRyVm6N+FtnOpG1GeL7ww+mTLR6QrTsDrnCLq0I=; b=HxfL+gYD3Jgm3JgTgzMH1BRdCTE31IZaXoRH7Y9PmHZI2cz6rqznk62Mu+xiZ4jw8d Jlz3sxAe69g0IFvuJCICJA+mqftqpcJhnZwqmUNb/jLIRh1OpkJhJX46CmduVJHjJUAR 9z4aCWRpDogps41iPAmeYEGxJZvgssTaeB3I1tmqJUmr0WMbxQIQJbnTcgxvtgd6AQmy Bq1XTQSWzCfycGqIFWI63GtZ+qNhhx4yUausCVm3HhNhiiZOWoL6jZWlYwKI9jDULY9z yWiB8BL2ySFssxdaRVRXDUXLjITYvUTsNGrXx1GvEdfCG6j62ajEZU2RVXO2XWXVC3RP fa6w== X-Forwarded-Encrypted: i=1; AJvYcCWgxmNWonQF2rUgG8dumQES3FoL7czTFZadX6Mp+zA4jqMlg8LGHzaAIJRLKSOcZYIwKto2tQDAOpHOauc=@vger.kernel.org X-Gm-Message-State: AOJu0Yw+/zC9dU9kJGEx3og/yb+3wJAOUplJCX7LBa05CVdCu7wGLxts J5qkqEKDfLApCBvSiH9Er9vaTKrp3JkhO6E4GVmnfIcSeh2/eDyUY8TIQYtQZzF0SbIxbsboK0O 6QckoCvsRHU0c2RCYWIkzbkmJ96fVY2Df1zQWdLYXByaxh8ot64kq26of2vH0J5GNJH2I8VMzVw == X-Gm-Gg: ASbGncuxmI17HlKb3kmsPqN8beNPdb6TgnuqFA01uZgzNURT8tepKcQ9H0FMCfqKQMF PxY6+3zE0t5ajLH6BYya8q7TGbPYpxEVJVjrgPoVO4bZRWqgFw3pyrQHC2EG6do11VGOtTx2yp5 yepoP0+XuNt8Fo8+FLfj6Wvi3zuU6Vag2bOCMZeF+G2q4ZTh7h+xEkRMexx8pEwGpFmpZxD0bNW 2gjMTC9SSTyKggyq1ZpbogFN5PNoG8Ziu7cbDhsN98MI57uYPNuJ6fF290Wt0/TLknku0pTWnhY pR/ecHzFCJE1148yfW8Yumuk858xC4fTepc3KsgvjSxT2zYqwWqqxhios9E4h1/eZPM+4dwnkSH xNeaiYMJLLBnc8QgKJPwscQgSk+YuA9c= X-Received: by 2002:a05:600c:1796:b0:475:dadd:c474 with SMTP id 5b1f17b1804b1-47a7f94e5bdmr29121165e9.10.1765357244759; Wed, 10 Dec 2025 01:00:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IFPxx0KMRIRX8j3btiZinX+GID5lAN1DYAilF3S0rKhfOYQfGrXLaVuAUQ26OXUpi+8I8i2tw== X-Received: by 2002:a05:600c:1796:b0:475:dadd:c474 with SMTP id 5b1f17b1804b1-47a7f94e5bdmr29120815e9.10.1765357244045; Wed, 10 Dec 2025 01:00:44 -0800 (PST) Received: from redhat.com (IGLD-80-230-33-27.inter.net.il. [80.230.33.27]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47a7d3e6651sm36858485e9.7.2025.12.10.01.00.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Dec 2025 01:00:43 -0800 (PST) Date: Wed, 10 Dec 2025 04:00:40 -0500 From: "Michael S. Tsirkin" To: Yufeng Wang Cc: Jason Wang , Xuan Zhuo , Eugenio =?iso-8859-1?Q?P=E9rez?= , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, Yuedong Wang Subject: Re: [PATCH v2 2/2] tools: virtio: Fix no definition of dma_map_page_attrs Message-ID: <20251210035947-mutt-send-email-mst@kernel.org> References: <20251206032318.19084-1-r4o5m6e8o@163.com> <20251207142807.10808-1-r4o5m6e8o@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20251207142807.10808-1-r4o5m6e8o@163.com> On Sun, Dec 07, 2025 at 10:28:07PM +0800, Yufeng Wang wrote: > Fix tools/virtio compiler error, port over the definition > of dma_map_page_attrs, dma_unmap_page_attrs, dev_WARN_ONCE > > v2: remove do {} while (0). > > Fixes: 447beec8065b ("virtio_ring: switch to use dma_{map|unmap}_page()") > Signed-off-by: Yufeng Wang > Tested-by: Yuedong Wang Can you pls check whether https://lore.kernel.org/all/cover.1764873799.git.mst@redhat.com/ addresses the issues for you? Thanks! > --- > tools/virtio/linux/dma-mapping.h | 3 +++ > tools/virtio/linux/kernel.h | 1 + > 2 files changed, 4 insertions(+) > > diff --git a/tools/virtio/linux/dma-mapping.h b/tools/virtio/linux/dma-mapping.h > index 095958461788..de251a1f0c37 100644 > --- a/tools/virtio/linux/dma-mapping.h > +++ b/tools/virtio/linux/dma-mapping.h > @@ -22,6 +22,7 @@ enum dma_data_direction { > #define dma_free_coherent(d, s, p, h) kfree(p) > > #define dma_map_page(d, p, o, s, dir) (page_to_phys(p) + (o)) > +#define dma_map_page_attrs(d, p, o, s, dir, a) (page_to_phys(p) + (o)) > > #define dma_map_single(d, p, s, dir) (virt_to_phys(p)) > #define dma_map_single_attrs(d, p, s, dir, a) (virt_to_phys(p)) > @@ -29,6 +30,8 @@ enum dma_data_direction { > > #define dma_unmap_single(d, a, s, r) do { (void)(d); (void)(a); (void)(s); (void)(r); } while (0) > #define dma_unmap_page(d, a, s, r) do { (void)(d); (void)(a); (void)(s); (void)(r); } while (0) > +#define dma_unmap_page_attrs(d, a, s, r, t) \ > + do { (void)(d); (void)(a); (void)(s); (void)(r); (void)(t); } while (0) > > #define sg_dma_address(sg) (0) > #define sg_dma_len(sg) (0) > diff --git a/tools/virtio/linux/kernel.h b/tools/virtio/linux/kernel.h > index 6702008f7f5c..460df937ba9d 100644 > --- a/tools/virtio/linux/kernel.h > +++ b/tools/virtio/linux/kernel.h > @@ -134,6 +134,7 @@ static inline void *krealloc_array(void *p, size_t new_n, size_t new_size, gfp_t > #define dev_err(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__) > #define dev_warn(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__) > #define dev_warn_once(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__) > +#define dev_WARN_ONCE(dev, condition, format, ...) fprintf(stderr, format, ## __VA_ARGS__) > > #define min(x, y) ({ \ > typeof(x) _min1 = (x); \ > -- > 2.43.0