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 AFA425B03B for ; Mon, 26 Feb 2024 12:00:13 +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=1708948815; cv=none; b=N/zVr95Puwxn39QJCd4uPDK9f1cqg71atNnFJB9rRK2vxYEFA0+7vEdtA3v/lATlrvGLBFmY2mRDVs06hTe2oiOY6VLow+Rfh7ODoBFc8BwMRH0wm9efqCdhY2WESAN2OjUpKGpbFWL//8ipmPJxCuDgtUJwo+Qq1myWkgfH8jU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708948815; c=relaxed/simple; bh=pjNzbkOmN0UWtyHtWpLLF6iInNORpUbY6nj18t42N/Y=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: In-Reply-To:Content-Type:Content-Disposition; b=ldeRUsvGc3JJE+/oTCBqiAziKNYwlbd+QKLqxvyOhtA418RehLc2qjPuqXyqLByR8ieCCNcMpHfAnVnN9TL2pIrjjWey1PfpsJfSODBJHp9BMQq6NVCjmGZ55tpdLgixxu2nKrcplZc94N4owy8iLKqmaOIoP6d9aPoPEyapuF0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none 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=Zx/sZqPF; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none 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="Zx/sZqPF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708948812; 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=Mz7Cq6dJRH8shpvnC5HLLhRX+4EqkZZgPrO18fQGEZc=; b=Zx/sZqPFBfnAJKlaxzVV3a+jVK1HWShwl9xp5C2LInx/hq2u+3AK+e88KWTfUYrqsmIADV OmCELuEEvld60DwdEMi3HEjRWm/eela1EjryPE34ahrKK6RgJWoS7abhVlpKKZyeB8CEWe ck3njTmOllXr2DdjZjwuMl1U0fNX/04= Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-493-BVP-OiMhN7iAdRBUx3dz4g-1; Mon, 26 Feb 2024 07:00:11 -0500 X-MC-Unique: BVP-OiMhN7iAdRBUx3dz4g-1 Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2d22e40a544so21740261fa.0 for ; Mon, 26 Feb 2024 04:00:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708948810; x=1709553610; h=in-reply-to: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=Mz7Cq6dJRH8shpvnC5HLLhRX+4EqkZZgPrO18fQGEZc=; b=rhmX9/IciBn8h/QoulY8eWg91ec61a+cJIj3oB0glVx/ezwaTZ5/LUpe6V40wrO9Ky NLYBf+HGiV3c6KJSDcTYuS+YqGEq8IwvwUo6BVAkkZEwoeRYr/iInz4SZQJN+B+BbfWy DhLUrITqpimPCjXaxOZ9APTgNLELjz0d1jH1vYdsc4C+tYyFo9zklSuLLwIeIEGmuwY/ yR7/KrQIA4XE+WLY+neb5TWr/ml7p/xqV7RfVvokBTIOqtMEO3jnXp/lZiTQ/R8cRN3P WyxRTovS/tqoOwBfW0xmf1VDQ3tcTCpEwY/jaGiGjr1TEXf0LP3PuXWZg6Mv4zYUm0nv /KaQ== X-Gm-Message-State: AOJu0YxeOs3My3J4hgaMISo6KViwd075OtLdHDnLmj17znMidJMfP9qj NlKpir0EiR8cM+bgJo8ljh7fqa0dxTpbpW9Z99zuoE6pVDANpVRUkkfRKCWljRH3EXhZJap8DeF z2qeJrgW7sfH/x3A99BJ0x1IsYwT0Uuun8R1RZYZHoyTlB6S7quLAczP9uoNDTLy3 X-Received: by 2002:a2e:a586:0:b0:2d2:7e19:f6 with SMTP id m6-20020a2ea586000000b002d27e1900f6mr4110591ljp.23.1708948809796; Mon, 26 Feb 2024 04:00:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IES2kLJ5EpWh+oa9YFSDHfjgZqQnU6trIQBgPJzwW1phiNRBVxn9PqiDtIIlyFRZQ/czWnD8g== X-Received: by 2002:a2e:a586:0:b0:2d2:7e19:f6 with SMTP id m6-20020a2ea586000000b002d27e1900f6mr4110551ljp.23.1708948809417; Mon, 26 Feb 2024 04:00:09 -0800 (PST) Received: from redhat.com ([109.253.193.52]) by smtp.gmail.com with ESMTPSA id p15-20020a05600c1d8f00b00412a94a04besm333317wms.29.2024.02.26.04.00.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 04:00:08 -0800 (PST) Date: Mon, 26 Feb 2024 07:00:01 -0500 From: "Michael S. Tsirkin" To: Xuan Zhuo Cc: virtualization@lists.linux.dev, Richard Weinberger , Anton Ivanov , Johannes Berg , Jason Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Hans de Goede , Ilpo =?iso-8859-1?Q?J=E4rvinen?= , Vadim Pasternak , Bjorn Andersson , Mathieu Poirier , Cornelia Huck , Halil Pasic , Eric Farman , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , linux-um@lists.infradead.org, netdev@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org, bpf@vger.kernel.org Subject: Re: [PATCH vhost v2 19/19] virtio_net: sq support premapped mode Message-ID: <20240226065746-mutt-send-email-mst@kernel.org> References: <20240223082726.52915-1-xuanzhuo@linux.alibaba.com> <20240223082726.52915-20-xuanzhuo@linux.alibaba.com> <20240225032330-mutt-send-email-mst@kernel.org> <1708939451.7601678-3-xuanzhuo@linux.alibaba.com> <20240226063843-mutt-send-email-mst@kernel.org> <1708947680.4503584-3-xuanzhuo@linux.alibaba.com> Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <1708947680.4503584-3-xuanzhuo@linux.alibaba.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Feb 26, 2024 at 07:41:20PM +0800, Xuan Zhuo wrote: > On Mon, 26 Feb 2024 06:39:51 -0500, "Michael S. Tsirkin" wrote: > > On Mon, Feb 26, 2024 at 05:24:11PM +0800, Xuan Zhuo wrote: > > > On Sun, 25 Feb 2024 03:38:48 -0500, "Michael S. Tsirkin" wrote: > > > > On Fri, Feb 23, 2024 at 04:27:26PM +0800, Xuan Zhuo wrote: > > > > > If the xsk is enabling, the xsk tx will share the send queue. > > > > > But the xsk requires that the send queue use the premapped mode. > > > > > So the send queue must support premapped mode. > > > > > > > > > > cmd: > > > > > sh samples/pktgen/pktgen_sample01_simple.sh -i eth0 \ > > > > > -s 16 -d 10.0.0.128 -m 00:16:3e:2c:c8:2e -n 0 -p 100 > > > > > CPU: > > > > > Intel(R) Xeon(R) Platinum 8369B CPU @ 2.70GHz > > > > > > > > > > Machine: > > > > > ecs.g7.2xlarge(Aliyun) > > > > > > > > > > before: 1600010.00 > > > > > after(no-premapped): 1599966.00 > > > > > after(premapped): 1600014.00 > > > > > > > > > > Signed-off-by: Xuan Zhuo > > > > > --- > > > > > drivers/net/virtio_net.c | 136 +++++++++++++++++++++++++++++++++++++-- > > > > > 1 file changed, 132 insertions(+), 4 deletions(-) > > > > > > > > > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > > > > > index 7715bb7032ec..b83ef6afc4fb 100644 > > > > > --- a/drivers/net/virtio_net.c > > > > > +++ b/drivers/net/virtio_net.c > > > > > @@ -146,6 +146,25 @@ struct virtnet_rq_dma { > > > > > u16 need_sync; > > > > > }; > > > > > > > > > > +struct virtnet_sq_dma { > > > > > + union { > > > > > + struct virtnet_sq_dma *next; > > > > > + void *data; > > > > > + }; > > > > > + > > > > > + u32 num; > > > > > + > > > > > + dma_addr_t addr[MAX_SKB_FRAGS + 2]; > > > > > + u32 len[MAX_SKB_FRAGS + 2]; > > > > > +}; > > > > > + > > > > > +struct virtnet_sq_dma_head { > > > > > + /* record for kfree */ > > > > > + void *p; > > > > > + > > > > > + struct virtnet_sq_dma *free; > > > > > +}; > > > > > + > > > > > /* Internal representation of a send virtqueue */ > > > > > struct send_queue { > > > > > /* Virtqueue associated with this send _queue */ > > > > > @@ -165,6 +184,8 @@ struct send_queue { > > > > > > > > > > /* Record whether sq is in reset state. */ > > > > > bool reset; > > > > > + > > > > > + struct virtnet_sq_dma_head dmainfo; > > > > > }; > > > > > > > > > > /* Internal representation of a receive virtqueue */ > > > > > @@ -368,6 +389,95 @@ static struct xdp_frame *ptr_to_xdp(void *ptr) > > > > > return (struct xdp_frame *)((unsigned long)ptr & ~VIRTIO_XDP_FLAG); > > > > > } > > > > > > > > > > +static struct virtnet_sq_dma *virtnet_sq_unmap(struct send_queue *sq, void **data) > > > > > +{ > > > > > + struct virtnet_sq_dma *d; > > > > > + int i; > > > > > + > > > > > + d = *data; > > > > > + *data = d->data; > > > > > + > > > > > + for (i = 0; i < d->num; ++i) > > > > > + virtqueue_dma_unmap_page_attrs(sq->vq, d->addr[i], d->len[i], > > > > > + DMA_TO_DEVICE, 0); > > > > > + > > > > > + d->next = sq->dmainfo.free; > > > > > + sq->dmainfo.free = d; > > > > > + > > > > > + return d; > > > > > +} > > > > > + > > > > > +static struct virtnet_sq_dma *virtnet_sq_map_sg(struct send_queue *sq, > > > > > + int nents, void *data) > > > > > +{ > > > > > + struct virtnet_sq_dma *d; > > > > > + struct scatterlist *sg; > > > > > + int i; > > > > > + > > > > > + if (!sq->dmainfo.free) > > > > > + return NULL; > > > > > + > > > > > + d = sq->dmainfo.free; > > > > > + sq->dmainfo.free = d->next; > > > > > + > > > > > + for_each_sg(sq->sg, sg, nents, i) { > > > > > + if (virtqueue_dma_map_sg_attrs(sq->vq, sg, DMA_TO_DEVICE, 0)) > > > > > + goto err; > > > > > + > > > > > + d->addr[i] = sg->dma_address; > > > > > + d->len[i] = sg->length; > > > > > + } > > > > > + > > > > > + d->data = data; > > > > > + d->num = i; > > > > > + return d; > > > > > + > > > > > +err: > > > > > + d->num = i; > > > > > + virtnet_sq_unmap(sq, (void **)&d); > > > > > + return NULL; > > > > > +} > > > > > > > > > > > > Do I see a reimplementation of linux/llist.h here? > > > > > > > > > > > > > + > > > > > +static int virtnet_add_outbuf(struct send_queue *sq, u32 num, void *data) > > > > > +{ > > > > > + int ret; > > > > > + > > > > > + if (sq->vq->premapped) { > > > > > + data = virtnet_sq_map_sg(sq, num, data); > > > > > + if (!data) > > > > > + return -ENOMEM; > > > > > + } > > > > > + > > > > > + ret = virtqueue_add_outbuf(sq->vq, sq->sg, num, data, GFP_ATOMIC); > > > > > + if (ret && sq->vq->premapped) > > > > > + virtnet_sq_unmap(sq, &data); > > > > > + > > > > > + return ret; > > > > > +} > > > > > + > > > > > +static int virtnet_sq_init_dma_mate(struct send_queue *sq) > > > > > > > > Mate? The popular south african drink? > > > > > > > > > +{ > > > > > + struct virtnet_sq_dma *d; > > > > > + int num, i; > > > > > + > > > > > + num = virtqueue_get_vring_size(sq->vq); > > > > > + > > > > > + sq->dmainfo.free = kcalloc(num, sizeof(*sq->dmainfo.free), GFP_KERNEL); > > > > > + if (!sq->dmainfo.free) > > > > > + return -ENOMEM; > > > > > > > > > > > > This could be quite a bit of memory for a large queue. And for a bunch > > > > of common cases where unmap is a nop (e.g. iommu pt) this does nothing > > > > useful at all. And also, this does nothing useful if PLATFORM_ACCESS is off > > > > which is super common. > > > > > > > > A while ago I proposed: > > > > - extend DMA APIs so one can query whether unmap is a nop > > > > > > > > > We may have trouble for this. > > > > > > dma_addr_t dma_map_page_attrs(struct device *dev, struct page *page, > > > size_t offset, size_t size, enum dma_data_direction dir, > > > unsigned long attrs) > > > { > > > const struct dma_map_ops *ops = get_dma_ops(dev); > > > dma_addr_t addr; > > > > > > BUG_ON(!valid_dma_direction(dir)); > > > > > > if (WARN_ON_ONCE(!dev->dma_mask)) > > > return DMA_MAPPING_ERROR; > > > > > > if (dma_map_direct(dev, ops) || > > > arch_dma_map_page_direct(dev, page_to_phys(page) + offset + size)) > > > addr = dma_direct_map_page(dev, page, offset, size, dir, attrs); > > > else > > > addr = ops->map_page(dev, page, offset, size, dir, attrs); > > > kmsan_handle_dma(page, offset, size, dir); > > > debug_dma_map_page(dev, page, offset, size, dir, addr, attrs); > > > > > > return addr; > > > } > > > > > > arch_dma_map_page_direct will check the dma address. > > > So we can not judge by the API in advance. > > > > > > Thanks. > > > > So if dma_map_direct is false we'll still waste some memory. > > So be it. > > arch_dma_map_page_direct default is marco (false), just for powerpc > it is a function. So I think we can skip it. > > If the dma_map_direct is false, I think should save the dma info. > > Thanks. Would already be an improvement. But can we have better names? I'd prefer: dma_can_skip_unmap dma_can_skip_sync Because we do not know for sure if it's direct unless we have the page. -- MST