From nobody Thu May 23 05:37:27 2024
X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VlH4R3vNsz5H9pd;
Thu, 23 May 2024 05:37:27 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4VlH4R1S8Gz4Phc;
Thu, 23 May 2024 05:37:27 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1716442647;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=yRAGJs5JpHPdPUKLGSP+ozy6alOPIkm2kLdRxI60WeY=;
b=HOCI+ALxsFJ+PKMCDHpisUt5NcTUlmAx5WWMh2lObjDf6RyYmpIb2h+g95HDq2b9PIPjFh
F54xRM3rBYoOA+qK96zHG9j4YIkJ7h5WzcBJuFVeRcI8UtTuvU0ZfmFMTsRnraA5viaqH1
lAQGDaHVArHwIUXqs4nnzG1J39EL9DqWbGcrUCZ1W0OSYll/9rixO4/OUIjeGRYGXOoTCa
O/9Gt4Ci0FgcGxCFtRvj/gD4X+V/BFOGdnYakE7vSFs628e0tv+/X4BNF3e+qqaxEpEntw
zkIuYzKpjLEVUDuowajFriU4AjVJZ3sduImmcP1Gfbd8ASSfeM3YHgpnSOfHcg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716442647; a=rsa-sha256; cv=none;
b=kjbOfpvtGMCx/nqcN8lDcyRdDjhBdXkKxRE0TpuE+fOr1ZoS8PedMfY7GRgfnNWb778zjR
tjwTCVvPGWem6AW0cH6oGN2onGfCkuYN7DEi0R1NIw73jmLmQ+XAtMr3DfwgxNZ736KyDx
2Zvqh4EzrYne/L49/AaZmfdc3dBToLCjn7k/SeGMdcZO6/ztxJolvGVqngmmcGk3iWbBmp
yY9tTiHJGynaTcusIUCJ5d21hc9LEE4K2RZ+BlT+YfMsnUcSm5fkvNZZEM3CJgaApoZHIt
ldg2xmwFvbd5yGPwFJcQpzsAR2QShKkBNuLcZ97A6z1e35Ck810W/v0QD30cHg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1716442647;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=yRAGJs5JpHPdPUKLGSP+ozy6alOPIkm2kLdRxI60WeY=;
b=AhO0dCcZG3f/u53ddIeHDcMX3ltA+vSXmQKbPGTGqlE2HOjP2eJobG5aY4LJD7k9iJI/Jl
se47poFt0db97nyMbRDtaF1/DrmtRniprxQLIBfja0/AsauF+otb8fsKrjjwCWE7HTxxsD
ebu8TWBH53BQhmLsqkFiXiDZYRAzzbYVo3cl0T6IDwldI51NdWGw93W0myS9h5Hks0+Ma5
JoypCL2AFWU9nukUBFGzWduoFumxDyjG4vcbp0BAMu8AYn36LRpH6CuSolNzoOXcLeyzFn
nJiyRsJPf2wlK0kgnx5n+wRDZKV9dKG8UITiRU/ffE4Opbmx2Z+Svqy6l1ZH5A==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VlH4R149lzckY;
Thu, 23 May 2024 05:37:27 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44N5bRej047947;
Thu, 23 May 2024 05:37:27 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44N5bR45047944;
Thu, 23 May 2024 05:37:27 GMT
(envelope-from git)
Date: Thu, 23 May 2024 05:37:27 GMT
Message-Id: <202405230537.44N5bR45047944@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Marko Zec <zec@FreeBSD.org>
Subject: git: 47fb63a288cd - releng/14.1 - fib_dxr: move the bulko
of malloc() failure logging into dxr_build()
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-branches@freebsd.org
Sender: owner-dev-commits-src-branches@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: zec
X-Git-Repository: src
X-Git-Refname: refs/heads/releng/14.1
X-Git-Reftype: branch
X-Git-Commit: 47fb63a288cd2cd75b4a74c36f26a29dfcd2655f
Auto-Submitted: auto-generated
The branch releng/14.1 has been updated by zec:
URL: https://cgit.FreeBSD.org/src/commit/?id=47fb63a288cd2cd75b4a74c36f26a29dfcd2655f
commit 47fb63a288cd2cd75b4a74c36f26a29dfcd2655f
Author: Marko Zec <zec@FreeBSD.org>
AuthorDate: 2024-05-07 15:11:30 +0000
Commit: Marko Zec <zec@FreeBSD.org>
CommitDate: 2024-05-23 04:27:33 +0000
fib_dxr: move the bulko of malloc() failure logging into dxr_build()
Approved by: re (cperciva)
(cherry picked from commit e474704b9c49dda12e2afff2ae05f972207e21d7)
---
sys/netinet/in_fib_dxr.c | 77 +++++++++++++++++++-----------------------------
1 file changed, 30 insertions(+), 47 deletions(-)
diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c
index dcd13a249dd3..69332b859099 100644
--- a/sys/netinet/in_fib_dxr.c
+++ b/sys/netinet/in_fib_dxr.c
@@ -497,8 +497,11 @@ chunk_ref(struct dxr_aux *da, uint32_t chunk)
da->range_tbl = realloc(da->range_tbl,
sizeof(*da->range_tbl) * da->rtbl_size + FRAGS_PREF_SHORT,
M_DXRAUX, M_NOWAIT);
- if (da->range_tbl == NULL)
+ if (da->range_tbl == NULL) {
+ FIB_PRINTF(LOG_NOTICE, da->fd,
+ "Unable to allocate DXR range table");
return (1);
+ }
}
return (0);
@@ -632,8 +635,11 @@ trie_ref(struct dxr_aux *da, uint32_t index)
da->xtbl_size += XTBL_SIZE_INCR;
da->x_tbl = realloc(da->x_tbl,
sizeof(*da->x_tbl) * da->xtbl_size, M_DXRAUX, M_NOWAIT);
- if (da->x_tbl == NULL)
+ if (da->x_tbl == NULL) {
+ FIB_PRINTF(LOG_NOTICE, da->fd,
+ "Unable to allocate DXR extension table");
return (-1);
+ }
}
return(tp->td_index);
}
@@ -873,8 +879,11 @@ dxr_build(struct dxr *dxr)
if (da == NULL) {
da = malloc(sizeof(*dxr->aux), M_DXRAUX, M_NOWAIT);
- if (da == NULL)
+ if (da == NULL) {
+ FIB_PRINTF(LOG_NOTICE, dxr->fd,
+ "Unable to allocate DXR aux struct");
return;
+ }
dxr->aux = da;
da->fibnum = dxr->fibnum;
da->fd = dxr->fd;
@@ -895,16 +904,22 @@ dxr_build(struct dxr *dxr)
if (da->range_tbl == NULL) {
da->range_tbl = malloc(sizeof(*da->range_tbl) * da->rtbl_size
+ FRAGS_PREF_SHORT, M_DXRAUX, M_NOWAIT);
- if (da->range_tbl == NULL)
+ if (da->range_tbl == NULL) {
+ FIB_PRINTF(LOG_NOTICE, da->fd,
+ "Unable to allocate DXR range table");
return;
+ }
range_rebuild = 1;
}
#ifdef DXR2
if (da->x_tbl == NULL) {
da->x_tbl = malloc(sizeof(*da->x_tbl) * da->xtbl_size,
M_DXRAUX, M_NOWAIT);
- if (da->x_tbl == NULL)
+ if (da->x_tbl == NULL) {
+ FIB_PRINTF(LOG_NOTICE, da->fd,
+ "Unable to allocate DXR extension table");
return;
+ }
trie_rebuild = 1;
}
#endif
@@ -1039,8 +1054,11 @@ dxr2_try_squeeze:
#endif
dxr->d = malloc(dxr_tot_size, M_DXRLPM, M_NOWAIT);
- if (dxr->d == NULL)
+ if (dxr->d == NULL) {
+ FIB_PRINTF(LOG_NOTICE, da->fd,
+ "Unable to allocate DXR lookup table");
return;
+ }
#ifdef DXR2
memcpy(dxr->d, da->d_tbl, d_size);
dxr->x = ((char *) dxr->d) + d_size;
@@ -1119,7 +1137,8 @@ dxr_init(uint32_t fibnum, struct fib_data *fd, void *old_data, void **data)
dxr = malloc(sizeof(*dxr), M_DXRAUX, M_NOWAIT);
if (dxr == NULL) {
- FIB_PRINTF(LOG_NOTICE, fd, "Unable to allocate DXR struct");
+ FIB_PRINTF(LOG_NOTICE, fd,
+ "Unable to allocate DXR container struct");
return (FLM_REBUILD);
}
@@ -1212,41 +1231,11 @@ dxr_dump_end(void *data, struct fib_dp *dp)
dxr_build(dxr);
da = dxr->aux;
- if (da == NULL) {
- /* malloc(, M_DXRAUX, M_NOWAIT) failed, retry later */
- FIB_PRINTF(LOG_NOTICE, dxr->fd,
- "Unable to allocate DXR aux struct");
+ if (da == NULL || dxr->d == NULL)
return (FLM_REBUILD);
- }
- if (da->range_tbl == NULL) {
- /* malloc(, M_DXRAUX, M_NOWAIT) failed, retry later */
- FIB_PRINTF(LOG_NOTICE, dxr->fd,
- "Unable to allocate DXR range table");
- return (FLM_REBUILD);
- }
-
-#ifdef DXR2
- if (da->x_tbl == NULL) {
- /* malloc(, M_DXRAUX, M_NOWAIT) failed, retry later */
- FIB_PRINTF(LOG_NOTICE, dxr->fd,
- "Unable to allocate DXR extension table");
- return (FLM_REBUILD);
- }
-#endif
-
- if (da->rtbl_top >= BASE_MAX) {
- /* Structural limit exceeded, hard error */
- FIB_PRINTF(LOG_ERR, dxr->fd, "DXR structural limit exceeded");
+ if (da->rtbl_top >= BASE_MAX)
return (FLM_ERROR);
- }
-
- if (dxr->d == NULL) {
- /* malloc(, M_DXRLPM, M_NOWAIT) failed, retry later */
- FIB_PRINTF(LOG_NOTICE, dxr->fd,
- "Unable to allocate DXR lookup table");
- return (FLM_REBUILD);
- }
dp->f = choose_lookup_fn(da);
dp->arg = dxr;
@@ -1334,18 +1323,11 @@ dxr_change_rib_batch(struct rib_head *rnh, struct fib_change_queue *q,
dxr_build(new_dxr);
/* Structural limit exceeded, hard error */
- if (da->rtbl_top >= BASE_MAX) {
- /* Structural limit exceeded, hard error */
- dxr_destroy(new_dxr);
- FIB_PRINTF(LOG_ERR, dxr->fd, "DXR structural limit exceeded");
+ if (da->rtbl_top >= BASE_MAX)
return (FLM_ERROR);
- }
if (new_dxr->d == NULL) {
- /* malloc(, M_DXRLPM, M_NOWAIT) failed, retry later */
dxr_destroy(new_dxr);
- FIB_PRINTF(LOG_NOTICE, dxr->fd,
- "Unable to allocate DXR lookup table");
return (FLM_REBUILD);
}
@@ -1357,6 +1339,7 @@ dxr_change_rib_batch(struct rib_head *rnh, struct fib_change_queue *q,
return (FLM_SUCCESS);
}
+ FIB_PRINTF(LOG_NOTICE, dxr->fd, "fib_set_datapath_ptr() failed");
dxr_destroy(new_dxr);
return (FLM_REBUILD);
}