From patchwork Thu Jun 27 13:17:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Fijalkowski X-Patchwork-Id: 13714409 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (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 838E1194080 for ; Thu, 27 Jun 2024 13:18:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719494332; cv=none; b=i0uMCHp80iUT2SVBPx57qvK91ziWZtzIsSzJUkRcMTx3VZ+mHwmNd7tQW3Bo8HPX/MHK42mj8w6tEZNgkhdOOiiWPjpW1d/nPE/xZqTf+T59Bp+2D+xMvHrtEt9GdQXvOF+J3MeuiwBnnzSEsD0RlsTgmh7uOSEtsc9rSsRuDXU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719494332; c=relaxed/simple; bh=viO5XI96M+PbIpbkreqWu8b1pRiHeRHqbTu9yjFxQ64=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AmXHSva2migeaTfEm+1mI+JoJj2IvZCnAIs3JKYNvsfMdyzRksonPxJuLCNlmf6ZmT0vkP24u4t6ApTWgetys+78haLlMZH0N1tYKjTIWjWafqgoWNURCWr3nvljpZmsutTStOknBCdG79rGeLXafF63wNtHbIWkZBH+9lw5WKU= 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=bFagaGMN; arc=none smtp.client-ip=198.175.65.19 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="bFagaGMN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1719494331; x=1751030331; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=viO5XI96M+PbIpbkreqWu8b1pRiHeRHqbTu9yjFxQ64=; b=bFagaGMNwsKyko8AfdW2qBn4nuFDNTvV8a2z1HtBjbUKwaot0IYtGTYF uYXg9l3SovLQ87y2ppBPefjrQ+oZiXPrMZsrEz20o3Lum/0syhwS2g03t FMsinK7rE9lLBaiZPeOMn+lMB8J9sQeIOy2PYKwAHNhhKu9I+9GjQ3mA/ adVe2fmfGLSyd5T5a8pkIxPR4F4A+ACb4TzczvcdTO69u3pDC56f5yYzp J0TL240hCWBotbfUBvWBrYy1yK4m2TdAdyidGXl9Ld+Ys3jANDd17sCw2 nydA8xw0niJ0SayoiC/68TRlcjhgVZgWkvg7tG5Fjz+PyOTyXf4CcW/pp Q==; X-CSE-ConnectionGUID: 3AK2RIOtQrmKFh0CiT757Q== X-CSE-MsgGUID: nimusXjvSxmY5nuoOGg77A== X-IronPort-AV: E=McAfee;i="6700,10204,11115"; a="16452348" X-IronPort-AV: E=Sophos;i="6.09,166,1716274800"; d="scan'208";a="16452348" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jun 2024 06:18:51 -0700 X-CSE-ConnectionGUID: s3RCCzWCRau1ixNO7Jg5Aw== X-CSE-MsgGUID: RNXYHP2ZTz+RtQe7/At6zQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,166,1716274800"; d="scan'208";a="49315387" Received: from boxer.igk.intel.com ([10.102.20.173]) by orviesa003.jf.intel.com with ESMTP; 27 Jun 2024 06:18:48 -0700 From: Maciej Fijalkowski To: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, anthony.l.nguyen@intel.com, magnus.karlsson@intel.com, larysa.zaremba@intel.com, jacob.e.keller@intel.com, aleksander.lobakin@intel.com, michal.kubiak@intel.com, Maciej Fijalkowski , Shannon Nelson , Chandan Kumar Rout Subject: [PATCH v4 iwl-net 3/8] ice: replace synchronize_rcu with synchronize_net Date: Thu, 27 Jun 2024 15:17:52 +0200 Message-Id: <20240627131757.144991-4-maciej.fijalkowski@intel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20240627131757.144991-1-maciej.fijalkowski@intel.com> References: <20240627131757.144991-1-maciej.fijalkowski@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Given that ice_qp_dis() is called under rtnl_lock, synchronize_net() can be called instead of synchronize_rcu() so that XDP rings can finish its job in a faster way. Also let us do this as earlier in XSK queue disable flow. Additionally, turn off regular Tx queue before disabling irqs and NAPI. Fixes: 2d4238f55697 ("ice: Add support for AF_XDP") Reviewed-by: Shannon Nelson Tested-by: Chandan Kumar Rout (A Contingent Worker at Intel) Signed-off-by: Maciej Fijalkowski --- drivers/net/ethernet/intel/ice/ice_xsk.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c index 3104a5657b83..ba50af9a5929 100644 --- a/drivers/net/ethernet/intel/ice/ice_xsk.c +++ b/drivers/net/ethernet/intel/ice/ice_xsk.c @@ -52,10 +52,8 @@ static void ice_qp_reset_stats(struct ice_vsi *vsi, u16 q_idx) static void ice_qp_clean_rings(struct ice_vsi *vsi, u16 q_idx) { ice_clean_tx_ring(vsi->tx_rings[q_idx]); - if (ice_is_xdp_ena_vsi(vsi)) { - synchronize_rcu(); + if (ice_is_xdp_ena_vsi(vsi)) ice_clean_tx_ring(vsi->xdp_rings[q_idx]); - } ice_clean_rx_ring(vsi->rx_rings[q_idx]); } @@ -180,11 +178,12 @@ static int ice_qp_dis(struct ice_vsi *vsi, u16 q_idx) usleep_range(1000, 2000); } + synchronize_net(); + netif_tx_stop_queue(netdev_get_tx_queue(vsi->netdev, q_idx)); + ice_qvec_dis_irq(vsi, rx_ring, q_vector); ice_qvec_toggle_napi(vsi, q_vector, false); - netif_tx_stop_queue(netdev_get_tx_queue(vsi->netdev, q_idx)); - ice_fill_txq_meta(vsi, tx_ring, &txq_meta); err = ice_vsi_stop_tx_ring(vsi, ICE_NO_RESET, 0, tx_ring, &txq_meta); if (err)