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 3A4D114C59B for ; Sun, 8 Sep 2024 10:48:06 +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=1725792488; cv=none; b=j8PVEsIlhvccZygNqdcZ4vpfh64ZU9UZWTuUPBkw5BUdG5g+Kh7qQXj2hgYthN/Au2HLm00szgZ3dHsugdKjS5Mr+EK8Jag9+v9AJF8CPOBkIk5/dnSHWHb1Z+g4MdbVZX8hPaZTdVzEYHw3zUB2e3vS/hLJc/OX8Ludwq7BbIw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725792488; c=relaxed/simple; bh=4u/BMOcDccyUyOPthirmKTbAVPKYeZC4p+svxp9M+Ak=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=fuDX0uO7NbBF4FlJYZ1/1fmQsBvn4vbON8QABZV9n4R8Yjbn99ws+rgxKqxagFR0q/cNv2UQRUVU6xk/ORWsHK6qBfWVJBP0ukHldkonHOnXmsBuOGpe4DUVHBxYfqScbZ9mx/MLQNnBl9QTEPZ6dERY5IOgYIbtLVORP1+/GiI= 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=iLL+gxvE; 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="iLL+gxvE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725792485; 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=i1aqoQcu5QjkkF8FRma0LxNF5TpHRHrEBWMC+woi8Fc=; b=iLL+gxvEhMs5vb676JKU/G2htbfLiC1xFo+YNZ9PSIsBH0lFQLfoAo8+v5Z+NFPNVa2KVv KPCCs9VUP2fz9PZFhtq9nZiAL8QmlhWTHmad63MxdRjgplfw8nfkSnl300BnmYH08dHaFg Ca9s4dsdln8/qM6actD1E2YKtQ84Ucs= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-479-Ci2U0PRJO7eopMIFjGYVrg-1; Sun, 08 Sep 2024 06:48:04 -0400 X-MC-Unique: Ci2U0PRJO7eopMIFjGYVrg-1 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-5becd2ca7e7so4478258a12.1 for ; Sun, 08 Sep 2024 03:48:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725792483; x=1726397283; 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=i1aqoQcu5QjkkF8FRma0LxNF5TpHRHrEBWMC+woi8Fc=; b=fLC81eEOC51azHdNX3hLM1ORojfmoWkYMuccQcrAZvVZzF0JempIvUs/N97BvKH9aj 2AJfz2O4nwgaJWB7O+HCrRYzpM65ASYirG7IFwLjAdkvkx1yE1tkXrwUT2GUa4OvNhEN yg4hBCpElMlVrHtPqggqZDH1LMEdJkBedusloTKbySNIHfObvLRMWIRBr1TPJ1PYwo+U yLSVzC8DDHyCLGysQE7PvR23OoKdvLKk93HfWrQ0G5TQ2rq3529fJhfIMyhiV7wKLbBV RH7d3g0jJzfGnWmEvSc0FR/nALqPUInKlarX+hqq5KRijeb2pnhyTByPXGPe8VyVjT1X sFsQ== X-Forwarded-Encrypted: i=1; AJvYcCX45WmVLXIphDleULeG1jVOjrDVrNXj1R6qISyg0IgvmTEd+lLgp5C//hyPZuTCIo3ZN1RgoFc=@vger.kernel.org X-Gm-Message-State: AOJu0YzadjcLQdQ1A2GxqHnvgyfuSqC9bTkzPcGf6G+b2/imjMRPzbgW IxYrhEoT7PgX0Nml3E1/yzi0csif6fdz3SvFoe6NiwHLreUYd1Mu3q5gAgKbUND6enaZz0tnDj2 PUJj7iiMo1XQe2mfc8a77e5g4ePZmKUS43uPCQlT+jsK6Lm74pV9LaQ== X-Received: by 2002:a05:6402:50d4:b0:5c2:e888:4cf4 with SMTP id 4fb4d7f45d1cf-5c3b291c3b5mr15324823a12.0.1725792483384; Sun, 08 Sep 2024 03:48:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFLXUTlnzlooSWy+K5xVuihtz3ewF2aX1nU5LKkFkKXiqkQNUY0OxKwgyhYlKKWEIx53TTKjA== X-Received: by 2002:a05:6402:50d4:b0:5c2:e888:4cf4 with SMTP id 4fb4d7f45d1cf-5c3b291c3b5mr15324762a12.0.1725792482281; Sun, 08 Sep 2024 03:48:02 -0700 (PDT) Received: from redhat.com ([2a02:14f:1ed:17aa:6194:fdaa:53cf:2b5f]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c3ebd76ee5sm1720538a12.71.2024.09.08.03.47.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Sep 2024 03:48:01 -0700 (PDT) Date: Sun, 8 Sep 2024 06:47:57 -0400 From: "Michael S. Tsirkin" To: Darren Kenny Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Xuan Zhuo , Jason Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , virtualization@lists.linux.dev, Boris Ostrovsky , Si-Wei Liu , Eugenio =?iso-8859-1?Q?P=E9rez?= Subject: Re: [PATCH RFC 1/3] Revert "virtio_net: rx remove premapped failover code" Message-ID: <20240908064724-mutt-send-email-mst@kernel.org> References: <7774ac707743ad8ce3afeacbd4bee63ac96dd927.1723617902.git.mst@redhat.com> Precedence: bulk X-Mailing-List: netdev@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: Could you pls repeat this testing for v2? I had to revert more patches for that one. On Wed, Aug 14, 2024 at 04:19:06PM +0100, Darren Kenny wrote: > Hi Michael, > > I've tested this on the system that was reproducing the panic, and it > everything is working now as expected. > > For the series then: > > Tested-by: Darren Kenny > > Thanks, > > Darren. > > On Wednesday, 2024-08-14 at 02:59:20 -04, Michael S. Tsirkin wrote: > > This reverts commit defd28aa5acb0fd7c15adc6bc40a8ac277d04dea. > > > > leads to crashes with no ACCESS_PLATFORM when > > sysctl net.core.high_order_alloc_disable=1 > > > > Reported-by: Si-Wei Liu > > Message-ID: <8b20cc28-45a9-4643-8e87-ba164a540c0a@oracle.com> > > Signed-off-by: Michael S. Tsirkin > > --- > > drivers/net/virtio_net.c | 89 +++++++++++++++++++++++----------------- > > 1 file changed, 52 insertions(+), 37 deletions(-) > > > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > > index fd3d7e926022..4f7e686b8bf9 100644 > > --- a/drivers/net/virtio_net.c > > +++ b/drivers/net/virtio_net.c > > @@ -348,6 +348,9 @@ struct receive_queue { > > > > /* Record the last dma info to free after new pages is allocated. */ > > struct virtnet_rq_dma *last_dma; > > + > > + /* Do dma by self */ > > + bool do_dma; > > }; > > > > /* This structure can contain rss message with maximum settings for indirection table and keysize > > @@ -848,7 +851,7 @@ static void *virtnet_rq_get_buf(struct receive_queue *rq, u32 *len, void **ctx) > > void *buf; > > > > buf = virtqueue_get_buf_ctx(rq->vq, len, ctx); > > - if (buf) > > + if (buf && rq->do_dma) > > virtnet_rq_unmap(rq, buf, *len); > > > > return buf; > > @@ -861,6 +864,11 @@ static void virtnet_rq_init_one_sg(struct receive_queue *rq, void *buf, u32 len) > > u32 offset; > > void *head; > > > > + if (!rq->do_dma) { > > + sg_init_one(rq->sg, buf, len); > > + return; > > + } > > + > > head = page_address(rq->alloc_frag.page); > > > > offset = buf - head; > > @@ -886,42 +894,44 @@ static void *virtnet_rq_alloc(struct receive_queue *rq, u32 size, gfp_t gfp) > > > > head = page_address(alloc_frag->page); > > > > - dma = head; > > + if (rq->do_dma) { > > + dma = head; > > > > - /* new pages */ > > - if (!alloc_frag->offset) { > > - if (rq->last_dma) { > > - /* Now, the new page is allocated, the last dma > > - * will not be used. So the dma can be unmapped > > - * if the ref is 0. > > + /* new pages */ > > + if (!alloc_frag->offset) { > > + if (rq->last_dma) { > > + /* Now, the new page is allocated, the last dma > > + * will not be used. So the dma can be unmapped > > + * if the ref is 0. > > + */ > > + virtnet_rq_unmap(rq, rq->last_dma, 0); > > + rq->last_dma = NULL; > > + } > > + > > + dma->len = alloc_frag->size - sizeof(*dma); > > + > > + addr = virtqueue_dma_map_single_attrs(rq->vq, dma + 1, > > + dma->len, DMA_FROM_DEVICE, 0); > > + if (virtqueue_dma_mapping_error(rq->vq, addr)) > > + return NULL; > > + > > + dma->addr = addr; > > + dma->need_sync = virtqueue_dma_need_sync(rq->vq, addr); > > + > > + /* Add a reference to dma to prevent the entire dma from > > + * being released during error handling. This reference > > + * will be freed after the pages are no longer used. > > */ > > - virtnet_rq_unmap(rq, rq->last_dma, 0); > > - rq->last_dma = NULL; > > + get_page(alloc_frag->page); > > + dma->ref = 1; > > + alloc_frag->offset = sizeof(*dma); > > + > > + rq->last_dma = dma; > > } > > > > - dma->len = alloc_frag->size - sizeof(*dma); > > - > > - addr = virtqueue_dma_map_single_attrs(rq->vq, dma + 1, > > - dma->len, DMA_FROM_DEVICE, 0); > > - if (virtqueue_dma_mapping_error(rq->vq, addr)) > > - return NULL; > > - > > - dma->addr = addr; > > - dma->need_sync = virtqueue_dma_need_sync(rq->vq, addr); > > - > > - /* Add a reference to dma to prevent the entire dma from > > - * being released during error handling. This reference > > - * will be freed after the pages are no longer used. > > - */ > > - get_page(alloc_frag->page); > > - dma->ref = 1; > > - alloc_frag->offset = sizeof(*dma); > > - > > - rq->last_dma = dma; > > + ++dma->ref; > > } > > > > - ++dma->ref; > > - > > buf = head + alloc_frag->offset; > > > > get_page(alloc_frag->page); > > @@ -938,9 +948,12 @@ static void virtnet_rq_set_premapped(struct virtnet_info *vi) > > if (!vi->mergeable_rx_bufs && vi->big_packets) > > return; > > > > - for (i = 0; i < vi->max_queue_pairs; i++) > > - /* error should never happen */ > > - BUG_ON(virtqueue_set_dma_premapped(vi->rq[i].vq)); > > + for (i = 0; i < vi->max_queue_pairs; i++) { > > + if (virtqueue_set_dma_premapped(vi->rq[i].vq)) > > + continue; > > + > > + vi->rq[i].do_dma = true; > > + } > > } > > > > static void virtnet_rq_unmap_free_buf(struct virtqueue *vq, void *buf) > > @@ -2036,7 +2049,8 @@ static int add_recvbuf_small(struct virtnet_info *vi, struct receive_queue *rq, > > > > err = virtqueue_add_inbuf_ctx(rq->vq, rq->sg, 1, buf, ctx, gfp); > > if (err < 0) { > > - virtnet_rq_unmap(rq, buf, 0); > > + if (rq->do_dma) > > + virtnet_rq_unmap(rq, buf, 0); > > put_page(virt_to_head_page(buf)); > > } > > > > @@ -2150,7 +2164,8 @@ static int add_recvbuf_mergeable(struct virtnet_info *vi, > > ctx = mergeable_len_to_ctx(len + room, headroom); > > err = virtqueue_add_inbuf_ctx(rq->vq, rq->sg, 1, buf, ctx, gfp); > > if (err < 0) { > > - virtnet_rq_unmap(rq, buf, 0); > > + if (rq->do_dma) > > + virtnet_rq_unmap(rq, buf, 0); > > put_page(virt_to_head_page(buf)); > > } > > > > @@ -5231,7 +5246,7 @@ static void free_receive_page_frags(struct virtnet_info *vi) > > int i; > > for (i = 0; i < vi->max_queue_pairs; i++) > > if (vi->rq[i].alloc_frag.page) { > > - if (vi->rq[i].last_dma) > > + if (vi->rq[i].do_dma && vi->rq[i].last_dma) > > virtnet_rq_unmap(&vi->rq[i], vi->rq[i].last_dma, 0); > > put_page(vi->rq[i].alloc_frag.page); > > } > > -- > > MST