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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A95A5C433F5 for ; Wed, 17 Nov 2021 11:48:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 43AA461549 for ; Wed, 17 Nov 2021 11:48:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 43AA461549 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id A22D96B0072; Wed, 17 Nov 2021 06:48:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D1A06B0073; Wed, 17 Nov 2021 06:48:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 872A16B0074; Wed, 17 Nov 2021 06:48:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0193.hostedemail.com [216.40.44.193]) by kanga.kvack.org (Postfix) with ESMTP id 777F26B0072 for ; Wed, 17 Nov 2021 06:48:41 -0500 (EST) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 2F7441809016B for ; Wed, 17 Nov 2021 11:48:31 +0000 (UTC) X-FDA: 78818249622.09.0552B5B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf04.hostedemail.com (Postfix) with ESMTP id D28AB5000306 for ; Wed, 17 Nov 2021 11:48:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637149710; 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=iXfUNSShjqrOA5sFM+cPOF/5WanWiLYTnJjk+TI27xQ=; b=NhDudYTMAoywRKvPXRf51Nz4EJiPnee9354OWr0PSae9HtmMNqCZk6l37Xhn+2u+Pw2CWM AznurzV1lWncPSNPys5iSbV1GcMLW9/hy03XUyIwrYG3wpaJ/YOzNvfo8e4kktEyTYomNB Z2UfC03M+/8PdX38pCa7Lm4xaH1Iilw= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-21-XE4asgS0OOKwSC2l3rYTKQ-1; Wed, 17 Nov 2021 06:48:27 -0500 X-MC-Unique: XE4asgS0OOKwSC2l3rYTKQ-1 Received: by mail-ed1-f71.google.com with SMTP id b15-20020aa7c6cf000000b003e7cf0f73daso1850436eds.22 for ; Wed, 17 Nov 2021 03:48:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:date:mime-version:user-agent:cc :subject:content-language:to:references:in-reply-to :content-transfer-encoding; bh=iXfUNSShjqrOA5sFM+cPOF/5WanWiLYTnJjk+TI27xQ=; b=Cmr+D0mzAtE46/cnTvQqzFupoSRSWD16hPYvYVaUUh+AaHMy5UEnUQYL/aSkqd4jmr 8wHdQgeL+pkEJhCfvp5MdNs9Rxz8b/S0LzhMiL+jNuyHk9Au1pjuTYPrlscmeqtFafeD IiHEZB7kh5VtXQltjr/Ny0NFyA5RqYMTyolCa5uyainp9XkiI3fC1z/rh3W68D0geSWt VWGudAoBz1fk5Oq0pPz3nf7bhGmr3gewJ+jw9p3l4wiOxMgdZge9sn8O3DWoCyb2L5hN JVik2uXW3mrBMIQHN8Va3UC7XJ/NAEkji9Xb1tgamlqytRA0+3bFEmdU+CQ2AIwb5X6s 7syQ== X-Gm-Message-State: AOAM531rEKyfUBceBsqTv4qLu9cDERkpyu0xzGUFRvj+xA5vahGlvPii sSNOFK1klACFUFnKiNCnQhcopDPfzHlJ5Dg9ptDXjQeJ1DP8O5nj8xJ8eJoPS4NrYAR27wDhPEk FZyyLTsG8U8g= X-Received: by 2002:a05:6402:f:: with SMTP id d15mr20189704edu.331.1637149705853; Wed, 17 Nov 2021 03:48:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJxUXbRpsBwacbhC5r9gwH3TbtqimZxKl4AHr1KbPCKpjs1keI//W8jCBdq29CWmoEM8k5iNFQ== X-Received: by 2002:a05:6402:f:: with SMTP id d15mr20189668edu.331.1637149705640; Wed, 17 Nov 2021 03:48:25 -0800 (PST) Received: from [192.168.2.13] (3-14-107-185.static.kviknet.dk. [185.107.14.3]) by smtp.gmail.com with ESMTPSA id gz26sm2422534ejc.100.2021.11.17.03.48.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 17 Nov 2021 03:48:25 -0800 (PST) From: Jesper Dangaard Brouer X-Google-Original-From: Jesper Dangaard Brouer Message-ID: Date: Wed, 17 Nov 2021 12:48:23 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Cc: brouer@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linuxarm@openeuler.org, hawk@kernel.org, ilias.apalodimas@linaro.org, akpm@linux-foundation.org, peterz@infradead.org, vbabka@suse.cz, willy@infradead.org, will@kernel.org, feng.tang@intel.com, jgg@ziepe.ca, ebiederm@xmission.com, aarcange@redhat.com, guillaume.tucker@collabora.com, Linux-MM Subject: Re: [PATCH net] page_pool: Revert "page_pool: disable dma mapping support..." To: Yunsheng Lin , davem@davemloft.net, kuba@kernel.org References: <20211117075652.58299-1-linyunsheng@huawei.com> In-Reply-To: <20211117075652.58299-1-linyunsheng@huawei.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: D28AB5000306 X-Stat-Signature: 1d9mbfrhyk948zmjjg8tctc4xbdzqjak Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NhDudYTM; spf=none (imf04.hostedemail.com: domain of jbrouer@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=jbrouer@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-HE-Tag: 1637149709-171891 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Added CC: linux-mm@kvack.org On 17/11/2021 08.56, Yunsheng Lin wrote: > This reverts commit d00e60ee54b12de945b8493cf18c1ada9e422514. > > As reported by Guillaume in [1]: > Enabling LPAE always enables CONFIG_ARCH_DMA_ADDR_T_64BIT > in 32-bit systems, which breaks the bootup proceess when a > ethernet driver is using page pool with PP_FLAG_DMA_MAP flag. > As we were hoping we had no active consumers for such system > when we removed the dma mapping support, and LPAE seems like > a common feature for 32 bits system, so revert it. > > 1. https://www.spinics.net/lists/netdev/msg779890.html > > Fixes: d00e60ee54b1 ("page_pool: disable dma mapping support for 32-bit arch with 64-bit DMA") > Signed-off-by: Yunsheng Lin > --- > include/linux/mm_types.h | 13 ++++++++++++- > include/net/page_pool.h | 12 +++++++++++- > net/core/page_pool.c | 10 ++++------ > 3 files changed, 27 insertions(+), 8 deletions(-) Acked-by: Jesper Dangaard Brouer Too bad that we have to keep this code-uglyness in struct page, and handling in page_pool. > diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h > index bb8c6f5f19bc..c3a6e6209600 100644 > --- a/include/linux/mm_types.h > +++ b/include/linux/mm_types.h > @@ -105,7 +105,18 @@ struct page { > struct page_pool *pp; > unsigned long _pp_mapping_pad; > unsigned long dma_addr; > - atomic_long_t pp_frag_count; > + union { > + /** > + * dma_addr_upper: might require a 64-bit > + * value on 32-bit architectures. > + */ > + unsigned long dma_addr_upper; > + /** > + * For frag page support, not supported in > + * 32-bit architectures with 64-bit DMA. > + */ > + atomic_long_t pp_frag_count; > + }; > }; > struct { /* slab, slob and slub */ > union { > diff --git a/include/net/page_pool.h b/include/net/page_pool.h > index 3855f069627f..a4082406a003 100644 > --- a/include/net/page_pool.h > +++ b/include/net/page_pool.h > @@ -216,14 +216,24 @@ static inline void page_pool_recycle_direct(struct page_pool *pool, > page_pool_put_full_page(pool, page, true); > } > > +#define PAGE_POOL_DMA_USE_PP_FRAG_COUNT \ > + (sizeof(dma_addr_t) > sizeof(unsigned long)) > + > static inline dma_addr_t page_pool_get_dma_addr(struct page *page) > { > - return page->dma_addr; > + dma_addr_t ret = page->dma_addr; > + > + if (PAGE_POOL_DMA_USE_PP_FRAG_COUNT) > + ret |= (dma_addr_t)page->dma_addr_upper << 16 << 16; > + > + return ret; > } > > static inline void page_pool_set_dma_addr(struct page *page, dma_addr_t addr) > { > page->dma_addr = addr; > + if (PAGE_POOL_DMA_USE_PP_FRAG_COUNT) > + page->dma_addr_upper = upper_32_bits(addr); > } > > static inline void page_pool_set_frag_count(struct page *page, long nr) > diff --git a/net/core/page_pool.c b/net/core/page_pool.c > index 9b60e4301a44..1a6978427d6c 100644 > --- a/net/core/page_pool.c > +++ b/net/core/page_pool.c > @@ -49,12 +49,6 @@ static int page_pool_init(struct page_pool *pool, > * which is the XDP_TX use-case. > */ > if (pool->p.flags & PP_FLAG_DMA_MAP) { > - /* DMA-mapping is not supported on 32-bit systems with > - * 64-bit DMA mapping. > - */ > - if (sizeof(dma_addr_t) > sizeof(unsigned long)) > - return -EOPNOTSUPP; > - > if ((pool->p.dma_dir != DMA_FROM_DEVICE) && > (pool->p.dma_dir != DMA_BIDIRECTIONAL)) > return -EINVAL; > @@ -75,6 +69,10 @@ static int page_pool_init(struct page_pool *pool, > */ > } > > + if (PAGE_POOL_DMA_USE_PP_FRAG_COUNT && > + pool->p.flags & PP_FLAG_PAGE_FRAG) > + return -EINVAL; > + > if (ptr_ring_init(&pool->ring, ring_qsize, GFP_KERNEL) < 0) > return -ENOMEM; > >