From patchwork Fri Sep 6 09:52:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 13793835 X-Patchwork-Delegate: kuba@kernel.org 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 5E76D1CB147 for ; Fri, 6 Sep 2024 09:52:44 +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=1725616365; cv=none; b=lbnTIfsp/SDqtSKPDEECP/eb+kbT74N206NqEJvVwjhAIIBwYDnXq9nJixHwcTW5EVnh1iVc8oh9sr0DOIn9aeLSUha22c0byXS8kdvyZ3RaSFdjl41oICCqo9j25rALmJ2gZgjFGicYuXExyUOI5Bv2CCkUZrBY/zQxB3/MP8Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725616365; c=relaxed/simple; bh=fnNO00Sl3L0ct2dB2f93woTB2J1hByHs/OImvIYoPQo=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=kvTyi+udxGFab5+oD9/czNBnTrSzo2pbxqP2yJr91ce+i3tlNnRlTLmSqse6jijtlQDy4c5fmRiMBYjM7zEwYsHWDfWQibRIqfM1Sqtsyq0qma4QofQqxBj2l+hAHt6wN2+Tyw+mzHwbu98zJUWoOrY2wyLuxTXr1eM/qiQ/nLg= 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=THxcTmHK; 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="THxcTmHK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725616363; 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=SiA0MhlHaW5Sr2cHC/L9B039T74TheX16DO6mIEzrLM=; b=THxcTmHKbr9oGQ3HkSbhP+dUZnp9BgQjaHTNrwWs6JJsBy3w1tAyiHypEo3ow+EKrNTyj2 QTALXRRpA+rMxaCdSdCNT4v9cHxkvpzgApR26++zBnz4knkXz6RpsdsWfot1nRORYfSMaf UufLOrKfI9qn/6B3nQhf0JymfH0Rbqs= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-83-wT6qDiX2OGuvDWuCKbE4_A-1; Fri, 06 Sep 2024 05:52:42 -0400 X-MC-Unique: wT6qDiX2OGuvDWuCKbE4_A-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-42bac946976so14618925e9.2 for ; Fri, 06 Sep 2024 02:52:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725616360; x=1726221160; 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=SiA0MhlHaW5Sr2cHC/L9B039T74TheX16DO6mIEzrLM=; b=g3navbU6zNCediKIqJqmG07JOTW95sI6JOzfrlUE2UoTWEvP+mIXXwre06ZVNYCRRq 1+rQBX/4O/3a1HI/TzVwJI9p0IGKkSc22H1tXDPoAGJUNf/ou00Ji1YvLfOMzKtLtaKv Ax5VLG3uCi9hEnySZ7yOUXTu/v4i/V5kg6feIbsnXCWbW+gXVbvOScjP616fpGcW/Nzh gban4kD+8PgSh8wUgsYcAW0JUR09eQoOaU0kUFux/xZZowh7vFwcuW5wCcJgnz0wNETc lR27QmHoXW8FtQP325R2xSe3mPyLdUFHXoM/gO0h/GvyM6WGVS93KMrYHPHZ5nTzJx8P vEzQ== X-Forwarded-Encrypted: i=1; AJvYcCVwRV7kjkx6BI9UhGxUvCF8ygnDqUy4YhKG/29Fnb1+nxjxzNFhemC5HV+tZQ7F5C5RDOBhVTw=@vger.kernel.org X-Gm-Message-State: AOJu0YyK49FiGyGbi1ckVxa2QSFvGCyLjXyrn/QXdu3s6JlPhomwlcF9 mhevAcvlDMepWee976+A5YrumO4QaxqT8QSkc9iYPgrlalXcfCr7wQ+fnp2FVYTdEkW1VNVWcTG 09JRNx6Xg3Fh4EB4OjOpkia27LMOoVKA6GmdF53KIYdTQTr4B4PdDTDGFki8G/k6n X-Received: by 2002:a05:6000:785:b0:378:80c8:57a with SMTP id ffacd0b85a97d-37880c807bdmr4669431f8f.9.1725616360522; Fri, 06 Sep 2024 02:52:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEDAqymEkxUqG9asen2sDEFG8aZbMqUOUYx8yF9vb6IyZR1cQeui5rUo3L6/Clt8B1jcSujSA== X-Received: by 2002:a05:6000:785:b0:378:80c8:57a with SMTP id ffacd0b85a97d-37880c807bdmr4669393f8f.9.1725616359931; Fri, 06 Sep 2024 02:52:39 -0700 (PDT) Received: from redhat.com ([155.133.17.165]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42ca2cfc296sm9182305e9.36.2024.09.06.02.52.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2024 02:52:39 -0700 (PDT) Date: Fri, 6 Sep 2024 05:52:36 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Xuan Zhuo , Jason Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , virtualization@lists.linux.dev, Si-Wei Liu , Darren Kenny , Boris Ostrovsky , Eugenio =?utf-8?b?UMOpcmV6?= Subject: [RFC PATCH v2 5/7] Revert "virtio_net: rx remove premapped failover code" Message-ID: <69d3032b6560323844d6d9fb0ac4f832ed87f13d.1725616135.git.mst@redhat.com> References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent X-Patchwork-Delegate: kuba@kernel.org X-Patchwork-State: RFC This reverts commit defd28aa5acb0fd7c15adc6bc40a8ac277d04dea. leads to crashes with no ACCESS_PLATFORM when sysctl net.core.high_order_alloc_disable=1 Cc: Xuan Zhuo Reported-by: Si-Wei Liu 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 0944430dfb1f..0a2ec9570521 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 @@ -867,7 +870,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; @@ -880,6 +883,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; @@ -905,42 +913,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); @@ -957,9 +967,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) @@ -2107,7 +2120,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)); } @@ -2221,7 +2235,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)); } @@ -5392,7 +5407,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); }