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.133.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 057831CB32E for ; Fri, 6 Sep 2024 09:52:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725616374; cv=none; b=lhZCl2eXiXmNH/Nr+bxxbi8Zd+mEQOQTy8HhXhhmHY4N8BkxH5x6ijDlH/hUmdnJ9aF7sbDrKni/TfgBXLtxEVT8GEjoy22YJYoaG2DeNb1OZx9/rj1i63xv1VR+KG8IBgWkT8anqsuCyYviTiUy215J8m2fRBGwInsho31cb9c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725616374; c=relaxed/simple; bh=G0vuRwIZULx1awulz3TZccpUD9HBmx1Km+yJqugvR6M=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=neLi/AO/O/Be5SUNUZEVeRTpskeY3ZK4RZucS67ZHZ3/3YYszkyaSS0eAOop9yvW6G3kWreSpxgMVWpkTHyvBxvicuRjuVSMmwg7T8c6fEZBxONHKdlMiUEroPofDXm963fny9xJeywP4FKos9KUzd6Ad2ECpjZeI9QO91r9yNA= 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=c4AMZsBg; arc=none smtp.client-ip=170.10.133.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="c4AMZsBg" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725616372; 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=0BVAAiLX2YDT2AdtI4QtNJTs70zsl324iWlMmUL5ZGE=; b=c4AMZsBgBTcYlVtCsXNOIBoM43gGwqkNDY5Mg00r/ujfL1/TyId7lgjUeU7S2NAvPnlAi0 Xl7luMWUej5FB9A+bL4YImFXTpBEScZa1pZzi15S7TwHIgmb+YsydizQ3bLTOTNp3p6cHo FDmbi90xP1cDNJfE2F+7XMC6E7F9+dE= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-92-yX70QcSNMw6ftfwwo2agCA-1; Fri, 06 Sep 2024 05:52:51 -0400 X-MC-Unique: yX70QcSNMw6ftfwwo2agCA-1 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-374b9a8512dso918509f8f.2 for ; Fri, 06 Sep 2024 02:52:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725616369; x=1726221169; 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=0BVAAiLX2YDT2AdtI4QtNJTs70zsl324iWlMmUL5ZGE=; b=pWo56Hhby07vu9km04xcpkOF2JgzrZOYRDwIejBg6dct/qsNa8Mrfa+a/RTOtL/0sZ OMfcptdZtAHUT/GP+KEXyDCDOele24wHtXLVtp3c4LNjz3LYX3JAcnQkPjXdH9OH7yD0 OYSTQDWpk4BMzUu8QWwVYxAO2E615lxF4M77WTUFKDGoCkCnLWH6Hgp3gKvPr1KseFZk /u38+bvE2b8equDVcSUiAaMgJmnv44TGqyeTVsxK5KuoxlAaOI+3u0k6jZXMdtsrIpqK YGAFkeekU4ID/YZSi5NlcXo8KLYk5VC5ZXaBdXMBE++Wieobgui+82hM8y10TgcWbCLx gnAw== X-Gm-Message-State: AOJu0YzxwjyQ7zBALqQ0KWtyV+9qIF0/fy5dD6ogRHl4HG0ViG9D+FZO yUYcGSMefiVSIPK7aIXWOvESPR5HYkgY0dYkmNzHIgtSknlHdWWZ2chShFikzR7FVvV0K1uOn6b GMg/1pdOVZnSlImW3l6Bq7vsCT9tS5AQDveT9QJ0U2DSpTUPsuVNEU5Ns7uXafjobpsQGuR2QtS pIhrA5LL6zWJWFKvZ7Fjp3rGFlNQzA4bodLGAHDsQSwA== X-Received: by 2002:a5d:5225:0:b0:36b:3384:40e5 with SMTP id ffacd0b85a97d-378895de480mr1326185f8f.24.1725616369348; Fri, 06 Sep 2024 02:52:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpPl6uh0wHWO+9rukppTUDX20dNZLFoJnMDp58PodNRcJ5IH3PPSXhUNF+FyNXmBHbr/zcog== X-Received: by 2002:a5d:5225:0:b0:36b:3384:40e5 with SMTP id ffacd0b85a97d-378895de480mr1326157f8f.24.1725616368848; Fri, 06 Sep 2024 02:52:48 -0700 (PDT) Received: from redhat.com ([155.133.17.165]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374c5ba7027sm14447997f8f.19.2024.09.06.02.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2024 02:52:48 -0700 (PDT) Date: Fri, 6 Sep 2024 05:52:44 -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 7/7] Revert "virtio_ring: enable premapped mode whatever use_dma_api" Message-ID: References: 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: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent This reverts commit f9dac92ba9081062a6477ee015bd3b8c5914efc4. 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/virtio/virtio_ring.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index be7309b1e860..06b5bdf0920e 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -2782,7 +2782,7 @@ EXPORT_SYMBOL_GPL(virtqueue_resize); * * Returns zero or a negative error. * 0: success. - * -EINVAL: too late to enable premapped mode, the vq already contains buffers. + * -EINVAL: vring does not use the dma api, so we can not enable premapped mode. */ int virtqueue_set_dma_premapped(struct virtqueue *_vq) { @@ -2798,6 +2798,11 @@ int virtqueue_set_dma_premapped(struct virtqueue *_vq) return -EINVAL; } + if (!vq->use_dma_api) { + END_USE(vq); + return -EINVAL; + } + vq->premapped = true; vq->do_unmap = false; -- MST