Commit d00dc505 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

pkgdep/git: Bump ICE driver to latest release 



Landing with patches needed for >6.7 kernels.

Change-Id: I3a2631e8e254134c81ef94ffbc0b56e4363a4900
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21418


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
parent 15d11190

test/common/config/pkgdep/git

+8 −1
Original line number Diff line number Diff line
@@ -391,6 +391,13 @@ function install_ice() { 


	curl -L -o- "$ICE_DRIVER" | tar -C "$GIT_REPOS" -xzf -



	if ge "$kernel_ver" 6.7.0; then

		patch --dir="$GIT_REPOS/ice-$ICE_VERSION/src" \

			< "$rootdir/test/common/config/pkgdep/patches/ice/0001-devlink_fmsg.patch"

		patch --dir="$GIT_REPOS/ice-$ICE_VERSION/src" \

			< "$rootdir/test/common/config/pkgdep/patches/ice/0001-xdp_do_flush_map.patch"

	fi



	(

		cd "$GIT_REPOS/ice-$ICE_VERSION/src"

		sudo make -j"$(nproc)" install
@@ -484,7 +491,7 @@ function install_sources() { 


GIT_VERSION=2.25.1

IRDMA_VERSION=1.12.55

ICE_VERSION=1.12.7

ICE_VERSION=1.13.7



BPFTRACE_VERSION=${BPFTRACE_VERSION:-db63ddb}

VFIO_QEMU_BRANCH=${VFIO_QEMU_BRANCH:-vfio-user-p3.0}

test/common/config/pkgdep/patches/ice/0001-devlink_fmsg.patch

0 → 100644
+70 −0
Original line number Diff line number Diff line 
See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=db80d3b255

---

 src/ice_devlink.c | 43 ++++++++-----------------------------------

 1 file changed, 8 insertions(+), 35 deletions(-)



diff --git a/src/ice_devlink.c b/src/ice_devlink.c

index c2d129c..73bdc37 100644

--- a/src/ice_devlink.c

+++ b/src/ice_devlink.c

@@ -2717,49 +2717,22 @@ ice_mdd_reporter_dump(struct devlink_health_reporter *reporter,

 	struct ice_pf *pf = devlink_health_reporter_priv(reporter);

 	struct ice_mdd_reporter *mdd_reporter = &pf->mdd_reporter;

 	struct ice_mdd_event *mdd_event;

-	int err;

 

-	err = devlink_fmsg_u32_pair_put(fmsg, "count",

-					mdd_reporter->count);

-	if (err)

-		return err;

+	devlink_fmsg_u32_pair_put(fmsg, "count", mdd_reporter->count);

 

 	list_for_each_entry(mdd_event, &mdd_reporter->event_list, list) {

 		char *src;

 

-		err = devlink_fmsg_obj_nest_start(fmsg);

-		if (err)

-			return err;

+		devlink_fmsg_obj_nest_start(fmsg);

 

 		src = ICE_MDD_SRC_TO_STR(mdd_event->src);

 

-		err = devlink_fmsg_string_pair_put(fmsg, "src", src);

-		if (err)

-			return err;

-

-		err = devlink_fmsg_u8_pair_put(fmsg, "pf_num",

-					       mdd_event->pf_num);

-		if (err)

-			return err;

-

-		err = devlink_fmsg_u32_pair_put(fmsg, "mdd_vf_num",

-						mdd_event->vf_num);

-		if (err)

-			return err;

-

-		err = devlink_fmsg_u8_pair_put(fmsg, "mdd_event",

-					       mdd_event->event);

-		if (err)

-			return err;

-

-		err = devlink_fmsg_u32_pair_put(fmsg, "mdd_queue",

-						mdd_event->queue);

-		if (err)

-			return err;

-

-		err = devlink_fmsg_obj_nest_end(fmsg);

-		if (err)

-			return err;

+		devlink_fmsg_string_pair_put(fmsg, "src", src);

+		devlink_fmsg_u8_pair_put(fmsg, "pf_num", mdd_event->pf_num);

+		devlink_fmsg_u32_pair_put(fmsg, "mdd_vf_num", mdd_event->vf_num);

+		devlink_fmsg_u8_pair_put(fmsg, "mdd_event", mdd_event->event);

+		devlink_fmsg_u32_pair_put(fmsg, "mdd_queue", mdd_event->queue);

+		devlink_fmsg_obj_nest_end(fmsg);

 	}

 

 	return 0;

-- 

2.43.0

test/common/config/pkgdep/patches/ice/0001-xdp_do_flush_map.patch

0 → 100644
+61 −0
Original line number Diff line number Diff line 
See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=75cec20345

---

 src/ice_txrx_lib.c |  2 +-

 src/kcompat.h      |  3 ---

 src/kcompat_impl.h | 14 --------------

 3 files changed, 1 insertion(+), 18 deletions(-)



diff --git a/src/ice_txrx_lib.c b/src/ice_txrx_lib.c

index a392715..f7e26d9 100644

--- a/src/ice_txrx_lib.c

+++ b/src/ice_txrx_lib.c

@@ -382,7 +382,7 @@ int ice_xmit_xdp_buff(struct xdp_buff *xdp, struct ice_tx_ring *xdp_ring)

 void ice_finalize_xdp_rx(struct ice_rx_ring *rx_ring, unsigned int xdp_res)

 {

 	if (xdp_res & ICE_XDP_REDIR)

-		xdp_do_flush_map();

+		xdp_do_flush();

 

 	if (xdp_res & ICE_XDP_TX) {

 		struct ice_tx_ring *xdp_ring =

diff --git a/src/kcompat.h b/src/kcompat.h

index ad47afb..b31745d 100644

--- a/src/kcompat.h

+++ b/src/kcompat.h

@@ -2657,9 +2657,6 @@ static inline bool uuid_equal(const uuid_t *u1, const uuid_t *u2)

 #define from_timer(var, callback_timer, timer_fieldname) \

 	container_of(callback_timer, typeof(*var), timer_fieldname)

 

-#ifndef xdp_do_flush_map

-#define xdp_do_flush_map() do {} while (0)

-#endif

 struct _kc_xdp_buff {

 	void *data;

 	void *data_end;

diff --git a/src/kcompat_impl.h b/src/kcompat_impl.h

index 1af9f7f..0b98b7e 100644

--- a/src/kcompat_impl.h

+++ b/src/kcompat_impl.h

@@ -2150,20 +2150,6 @@ static inline void *__must_check krealloc_array(void *p,

 }

 #endif /* NEED_KREALLOC_ARRAY */

 

-/* NEED_XDP_DO_FLUSH

- *

- * Upstream commit 1d233886dd90 ("xdp: Use bulking for non-map XDP_REDIRECT

- * and consolidate code paths") replaced xdp_do_flush_map with xdp_do_flush

- * and 7f04bd109d4c ("net: Tree wide: Replace xdp_do_flush_map() with 

- * xdp_do_flush()") cleaned up related code.

- */

-#ifdef NEED_XDP_DO_FLUSH

-static inline void xdp_do_flush(void)

-{

-	xdp_do_flush_map();

-}

-#endif /* NEED_XDP_DO_FLUSH */

-

 #ifdef NEED_XDP_FEATURES

 enum netdev_xdp_act {

 	NETDEV_XDP_ACT_BASIC = 1,

--