Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp313494pxb; Wed, 22 Sep 2021 02:49:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzd/eZN0DvklyBFVnKjrISdb+gRl+LkjznkhZw4GcjXnzzN/UVNsqpgd5Hw1vCTIv5t3vZc X-Received: by 2002:a50:cf4c:: with SMTP id d12mr14596421edk.115.1632304154465; Wed, 22 Sep 2021 02:49:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632304154; cv=none; d=google.com; s=arc-20160816; b=lytduV5nZ5/R8tdW+5p6/GP2NuKATi4MwgCilskPX+W/U1ymncQ4anAxHTWwNYuufY 3VsDPI5umssW5VwGBGSw2PiD0IdRumxAh9Fs9srOkgbjEJte3Erh5jorGNI9d55WGJtS ZpdeAc1XnpyXkp229RXrSMNadSK07hlp6pvP51DjoxrWNjww6Bp0cAtfcJJli49fuMaD tz4FDFEMBFtm68rSxGMtq48Wce1o1F7P0eH4PSpeYobZLUwP/NY8ymaTSZKpcHwjkMb5 IxBeRi4H3ib2lEX+g2+MAr+8tclTD95dE9DY9Kyw5D/fD50fA6nFnjq6ArWQc2UaP4u9 E3Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=M7jmuTc9Ia2pG5pEnsvH0KZbzDEk1z/sw3RlG8GcTNY=; b=vyDvND5GRPjphymv16zdo4FIHeK+jFGoKU/z+epYCMqrHoVh5LOr+KtbO/6w0ds4sj rRqewgnKyoZDqk9n7znJ41NsOEGTcMaPQ9Oq+lsysb+HisnxFpTeXhJG25uV++mvLKT4 Mv7+iwJLH1OZVXDVwPFKbGMR2Iun/b/j4ZnR+mztpBQhtTWXFhAEpzHHMjqykKAMpst9 WhJUKuB8m3jUx1hTuitDO/4fYPkJ0JOoBW68VozKpgdQE61EE+LD5MSrWh42wciAbOkx 7oCMJ1kCJvIqu8YZfEI+ofe9cZNs+zr/nQv/isuFHWRlTJYruL/+xk993wIg/dgbtK+R Bk0w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id mc5si2116754ejb.224.2021.09.22.02.48.26; Wed, 22 Sep 2021 02:49:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234496AbhIVJoz (ORCPT + 99 others); Wed, 22 Sep 2021 05:44:55 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:9753 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234534AbhIVJok (ORCPT ); Wed, 22 Sep 2021 05:44:40 -0400 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4HDtc75qZVzWMr4; Wed, 22 Sep 2021 17:41:59 +0800 (CST) Received: from dggpemm500005.china.huawei.com (7.185.36.74) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Wed, 22 Sep 2021 17:43:01 +0800 Received: from localhost.localdomain (10.69.192.56) by dggpemm500005.china.huawei.com (7.185.36.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Wed, 22 Sep 2021 17:43:01 +0800 From: Yunsheng Lin To: , CC: , , , , , , , , , , , , , , , , Subject: [PATCH net-next 2/7] page_pool: support non-split page with PP_FLAG_PAGE_FRAG Date: Wed, 22 Sep 2021 17:41:26 +0800 Message-ID: <20210922094131.15625-3-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210922094131.15625-1-linyunsheng@huawei.com> References: <20210922094131.15625-1-linyunsheng@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemm500005.china.huawei.com (7.185.36.74) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently when PP_FLAG_PAGE_FRAG is set, the caller is not expected to call page_pool_alloc_pages() directly because of the PP_FLAG_PAGE_FRAG checking in __page_pool_put_page(). The patch removes the above checking to enable non-split page support when PP_FLAG_PAGE_FRAG is set. Reviewed-by: Alexander Duyck Signed-off-by: Yunsheng Lin --- net/core/page_pool.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/net/core/page_pool.c b/net/core/page_pool.c index a65bd7972e37..f7e71dcb6a2e 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -315,11 +315,14 @@ struct page *page_pool_alloc_pages(struct page_pool *pool, gfp_t gfp) /* Fast-path: Get a page from cache */ page = __page_pool_get_cached(pool); - if (page) - return page; /* Slow-path: cache empty, do real allocation */ - page = __page_pool_alloc_pages_slow(pool, gfp); + if (!page) + page = __page_pool_alloc_pages_slow(pool, gfp); + + if (likely(page)) + page_pool_set_frag_count(page, 1); + return page; } EXPORT_SYMBOL(page_pool_alloc_pages); @@ -428,8 +431,7 @@ __page_pool_put_page(struct page_pool *pool, struct page *page, unsigned int dma_sync_size, bool allow_direct) { /* It is not the last user for the page frag case */ - if (pool->p.flags & PP_FLAG_PAGE_FRAG && - page_pool_atomic_sub_frag_count_return(page, 1)) + if (page_pool_atomic_sub_frag_count_return(page, 1)) return NULL; /* This allocator is optimized for the XDP mode that uses -- 2.33.0