From patchwork Mon Feb 11 16:06:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Dangaard Brouer X-Patchwork-Id: 158011 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2772925jaa; Mon, 11 Feb 2019 08:07:02 -0800 (PST) X-Google-Smtp-Source: AHgI3IYgRcv3Flj5t53dwLaqvhhhJwolSFwO1mcOiSVFMmlG3vSzotSJlhZlUv4/CS61zyuatLeH X-Received: by 2002:a63:3541:: with SMTP id c62mr29997329pga.191.1549901222715; Mon, 11 Feb 2019 08:07:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549901222; cv=none; d=google.com; s=arc-20160816; b=km65egsrUe9gZ7MKAkKYgAKJX6RDtVO2R0fm571n+cJ7KCvYXq4DKjpBJlgNMzoX82 JMH+HhlvTooSpR8b9vD/QcCfX3j1wYgRzHDTq1oVAvNTIz3jxgXw6EWwtFBF4V8FPqJX 7xxfijWhambGlEcs/8R+V/mtAZdAZTLPqKu02VAbo/BS3LtU40WjqHKkjabmOt6tY1YP xg0g5Wt8aDub0hLg2ATaWC+a97XcahW9fIJJLseYmRvUIencHf+0jAZvi511olgcEFcT T1rgxqlMraMlxrlrxxKX2e7yvnisPO2dxJEcCcZ5XIdCIhUF+7KJ/2Kbsf0aLSSWsH8K +TKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject; bh=xWUNDSgRU80m19aFrocMMhwrjGCARtWhKL6OErSaSMc=; b=FXtIxmYPdDMXv9T5eAX0vpx6bKmIfmlnLSLUuqvrcWFbdaC2C4rLTsblsf5mKAeRaq KWrE7s5j9uTcLD/jbxBNCYptjSHl+V2h67/230Zd1FgxdICx4dvThTcTzzxDVisWnQ+G m8IbCf1d+Gcp9TpAuDdIH4imiVN8uhFVmD60GolhtEoAZ17KH6kXr6hH0ww4x15UfN+6 GMvRgiiY7QMlkeSwmFxeIDCpz52/yx3/KXJXCTOfMw7z5arCdQj8Hy1XC79Ywc/KsgoX tZRcrVvUXiOhI6CgHn2NkjAItDXEBM6m/uTeRWutRpnRlimwMpyydFHxviiLTM0Yr180 ushg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f13si9473691pgv.164.2019.02.11.08.07.01; Mon, 11 Feb 2019 08:07:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729941AbfBKQHA (ORCPT + 10 others); Mon, 11 Feb 2019 11:07:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38702 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727302AbfBKQG7 (ORCPT ); Mon, 11 Feb 2019 11:06:59 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6BAF9804E0; Mon, 11 Feb 2019 16:06:58 +0000 (UTC) Received: from firesoul.localdomain (ovpn-200-20.brq.redhat.com [10.40.200.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id C7869608C2; Mon, 11 Feb 2019 16:06:52 +0000 (UTC) Received: from [10.1.2.1] (localhost [IPv6:::1]) by firesoul.localdomain (Postfix) with ESMTP id F007730C2C6B3; Mon, 11 Feb 2019 17:06:51 +0100 (CET) Subject: [net-next PATCH 2/2] net: page_pool: don't use page->private to store dma_addr_t From: Jesper Dangaard Brouer To: netdev@vger.kernel.org, linux-mm@kvack.org Cc: Toke =?utf-8?q?H=C3=B8iland-J=C3=B8rgensen?= , Ilias Apalodimas , willy@infradead.org, Saeed Mahameed , Jesper Dangaard Brouer , Andrew Morton , mgorman@techsingularity.net, "David S. Miller" , Tariq Toukan Date: Mon, 11 Feb 2019 17:06:51 +0100 Message-ID: <154990121192.24530.11128024662816211563.stgit@firesoul> In-Reply-To: <154990116432.24530.10541030990995303432.stgit@firesoul> References: <154990116432.24530.10541030990995303432.stgit@firesoul> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 11 Feb 2019 16:06:59 +0000 (UTC) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ilias Apalodimas As pointed out by David Miller the current page_pool implementation stores dma_addr_t in page->private. This won't work on 32-bit platforms with 64-bit DMA addresses since the page->private is an unsigned long and the dma_addr_t a u64. A previous patch is adding dma_addr_t on struct page to accommodate this. This patch adapts the page_pool related functions to use the newly added struct for storing and retrieving DMA addresses from network drivers. Signed-off-by: Ilias Apalodimas Signed-off-by: Jesper Dangaard Brouer --- net/core/page_pool.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/net/core/page_pool.c b/net/core/page_pool.c index 43a932cb609b..897a69a1477e 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -136,7 +136,9 @@ static struct page *__page_pool_alloc_pages_slow(struct page_pool *pool, if (!(pool->p.flags & PP_FLAG_DMA_MAP)) goto skip_dma_map; - /* Setup DMA mapping: use page->private for DMA-addr + /* Setup DMA mapping: use 'struct page' area for storing DMA-addr + * since dma_addr_t can be either 32 or 64 bits and does not always fit + * into page private data (i.e 32bit cpu with 64bit DMA caps) * This mapping is kept for lifetime of page, until leaving pool. */ dma = dma_map_page(pool->p.dev, page, 0, @@ -146,7 +148,7 @@ static struct page *__page_pool_alloc_pages_slow(struct page_pool *pool, put_page(page); return NULL; } - set_page_private(page, dma); /* page->private = dma; */ + page->dma_addr = dma; skip_dma_map: /* When page just alloc'ed is should/must have refcnt 1. */ @@ -175,13 +177,16 @@ EXPORT_SYMBOL(page_pool_alloc_pages); static void __page_pool_clean_page(struct page_pool *pool, struct page *page) { + dma_addr_t dma; + if (!(pool->p.flags & PP_FLAG_DMA_MAP)) return; + dma = page->dma_addr; /* DMA unmap */ - dma_unmap_page(pool->p.dev, page_private(page), + dma_unmap_page(pool->p.dev, dma, PAGE_SIZE << pool->p.order, pool->p.dma_dir); - set_page_private(page, 0); + page->dma_addr = 0; } /* Return a page to the page allocator, cleaning up our state */