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 10FC0C433FE for ; Thu, 24 Mar 2022 10:25:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349489AbiCXK0y (ORCPT ); Thu, 24 Mar 2022 06:26:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349483AbiCXK0x (ORCPT ); Thu, 24 Mar 2022 06:26:53 -0400 Received: from vulcan.natalenko.name (vulcan.natalenko.name [IPv6:2001:19f0:6c00:8846:5400:ff:fe0c:dfa0]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B765C483A3; Thu, 24 Mar 2022 03:25:21 -0700 (PDT) Received: from spock.localnet (unknown [83.148.33.151]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by vulcan.natalenko.name (Postfix) with ESMTPSA id 46336E4A5DD; Thu, 24 Mar 2022 11:25:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=natalenko.name; s=dkim-20170712; t=1648117508; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0kZDRe244Ho+56p1lKIcy0+GT4xOH+L25rK8rNrmj5M=; b=xTLCXRCNMwAKN6C6abDkvpf8K2mg/Sm4GaWSCsryLwp5Fq4HqX8lUoEohqBSWrzOqMIaix kRFT7EmZ97tKbHZfyY4//hxr65jVGb/7gVgp7+S6tP4fJ8p1HUuP7h1jt5+OqhjIlCJgG2 yc1FDX9OJ6CAbtcVZklteEyyfX7d5Cw= From: Oleksandr Natalenko To: Robin Murphy , Christoph Hellwig Cc: Linus Torvalds , Halil Pasic , Christoph Hellwig , Marek Szyprowski , Toke =?ISO-8859-1?Q?H=F8iland=2DJ=F8rgensen?= , Kalle Valo , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Olha Cherevyk , iommu , linux-wireless , Netdev , Linux Kernel Mailing List , Greg Kroah-Hartman , stable Subject: Re: [REGRESSION] Recent swiotlb DMA_FROM_DEVICE fixes break ath9k-based AP Date: Thu, 24 Mar 2022 11:25:06 +0100 Message-ID: <4386660.LvFx2qVVIh@natalenko.name> In-Reply-To: <20220324055732.GB12078@lst.de> References: <1812355.tdWV9SEqCh@natalenko.name> <20220324055732.GB12078@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Hello. On =C4=8Dtvrtek 24. b=C5=99ezna 2022 6:57:32 CET Christoph Hellwig wrote: > On Wed, Mar 23, 2022 at 08:54:08PM +0000, Robin Murphy wrote: > > I'll admit I still never quite grasped the reason for also adding the=20 > > override to swiotlb_sync_single_for_device() in aa6f8dcbab47, but I thi= nk=20 > > by that point we were increasingly tired and confused and starting to=20 > > second-guess ourselves (well, I was, at least). I don't think it's wron= g=20 > > per se, but as I said I do think it can bite anyone who's been doing=20 > > dma_sync_*() wrong but getting away with it until now. If ddbd89deb7d3= =20 > > alone turns out to work OK then I'd be inclined to try a partial revert= of=20 > > just that one hunk. >=20 > Agreed. Let's try that first. >=20 > Oleksandr, can you try the patch below: >=20 >=20 > diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c > index 6db1c475ec827..6c350555e5a1c 100644 > --- a/kernel/dma/swiotlb.c > +++ b/kernel/dma/swiotlb.c > @@ -701,13 +701,10 @@ void swiotlb_tbl_unmap_single(struct device *dev, p= hys_addr_t tlb_addr, > void swiotlb_sync_single_for_device(struct device *dev, phys_addr_t tlb_= addr, > size_t size, enum dma_data_direction dir) > { > - /* > - * Unconditional bounce is necessary to avoid corruption on > - * sync_*_for_cpu or dma_ummap_* when the device didn't overwrite > - * the whole lengt of the bounce buffer. > - */ > - swiotlb_bounce(dev, tlb_addr, size, DMA_TO_DEVICE); > - BUG_ON(!valid_dma_direction(dir)); > + if (dir =3D=3D DMA_TO_DEVICE || dir =3D=3D DMA_BIDIRECTIONAL) > + swiotlb_bounce(dev, tlb_addr, size, DMA_TO_DEVICE); > + else > + BUG_ON(dir !=3D DMA_FROM_DEVICE); > } > =20 > void swiotlb_sync_single_for_cpu(struct device *dev, phys_addr_t tlb_add= r, >=20 With this patch the AP works for me. Thanks. =2D-=20 Oleksandr Natalenko (post-factum) 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 smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 41258C433EF for ; Thu, 24 Mar 2022 10:25:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id B6EA64102A; Thu, 24 Mar 2022 10:25:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fXf4rWnLqSWd; Thu, 24 Mar 2022 10:25:19 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id EFAFA400A8; Thu, 24 Mar 2022 10:25:18 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id B53B3C001A; Thu, 24 Mar 2022 10:25:18 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id C01C6C000B for ; Thu, 24 Mar 2022 10:25:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id ACA1860B6A for ; Thu, 24 Mar 2022 10:25:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=natalenko.name Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xUf4AO8X2Y2X for ; Thu, 24 Mar 2022 10:25:16 +0000 (UTC) X-Greylist: delayed 01:29:26 by SQLgrey-1.8.0 Received: from vulcan.natalenko.name (vulcan.natalenko.name [104.207.131.136]) by smtp3.osuosl.org (Postfix) with ESMTPS id 3BAF260ACC for ; Thu, 24 Mar 2022 10:25:16 +0000 (UTC) Received: from spock.localnet (unknown [83.148.33.151]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by vulcan.natalenko.name (Postfix) with ESMTPSA id 46336E4A5DD; Thu, 24 Mar 2022 11:25:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=natalenko.name; s=dkim-20170712; t=1648117508; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0kZDRe244Ho+56p1lKIcy0+GT4xOH+L25rK8rNrmj5M=; b=xTLCXRCNMwAKN6C6abDkvpf8K2mg/Sm4GaWSCsryLwp5Fq4HqX8lUoEohqBSWrzOqMIaix kRFT7EmZ97tKbHZfyY4//hxr65jVGb/7gVgp7+S6tP4fJ8p1HUuP7h1jt5+OqhjIlCJgG2 yc1FDX9OJ6CAbtcVZklteEyyfX7d5Cw= To: Robin Murphy , Christoph Hellwig Subject: Re: [REGRESSION] Recent swiotlb DMA_FROM_DEVICE fixes break ath9k-based AP Date: Thu, 24 Mar 2022 11:25:06 +0100 Message-ID: <4386660.LvFx2qVVIh@natalenko.name> In-Reply-To: <20220324055732.GB12078@lst.de> References: <1812355.tdWV9SEqCh@natalenko.name> <20220324055732.GB12078@lst.de> MIME-Version: 1.0 Cc: Toke =?ISO-8859-1?Q?H=F8iland=2DJ=F8rgensen?= , Netdev , Kalle Valo , linux-wireless , Linux Kernel Mailing List , stable , "David S. Miller" , Halil Pasic , iommu , Olha Cherevyk , Greg Kroah-Hartman , Jakub Kicinski , Paolo Abeni , Linus Torvalds , Christoph Hellwig X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Oleksandr Natalenko via iommu Reply-To: Oleksandr Natalenko Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" SGVsbG8uCgpPbiDEjXR2cnRlayAyNC4gYsWZZXpuYSAyMDIyIDY6NTc6MzIgQ0VUIENocmlzdG9w aCBIZWxsd2lnIHdyb3RlOgo+IE9uIFdlZCwgTWFyIDIzLCAyMDIyIGF0IDA4OjU0OjA4UE0gKzAw MDAsIFJvYmluIE11cnBoeSB3cm90ZToKPiA+IEknbGwgYWRtaXQgSSBzdGlsbCBuZXZlciBxdWl0 ZSBncmFzcGVkIHRoZSByZWFzb24gZm9yIGFsc28gYWRkaW5nIHRoZSAKPiA+IG92ZXJyaWRlIHRv IHN3aW90bGJfc3luY19zaW5nbGVfZm9yX2RldmljZSgpIGluIGFhNmY4ZGNiYWI0NywgYnV0IEkg dGhpbmsgCj4gPiBieSB0aGF0IHBvaW50IHdlIHdlcmUgaW5jcmVhc2luZ2x5IHRpcmVkIGFuZCBj b25mdXNlZCBhbmQgc3RhcnRpbmcgdG8gCj4gPiBzZWNvbmQtZ3Vlc3Mgb3Vyc2VsdmVzICh3ZWxs LCBJIHdhcywgYXQgbGVhc3QpLiBJIGRvbid0IHRoaW5rIGl0J3Mgd3JvbmcgCj4gPiBwZXIgc2Us IGJ1dCBhcyBJIHNhaWQgSSBkbyB0aGluayBpdCBjYW4gYml0ZSBhbnlvbmUgd2hvJ3MgYmVlbiBk b2luZyAKPiA+IGRtYV9zeW5jXyooKSB3cm9uZyBidXQgZ2V0dGluZyBhd2F5IHdpdGggaXQgdW50 aWwgbm93LiBJZiBkZGJkODlkZWI3ZDMgCj4gPiBhbG9uZSB0dXJucyBvdXQgdG8gd29yayBPSyB0 aGVuIEknZCBiZSBpbmNsaW5lZCB0byB0cnkgYSBwYXJ0aWFsIHJldmVydCBvZiAKPiA+IGp1c3Qg dGhhdCBvbmUgaHVuay4KPiAKPiBBZ3JlZWQuICBMZXQncyB0cnkgdGhhdCBmaXJzdC4KPiAKPiBP bGVrc2FuZHIsIGNhbiB5b3UgdHJ5IHRoZSBwYXRjaCBiZWxvdzoKPiAKPiAKPiBkaWZmIC0tZ2l0 IGEva2VybmVsL2RtYS9zd2lvdGxiLmMgYi9rZXJuZWwvZG1hL3N3aW90bGIuYwo+IGluZGV4IDZk YjFjNDc1ZWM4MjcuLjZjMzUwNTU1ZTVhMWMgMTAwNjQ0Cj4gLS0tIGEva2VybmVsL2RtYS9zd2lv dGxiLmMKPiArKysgYi9rZXJuZWwvZG1hL3N3aW90bGIuYwo+IEBAIC03MDEsMTMgKzcwMSwxMCBA QCB2b2lkIHN3aW90bGJfdGJsX3VubWFwX3NpbmdsZShzdHJ1Y3QgZGV2aWNlICpkZXYsIHBoeXNf YWRkcl90IHRsYl9hZGRyLAo+ICB2b2lkIHN3aW90bGJfc3luY19zaW5nbGVfZm9yX2RldmljZShz dHJ1Y3QgZGV2aWNlICpkZXYsIHBoeXNfYWRkcl90IHRsYl9hZGRyLAo+ICAJCXNpemVfdCBzaXpl LCBlbnVtIGRtYV9kYXRhX2RpcmVjdGlvbiBkaXIpCj4gIHsKPiAtCS8qCj4gLQkgKiBVbmNvbmRp dGlvbmFsIGJvdW5jZSBpcyBuZWNlc3NhcnkgdG8gYXZvaWQgY29ycnVwdGlvbiBvbgo+IC0JICog c3luY18qX2Zvcl9jcHUgb3IgZG1hX3VtbWFwXyogd2hlbiB0aGUgZGV2aWNlIGRpZG4ndCBvdmVy d3JpdGUKPiAtCSAqIHRoZSB3aG9sZSBsZW5ndCBvZiB0aGUgYm91bmNlIGJ1ZmZlci4KPiAtCSAq Lwo+IC0Jc3dpb3RsYl9ib3VuY2UoZGV2LCB0bGJfYWRkciwgc2l6ZSwgRE1BX1RPX0RFVklDRSk7 Cj4gLQlCVUdfT04oIXZhbGlkX2RtYV9kaXJlY3Rpb24oZGlyKSk7Cj4gKwlpZiAoZGlyID09IERN QV9UT19ERVZJQ0UgfHwgZGlyID09IERNQV9CSURJUkVDVElPTkFMKQo+ICsJCXN3aW90bGJfYm91 bmNlKGRldiwgdGxiX2FkZHIsIHNpemUsIERNQV9UT19ERVZJQ0UpOwo+ICsJZWxzZQo+ICsJCUJV R19PTihkaXIgIT0gRE1BX0ZST01fREVWSUNFKTsKPiAgfQo+ICAKPiAgdm9pZCBzd2lvdGxiX3N5 bmNfc2luZ2xlX2Zvcl9jcHUoc3RydWN0IGRldmljZSAqZGV2LCBwaHlzX2FkZHJfdCB0bGJfYWRk ciwKPiAKCldpdGggdGhpcyBwYXRjaCB0aGUgQVAgd29ya3MgZm9yIG1lLgoKVGhhbmtzLgoKLS0g Ck9sZWtzYW5kciBOYXRhbGVua28gKHBvc3QtZmFjdHVtKQoKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmlvbW11IG1haWxpbmcgbGlzdAppb21tdUBsaXN0 cy5saW51eC1mb3VuZGF0aW9uLm9yZwpodHRwczovL2xpc3RzLmxpbnV4Zm91bmRhdGlvbi5vcmcv bWFpbG1hbi9saXN0aW5mby9pb21tdQ==