From patchwork Mon Mar 25 23:20:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Schmidt X-Patchwork-Id: 13603153 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 A033A82D74 for ; Mon, 25 Mar 2024 23:21:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711408880; cv=none; b=iO/QfI5vXh8980JCOvy3+TYhURtB3f0ZAqCfDvOsajLlitHhOAdpvPHXcX/kmnxHEz9/JNuqkAHnG0pRLBuFLwrHTKyp3zIVpulv/nWR6JXAKqtfNIGAMlfCYotqDtrzB7GZ3VpvofXY0KtZXQJ9PTBf2k5Z6WYPYB83irO3kh0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711408880; c=relaxed/simple; bh=wJFRfGV8K7liyPfnKvzSO8Kd4P5q8g+CoB6Lfn2nafU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=hbtBf0u1TtimDILgdjc2pdE1oxb5bOWAkvVX3TDuou7TvKmLBVCRIc7Tamh7obMOghhFPUZ532cFFutiX8gf7LOQKbg4HRejghYXcCa8M2Lk0MtoXLWSb9LLCBv/W26E2gTi8ys+BnMpX8UzIFLdLXgf7nRTwxHunsj+yQoNmJw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=dth1Ym+y; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dth1Ym+y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711408877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hbyrW4oiu2K+eG+UkCoc4x4UhSK2JRbA091u/DQjSuw=; b=dth1Ym+y2hpktYKhnFsRPZdFH+dpABFhcIVbDr4KEz6xFn1b8MJ431dJ18LJblSd40blA4 hZBC4GrPr8qq453wot7I/Wm5SjkpdvjkQ7/Ui4zPYh0jiltlYgGFyVehO7JzCtodHtI6c6 uM1uFQumt4Y0gVxhZqmb/7NnYdGDNh4= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-628-cfZ_TQtiPGC5DJpskPnxvg-1; Mon, 25 Mar 2024 19:21:14 -0400 X-MC-Unique: cfZ_TQtiPGC5DJpskPnxvg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 749E63803905; Mon, 25 Mar 2024 23:21:13 +0000 (UTC) Received: from localhost.localdomain (unknown [10.45.225.113]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6226E1C060A4; Mon, 25 Mar 2024 23:21:10 +0000 (UTC) From: Michal Schmidt To: intel-wired-lan@lists.osuosl.org Cc: Jesse Brandeburg , Tony Nguyen , Richard Cochran , netdev@vger.kernel.org, Jacob Keller , Jiri Pirko , Arkadiusz Kubalewski , Karol Kolacinski , Marcin Szycik , Przemek Kitszel , "Temerkhanov, Sergey" Subject: [PATCH net-next v4 0/3] ice: lighter locking for PTP time reading Date: Tue, 26 Mar 2024 00:20:36 +0100 Message-ID: <20240325232039.76836-1-mschmidt@redhat.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Patchwork-Delegate: kuba@kernel.org This series removes the use of the heavy-weight PTP hardware semaphore in the gettimex64 path. Instead, serialization of access to the time register is done using a host-side spinlock. The timer hardware is shared between PFs on the PCI adapter, so the spinlock must be shared between ice_pf instances too. Replacing the PTP hardware semaphore entirely with a mutex is also possible and you can see it done in my git branch[1], but I am not posting those patches yet to keep the scope of this series limited. [1] https://gitlab.com/mschmidt2/linux/-/commits/ice-ptp-host-side-lock-10 v4: - Patch 1: Use named GENMASK macros and FIELD_PREP. v3: - Longer variable name ("a" -> "adapter"). - Propagate xarray error in ice_adapter_get with ERR_PTR. - Added kernel-doc comments for ice_adapter_{get,put}. v2: - Patch 1: Rely on xarray's own lock. (Suggested by Jiri Pirko) - Patch 2: Do not use *_irqsave with ptp_gltsyn_time_lock, as it's used only in process contexts. Michal Schmidt (3): ice: add ice_adapter for shared data across PFs on the same NIC ice: avoid the PTP hardware semaphore in gettimex64 path ice: fold ice_ptp_read_time into ice_ptp_gettimex64 drivers/net/ethernet/intel/ice/Makefile | 3 +- drivers/net/ethernet/intel/ice/ice.h | 2 + drivers/net/ethernet/intel/ice/ice_adapter.c | 116 +++++++++++++++++++ drivers/net/ethernet/intel/ice/ice_adapter.h | 28 +++++ drivers/net/ethernet/intel/ice/ice_main.c | 8 ++ drivers/net/ethernet/intel/ice/ice_ptp.c | 33 +----- drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 3 + 7 files changed, 163 insertions(+), 30 deletions(-) create mode 100644 drivers/net/ethernet/intel/ice/ice_adapter.c create mode 100644 drivers/net/ethernet/intel/ice/ice_adapter.h Reviewed-by: Ivan Vecera