From nobody Thu Oct 2 10:57:10 2025 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AD562278E67 for ; Wed, 17 Sep 2025 14:18:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758118693; cv=none; b=ZgeLjI+X21lE2FSDvmc8cQ+3hdVt0oFwj266Fw80+wkLIRS42hbOVptckBz70xBfJmKdQ54u0ZNowJl5eaxCBUmxoHQU4snpePQSzoPYQBC74n5dFtmkvzYj2G52S9dqFnMfUu2W3GB9LCEKZ4B3WaPIXyf2m7x9iutsff2EU9o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758118693; c=relaxed/simple; bh=rijBXGyPPRI7zVY1PE5cIgzPuGwv03123CnIu1WqQ/c=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Naa698w2t/dkb7+QMurGHLFXQsSRNLgngmIz2tG7thuOn3/FReJBMpFfgLB7trCjDyZZHTVXV96BaekwSr26OdpERSvQpEJUNOzleNTCnp/WuDMKnn20cr72VppjF5L0nW2ghzuFK+YxGWFyGcVBCJ6wvGxhIgYgcTa3tOzsbbg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Dvs2nOWu; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Dvs2nOWu" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-266fa7a0552so32232155ad.3 for ; Wed, 17 Sep 2025 07:18:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758118690; x=1758723490; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=TRTCbDx6myQFWxAdWRCj4l7Pp4fnr8OTe0kIEsi/f/4=; b=Dvs2nOWuewo9eig8ugL9pyqkIcrBBUrd2zukXvCI+S02addnY3DPFGpGDbhyLDptoR g6bqOMnbk+QI49oi1OE24WPSveEYFFqYkTzlMvz6aIHf/R/k6XN+IuODlZ5FdwNehUZE gXrBjvB3VR1F3uNn/ByAJbRUJ+hh3yGCU81Z13rKxr6jev214yujd1ftqPlxRWviGZM/ qqAa8STgkQ+Eed9oTQJNt24vwdcVBGvfbsw8OCJD50zcYS6rk3t+GuV5BZ+vvHWmIKAd aZSjjNH/MBMhKE8WXyGg7N7APw8rT6UNWHaFFXQL5oLUKuuY+Y9sOxGbr1sLDMaa3zkk TNzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758118690; x=1758723490; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=TRTCbDx6myQFWxAdWRCj4l7Pp4fnr8OTe0kIEsi/f/4=; b=C32dGR8a93r8PL8p4jGqpGse88xvShUN60wF5ia0X0mAMCLYiUXdX394SMF/lL4otO jW+/txJm0oW9/G6s+ieX/ngs1/uBxf3Hz6ydQG2aawz1/9inFY5dJ5PAEemuLV4zT3Yj 9OmRsH6zpePnfpBb/Ovc4Fq16AR1Ly/hCojVkIWUQZNb1loZOfVJOMqJsST3zE+2N2qj 0VvZBN1judoLUzTX7MHaJCvP4r/GQVEbXDOK3ySvPlZ3H/MJsqQuVPk6BGPzvfuRSjEh z0hHAiTj4GvvdN0eILkx9wyPY+rWdBNFGCAqV0KZdC3OZh4Co5YhDHNgkt/5wMQ+0lgv 8Xfw== X-Forwarded-Encrypted: i=1; AJvYcCWOxW+1EavU3ECJvXwUcUxc5UWJyxVnfhyl+Rds6FGzMPYsHHFWeFv8fOfG1V3fWlD7NYNWvGRiDJaw51I=@vger.kernel.org X-Gm-Message-State: AOJu0YzyurXfjYy/iZF5mO1atuQ9+BYkb5smAEhfHmdios53lnSkP4+q GEz4GlaiGOciAAoNARCAnIU4HZmEFt7PWvlqEwwi70AaWNZj/Y9zEnwO X-Gm-Gg: ASbGncswloQFWIYLZwz9R6w0TZoRJYzLeS9sAY5dh7jMcWEEi2LXnZd9Wep5GlBI2EZ 0MQHdUoq0OZZIKpl2nnw3+bpJ1c9v/Lw2WEPHcVpiuZupa1xNJ75FVBuZ9C1RUrPnd5kqR04a85 4Hmn8e3o36GBIJv5C7vEcbsZV1GPezrgVsQnpJTUKzZRQA54+CUu5vzORlJRX59Wg/5O2oRy4sZ xF16z03OiFWcxXB3lxvLHfTtU3zAVkJ/hHqZv0WR/kmkJU8B1l3763bZgbnT2C8KsLG2z1wCxqo b9nQ7jucjKfGXiNdi+1ZTGghYO9cYbMOX6EizKafE/jHEJdT0yt9Gsg4GlneTeq3/qHehJkX2zt Tx9/iXC247PYdQZ15k1zBdWUAYych37O5 X-Google-Smtp-Source: AGHT+IF+FxnnVbL96kb6pRnRNwKlX+NEALRG1IpYvbainoyd6nXRnmkIYrgpnMijmi2HscnYoH8gYg== X-Received: by 2002:a17:902:d509:b0:24c:ea17:e322 with SMTP id d9443c01a7336-268118b3f86mr27269085ad.3.1758118689645; Wed, 17 Sep 2025 07:18:09 -0700 (PDT) Received: from localhost ([216.228.125.129]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-32ed26f583esm2663438a91.27.2025.09.17.07.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Sep 2025 07:18:08 -0700 (PDT) From: "Yury Norov (NVIDIA)" To: James Smart , Dick Kennedy , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Yury Norov (NVIDIA)" Subject: [PATCH] scsi: lpfc: rework lpfc_sli4_fcf_rr_next_index_get() Date: Wed, 17 Sep 2025 10:18:05 -0400 Message-ID: <20250917141806.661826-1-yury.norov@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The function opencodes for_each_set_bit_wrap(). Use it, and while there switch from goto-driven codeflow to more high-level constructions. Signed-off-by: Yury Norov (NVIDIA) --- drivers/scsi/lpfc/lpfc_sli.c | 62 +++++++++++------------------------- 1 file changed, 18 insertions(+), 44 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index a8fbdf7119d8..9a2b821adfaa 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -20370,62 +20370,36 @@ lpfc_check_next_fcf_pri_level(struct lpfc_hba *ph= ba) uint16_t lpfc_sli4_fcf_rr_next_index_get(struct lpfc_hba *phba) { - uint16_t next_fcf_index; + uint16_t next; =20 -initial_priority: - /* Search start from next bit of currently registered FCF index */ - next_fcf_index =3D phba->fcf.current_rec.fcf_indx; - -next_priority: - /* Determine the next fcf index to check */ - next_fcf_index =3D (next_fcf_index + 1) % LPFC_SLI4_FCF_TBL_INDX_MAX; - next_fcf_index =3D find_next_bit(phba->fcf.fcf_rr_bmask, - LPFC_SLI4_FCF_TBL_INDX_MAX, - next_fcf_index); + do { + for_each_set_bit_wrap(next, phba->fcf.fcf_rr_bmask, + LPFC_SLI4_FCF_TBL_INDX_MAX, phba->fcf.current_rec.fcf_indx) { + if (next =3D=3D phba->fcf.current_rec.fcf_indx) + continue; =20 - /* Wrap around condition on phba->fcf.fcf_rr_bmask */ - if (next_fcf_index >=3D LPFC_SLI4_FCF_TBL_INDX_MAX) { - /* - * If we have wrapped then we need to clear the bits that - * have been tested so that we can detect when we should - * change the priority level. - */ - next_fcf_index =3D find_first_bit(phba->fcf.fcf_rr_bmask, - LPFC_SLI4_FCF_TBL_INDX_MAX); - } + if (phba->fcf.fcf_pri[next].fcf_rec.flag & LPFC_FCF_FLOGI_FAILED =3D=3D= 0) { + lpfc_printf_log(phba, KERN_INFO, LOG_FIP, + "2845 Get next roundrobin failover FCF (x%x)\n", next); + return next; + } =20 + if (list_is_singular(&phba->fcf.fcf_pri_list)) + return LPFC_FCOE_FCF_NEXT_NONE; + } =20 - /* Check roundrobin failover list empty condition */ - if (next_fcf_index >=3D LPFC_SLI4_FCF_TBL_INDX_MAX || - next_fcf_index =3D=3D phba->fcf.current_rec.fcf_indx) { /* * If next fcf index is not found check if there are lower * Priority level fcf's in the fcf_priority list. * Set up the rr_bmask with all of the avaiable fcf bits * at that level and continue the selection process. */ - if (lpfc_check_next_fcf_pri_level(phba)) - goto initial_priority; - lpfc_printf_log(phba, KERN_WARNING, LOG_FIP, - "2844 No roundrobin failover FCF available\n"); - - return LPFC_FCOE_FCF_NEXT_NONE; - } - - if (next_fcf_index < LPFC_SLI4_FCF_TBL_INDX_MAX && - phba->fcf.fcf_pri[next_fcf_index].fcf_rec.flag & - LPFC_FCF_FLOGI_FAILED) { - if (list_is_singular(&phba->fcf.fcf_pri_list)) - return LPFC_FCOE_FCF_NEXT_NONE; + } while (lpfc_check_next_fcf_pri_level(phba)); =20 - goto next_priority; - } - - lpfc_printf_log(phba, KERN_INFO, LOG_FIP, - "2845 Get next roundrobin failover FCF (x%x)\n", - next_fcf_index); + lpfc_printf_log(phba, KERN_WARNING, LOG_FIP, + "2844 No roundrobin failover FCF available\n"); =20 - return next_fcf_index; + return LPFC_FCOE_FCF_NEXT_NONE; } =20 /** --=20 2.43.0