From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FACBC433F5 for ; Mon, 23 May 2022 16:02:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238486AbiEWQB7 (ORCPT ); Mon, 23 May 2022 12:01:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238551AbiEWQBs (ORCPT ); Mon, 23 May 2022 12:01:48 -0400 Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34E2E3EF13 for ; Mon, 23 May 2022 09:01:47 -0700 (PDT) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 5D1B25C0042; Mon, 23 May 2022 12:01:46 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Mon, 23 May 2022 12:01:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm1; t=1653321706; x= 1653408106; bh=3fE90OIXHmCWfviVoAFS/MaoOHNai/2kNBfRTTz2xaM=; b=H S4vZob/rAis9sdJWgD9lueCDReBFcMBg65/gL0Nvo9kpLuNc+khlI8hObW8AR4lS FL5ITovDUjGUAiQXvb8FR1X8dHW4hMz/8KcP6LSVeNDioKd/O7V7ztberJElNjkj 4Z5PGTjqGQeJZPzvsMKL4/9tCwJRSGKeGJyjfbuW4IMgmTLB09QT5fagVN91qodu dGnLM6YpysnQ4gXylIppy8S49XcKrOAXf2+irn3bGJiDQim9Sd43Jt0psPbbnoLU FrN7TRgiegtREyF7wSYxAYsusCGQTP37Uf8KT/jkSaHTzXPsnwlpFbaWlAqCrUye UORdUfmcuODx4zdfDrOOw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1653321706; x= 1653408106; bh=3fE90OIXHmCWfviVoAFS/MaoOHNai/2kNBfRTTz2xaM=; b=s s7E+pwZlhPIJZkcfOgFbxmT0GNXj5zifytVrsFNNGw/fuHfsNCiL/6gx5JeXZIjH mdYGSwWJvMno3YnlBz0aYhDL+bCdu6eKCOdR277fAzjDGNbMtKTJuopPvmNqrC8H cSP72SD/7bisn9KXuQnMu0OPuS8e5g5smiEpUz9xdIItYhSYv2QlBXrICRjdG4OW GeELuUVZbmG1Rs9gEdf/ODEzm6xMhhpIoLPzqh0bB4Ugb5LCvf8k9+CrQRAb7oIh DgROW9YVN8x9HDGfo3pLDvOvzOwJYvaqeSlclDLYvE6J3xQTN5erHqeF2Pf2jdeb TXZ9NvG/5dxVbZxcqd+qw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrjedugdeihecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvvefukfhfgggtugfgjgesthekredttddtjeenucfhrhhomhepifhrvghg ucfmjfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepleekhe ejjeeiheejvdetheejveekudegueeigfefudefgfffhfefteeuieekudefnecuffhomhgr ihhnpehkvghrnhgvlhdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhhdrtghomh X-ME-Proxy: Feedback-ID: i787e41f1:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 23 May 2022 12:01:44 -0400 (EDT) Date: Mon, 23 May 2022 18:01:42 +0200 From: Greg KH To: Ovidiu Panait Cc: stable@vger.kernel.org, Linus Torvalds , Halil Pasic , Oleksandr Natalenko , Christoph Hellwig Subject: Re: [PATCH 4.14 2/2] Reinstate some of "swiotlb: rework "fix info leak with DMA_FROM_DEVICE"" Message-ID: References: <20220523154624.1141489-1-ovidiu.panait@windriver.com> <20220523154624.1141489-2-ovidiu.panait@windriver.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220523154624.1141489-2-ovidiu.panait@windriver.com> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Mon, May 23, 2022 at 06:46:24PM +0300, Ovidiu Panait wrote: > From: Linus Torvalds > > commit 901c7280ca0d5e2b4a8929fbe0bfb007ac2a6544 upstream. > > Halil Pasic points out [1] that the full revert of that commit (revert > in bddac7c1e02b), and that a partial revert that only reverts the > problematic case, but still keeps some of the cleanups is probably > better.  > > And that partial revert [2] had already been verified by Oleksandr > Natalenko to also fix the issue, I had just missed that in the long > discussion. > > So let's reinstate the cleanups from commit aa6f8dcbab47 ("swiotlb: > rework "fix info leak with DMA_FROM_DEVICE""), and effectively only > revert the part that caused problems. > > Link: https://lore.kernel.org/all/20220328013731.017ae3e3.pasic@linux.ibm.com/ [1] > Link: https://lore.kernel.org/all/20220324055732.GB12078@lst.de/ [2] > Link: https://lore.kernel.org/all/4386660.LvFx2qVVIh@natalenko.name/ [3] > Suggested-by: Halil Pasic > Tested-by: Oleksandr Natalenko > Cc: Christoph Hellwig > Signed-off-by: Linus Torvalds > [OP: backport to 4.14: apply swiotlb_tbl_map_single() changes in lib/swiotlb.c] > Signed-off-by: Ovidiu Panait > --- > Documentation/DMA-attributes.txt | 10 ---------- > include/linux/dma-mapping.h | 8 -------- > lib/swiotlb.c | 13 ++++++++----- > 3 files changed, 8 insertions(+), 23 deletions(-) > Both now queued up, thanks. greg k-h