From patchwork Wed Feb 14 16:21:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Lobakin X-Patchwork-Id: 201005 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp1331260dyb; Wed, 14 Feb 2024 08:24:20 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVis8Q8y7bmDypZaTr54vPjLzgfugh3XdkkdxhC6oXQY/rGjryOnHT1EOczntI4+MfpQ0PtmbD+KFpSBmNCHo837Kxc0A== X-Google-Smtp-Source: AGHT+IHsKeCFMIkKNuJmut7iKjus3n5o9igJA8cIvoj4M8nq491AKHWZFjRvROWD4v3xVMnp7XkH X-Received: by 2002:a05:6a20:438a:b0:19e:b6da:da1b with SMTP id i10-20020a056a20438a00b0019eb6dada1bmr3798880pzl.4.1707927859691; Wed, 14 Feb 2024 08:24:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707927859; cv=pass; d=google.com; s=arc-20160816; b=dEZX7tgQ0HkkyTX5eLJ1tvkKRP35Zb92aUpkLoZd8c6zPsZJXIaUM4trifNR3c7Xok hzjjFXlPK00O6YHuHvejYiG8JWzfouzBeX825m6b2z3nuKWvmYbISRghyY/e07nlTcW1 lyWge1+kWlY46eHn66qKngiJQg6NENzdqOAZFln8Wb+cDkSgV0pucNCDhtamzyhLooKf CWY64a814On5rmdbyRGy9bipzfm2f9Wbjn89OnWjGIttGUEJjjOSgrv/xJUAIoeiKMZl ZrayVgrRcSZFJdH5eI2xnb4ll+E/erqnX4U9CLgOQP8SsEOoJUxdowbfeoeFhyVg6Dm/ JFeg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=TdZirWx2ISe9phMWwn8x43ihntRYRHHm3AqyBUF0j0g=; fh=CIQbUrYKvoEk0QA3bUZrkMxxijWXkJ7SSqLm8nOlxTI=; b=RTAi7Ly0u8Kz/Cqem91WPYpfXqvfXdRyFijzeValeJViW4EYtd0ulkm6klIVHZ7XX2 avoVUWBR8wGtKBzRSiXVlLu8Nal20+USEuPOZcs3DC00+AS/mRTVSK05S5MF7QN7FM8k BmYBFMbRmB1+Jkjm9wloSKLjVI4CoLvdnZHsEJa1jy0zUVqGJMBxh3MATl0bIebzEWy6 ZPhKjGV3I2LNm2f6gIBSTqM9C7F6wfFjkjF+6h3Yp8fOCs262HYDJpKazpIMhXQ46rgY MeE3JGqqipvJrT7TFVoVlG4COR0QAN0bPTRiDI9DLLzOHXhiWZPDE8tL4l+0Q9DMLKS1 1kGA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gr21UQ3Q; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-65513-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-65513-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Forwarded-Encrypted: i=2; AJvYcCUrP4PZSp/xfdzun2TVOh2id2gQKv4dPGszXwCm0/FN6asQEHlxnBxk7HFBrF4J+vBCGs2qXRltGlPetcVhLUHiSXCNsg== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id bo12-20020a056a02038c00b005cf94b8d9ddsi4219743pgb.869.2024.02.14.08.24.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 08:24:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-65513-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gr21UQ3Q; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-65513-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-65513-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 73DFA28223D for ; Wed, 14 Feb 2024 16:24:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2FF8160DF8; Wed, 14 Feb 2024 16:22:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="gr21UQ3Q" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 882B060884; Wed, 14 Feb 2024 16:22:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707927772; cv=none; b=Lpnrv5vtMqWP1wlBAjYC0BQ5HF1GVoaHjdvnqCSmJYUivPpcOvUs0osld7dKTfvHNse2jM8UdsXZmvDFkNkTLa86j21c3pfdC0ybTE2D/I9De6+yzR27aQ070l+d7fONzyVGE7Ss0cW+ROaEoWMbsCEbBjoQxMkvNvjGayKMQww= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707927772; c=relaxed/simple; bh=hcetF/PnslkcN3jX68+J8IOB6E8XYwzSEUS+T5IkqzM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=djwIgagdBoSEy4SahK/eNZ9d+P3H2Aby2umHrYLnCh9RmaS+O7jyEdjNo7GuJnqsAT6WSecapjrEEEZTEKKsmkmPvgYJEvzFkMcvxnBziBMKCCnDOqm6CDIMPP89pzYlBbINzTClkYAU+85WK6LzHK4y2ORftxoTXWSXYcCdfXY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=gr21UQ3Q; arc=none smtp.client-ip=192.198.163.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707927770; x=1739463770; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hcetF/PnslkcN3jX68+J8IOB6E8XYwzSEUS+T5IkqzM=; b=gr21UQ3QREOJ6BZSuoENygQp3FGqEXUPwpNipsLaKXUsDTUN2MYrAHA7 q2a2DuEqabi0yxdQ2H2uMuR3GZ+AP2pmopRcRiRlrB3lSzY0zY+I+eaMh tSIYwXJ4gBbKKbrscC1PC8l3kg0Ux3G7MHXxbeX1sca5WlqlJwm9TOMsy 4fDtowc8YqnUjCsId3pegQAivsvaLTj598/kuAh9SDXW7pk7XsEKfpR/L EP0HkFyHhC5N1EX5FYChjQHqXILaIALMjiPH48p4gBSfJ/0fQ2/PRaKwa zMesdr0DEWX9xjT87mKCRSwJAGbTkXfnKgQOjPbZCYuoHXYrUN6He4Tah Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10984"; a="5755550" X-IronPort-AV: E=Sophos;i="6.06,159,1705392000"; d="scan'208";a="5755550" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Feb 2024 08:22:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,159,1705392000"; d="scan'208";a="26399979" Received: from newjersey.igk.intel.com ([10.102.20.203]) by fmviesa002.fm.intel.com with ESMTP; 14 Feb 2024 08:22:46 -0800 From: Alexander Lobakin To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Alexander Lobakin , Christoph Hellwig , Marek Szyprowski , Robin Murphy , Joerg Roedel , Will Deacon , Greg Kroah-Hartman , "Rafael J. Wysocki" , Magnus Karlsson , Maciej Fijalkowski , Alexander Duyck , bpf@vger.kernel.org, netdev@vger.kernel.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH net-next v3 2/7] dma: avoid redundant calls for sync operations Date: Wed, 14 Feb 2024 17:21:56 +0100 Message-ID: <20240214162201.4168778-3-aleksander.lobakin@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240214162201.4168778-1-aleksander.lobakin@intel.com> References: <20240214162201.4168778-1-aleksander.lobakin@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790892163099714824 X-GMAIL-MSGID: 1790892163099714824 Quite often, devices do not need dma_sync operations on x86_64 at least. Indeed, when dev_is_dma_coherent(dev) is true and dev_use_swiotlb(dev) is false, iommu_dma_sync_single_for_cpu() and friends do nothing. However, indirectly calling them when CONFIG_RETPOLINE=y consumes about 10% of cycles on a cpu receiving packets from softirq at ~100Gbit rate. Even if/when CONFIG_RETPOLINE is not set, there is a cost of about 3%. Add dev->skip_dma_sync boolean which is set during the device initialization depending on the setup: dev_is_dma_coherent() for the direct DMA, !(sync_single_for_device || sync_single_for_cpu) or the new dma_map_ops flag, %DMA_F_CAN_SKIP_SYNC, advertised for non-NULL DMA ops. Then later, if/when swiotlb is used for the first time, the flag is turned off, from swiotlb_tbl_map_single(). On iavf, the UDP trafficgen with XDP_DROP in skb mode test shows +3-5% increase for direct DMA. Suggested-by: Christoph Hellwig # direct DMA shortcut Co-developed-by: Eric Dumazet Signed-off-by: Eric Dumazet Signed-off-by: Alexander Lobakin --- include/linux/device.h | 5 +++++ include/linux/dma-map-ops.h | 21 ++++++++++++++++++++ include/linux/dma-mapping.h | 6 +++++- drivers/base/dd.c | 2 ++ kernel/dma/mapping.c | 39 ++++++++++++++++++++++++++++++++++++- kernel/dma/swiotlb.c | 8 ++++++++ 6 files changed, 79 insertions(+), 2 deletions(-) diff --git a/include/linux/device.h b/include/linux/device.h index 97c4b046c09d..f23e6a32bea0 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -686,6 +686,8 @@ struct device_physical_location { * other devices probe successfully. * @dma_coherent: this particular device is dma coherent, even if the * architecture supports non-coherent devices. + * @dma_skip_sync: DMA sync operations can be skipped for coherent non-SWIOTLB + * buffers. * @dma_ops_bypass: If set to %true then the dma_ops are bypassed for the * streaming DMA operations (->map_* / ->unmap_* / ->sync_*), * and optionall (if the coherent mask is large enough) also @@ -800,6 +802,9 @@ struct device { defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU_ALL) bool dma_coherent:1; #endif +#ifdef CONFIG_DMA_NEED_SYNC + bool dma_skip_sync:1; +#endif #ifdef CONFIG_DMA_OPS_BYPASS bool dma_ops_bypass : 1; #endif diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h index 4abc60f04209..327b73f653ad 100644 --- a/include/linux/dma-map-ops.h +++ b/include/linux/dma-map-ops.h @@ -18,8 +18,11 @@ struct iommu_ops; * * DMA_F_PCI_P2PDMA_SUPPORTED: Indicates the dma_map_ops implementation can * handle PCI P2PDMA pages in the map_sg/unmap_sg operation. + * DMA_F_CAN_SKIP_SYNC: DMA sync operations can be skipped if the device is + * coherent and it's not an SWIOTLB buffer. */ #define DMA_F_PCI_P2PDMA_SUPPORTED (1 << 0) +#define DMA_F_CAN_SKIP_SYNC BIT(1) struct dma_map_ops { unsigned int flags; @@ -111,6 +114,24 @@ static inline void set_dma_ops(struct device *dev, } #endif /* CONFIG_DMA_OPS */ +#ifdef CONFIG_DMA_NEED_SYNC +void dma_setup_skip_sync(struct device *dev); + +static inline void dma_clear_skip_sync(struct device *dev) +{ + /* Clear it only once so that the function can be called on hotpath */ + if (unlikely(dev->dma_skip_sync)) + dev->dma_skip_sync = false; +} +#else /* !CONFIG_DMA_NEED_SYNC */ +static inline void dma_setup_skip_sync(struct device *dev) +{ +} +static inline void dma_clear_skip_sync(struct device *dev) +{ +} +#endif /* !CONFIG_DMA_NEED_SYNC */ + #ifdef CONFIG_DMA_CMA extern struct cma *dma_contiguous_default_area; diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 6c7640441214..d85ae541c267 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -364,7 +364,11 @@ static inline void __dma_sync_single_range_for_device(struct device *dev, static inline bool dma_skip_sync(const struct device *dev) { - return !IS_ENABLED(CONFIG_DMA_NEED_SYNC); +#ifdef CONFIG_DMA_NEED_SYNC + return dev->dma_skip_sync; +#else + return true; +#endif } static inline bool dma_need_sync(struct device *dev, dma_addr_t dma_addr) diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 85152537dbf1..67ad3e1d51f6 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -642,6 +642,8 @@ static int really_probe(struct device *dev, struct device_driver *drv) goto pinctrl_bind_failed; } + dma_setup_skip_sync(dev); + ret = driver_sysfs_add(dev); if (ret) { pr_err("%s: driver_sysfs_add(%s) failed\n", diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c index 85feaa0e008c..5f588e31ea89 100644 --- a/kernel/dma/mapping.c +++ b/kernel/dma/mapping.c @@ -846,8 +846,14 @@ bool __dma_need_sync(struct device *dev, dma_addr_t dma_addr) const struct dma_map_ops *ops = get_dma_ops(dev); if (dma_map_direct(dev, ops)) + /* + * dma_skip_sync could've been set to false on first SWIOTLB + * buffer mapping, but @dma_addr is not necessary an SWIOTLB + * buffer. In this case, fall back to more granular check. + */ return dma_direct_need_sync(dev, dma_addr); - return ops->sync_single_for_cpu || ops->sync_single_for_device; + + return true; } EXPORT_SYMBOL_GPL(__dma_need_sync); @@ -861,3 +867,34 @@ unsigned long dma_get_merge_boundary(struct device *dev) return ops->get_merge_boundary(dev); } EXPORT_SYMBOL_GPL(dma_get_merge_boundary); + +#ifdef CONFIG_DMA_NEED_SYNC +void dma_setup_skip_sync(struct device *dev) +{ + const struct dma_map_ops *ops = get_dma_ops(dev); + + if (dma_map_direct(dev, ops)) + /* + * dma_skip_sync will be set to false on first SWIOTLB buffer + * mapping, if any. During the device initialization, it's + * enough to check only for DMA coherence. + */ + dev->dma_skip_sync = dev_is_dma_coherent(dev); + else if (!ops->sync_single_for_device && !ops->sync_single_for_cpu) + /* + * Synchronization is not possible when none of DMA sync ops + * is set. This check precedes the below one as it disables + * the synchronization unconditionally. + */ + dev->dma_skip_sync = true; + else if (ops->flags & DMA_F_CAN_SKIP_SYNC) + /* + * Assume that when ``DMA_F_CAN_SKIP_SYNC`` is advertised, + * the conditions for synchronizing are the same as with + * the direct DMA. + */ + dev->dma_skip_sync = dev_is_dma_coherent(dev); + else + dev->dma_skip_sync = false; +} +#endif /* CONFIG_DMA_NEED_SYNC */ diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index b079a9a8e087..0b737eab4d48 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -1323,6 +1323,12 @@ phys_addr_t swiotlb_tbl_map_single(struct device *dev, phys_addr_t orig_addr, return (phys_addr_t)DMA_MAPPING_ERROR; } + /* + * If dma_skip_sync was set, reset it to false on first SWIOTLB buffer + * mapping to always sync SWIOTLB buffers. + */ + dma_clear_skip_sync(dev); + /* * Save away the mapping from the original address to the DMA address. * This is needed when we sync the memory. Then we sync the buffer if @@ -1640,6 +1646,8 @@ struct page *swiotlb_alloc(struct device *dev, size_t size) if (index == -1) return NULL; + dma_clear_skip_sync(dev); + tlb_addr = slot_addr(pool->start, index); return pfn_to_page(PFN_DOWN(tlb_addr));