From patchwork Tue Sep 6 04:29:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Mendoza-Jonas X-Patchwork-Id: 666208 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sSttS0TD9z9s36 for ; Tue, 6 Sep 2016 14:30:08 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b=IO7+Hqew; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sSttR6XGzzDrq2 for ; Tue, 6 Sep 2016 14:30:07 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b=IO7+Hqew; dkim-atps=neutral X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Received: from mendozajonas.com (mendozajonas.com [188.166.185.233]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3sSttM0q0TzDrpp for ; Tue, 6 Sep 2016 14:30:03 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b=IO7+Hqew; dkim-atps=neutral Received: from skellige.ozlabs.ibm.com (unknown [122.99.82.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: sam@mendozajonas.com) by mendozajonas.com (Postfix) with ESMTPSA id 0BFF914005E; Tue, 6 Sep 2016 12:29:59 +0800 (SGT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mendozajonas.com; s=mail; t=1473136200; bh=Efg8gjArrbZaRG2ptIg1rp67VjVuxXti5HOUPyY0X/Y=; h=From:To:Cc:Subject:Date:From; b=IO7+Hqew/+us7KDzNZmnbBoGjD3CmqLemoDUvEW2E9rcuDLECnRMCr3TNPQSoG2Nv 0RLU4ZdfJyEiRS33FoixTkrJTftHH8mc92GkwWhQg8HBVCS6Dy4QFZrUP0T8KAvcVx dplt832snHHsoFK8Y16rKDr1uY5n7HWhJKgNj9h4= From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [PATCH 1/2] discover: Avoid writing network overrides to NVRAM Date: Tue, 6 Sep 2016 14:29:52 +1000 Message-Id: <20160906042953.30304-1-sam@mendozajonas.com> X-Mailer: git-send-email 2.9.3 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Mendoza-Jonas MIME-Version: 1.0 Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" Explicitly keep track of whether the current interface config was set by an IPMI network override, and avoid overwriting any saved config unless the override was marked persistent. Signed-off-by: Samuel Mendoza-Jonas --- discover/ipmi.c | 1 + discover/platform-powerpc.c | 9 +++++++++ lib/pb-config/pb-config.c | 1 + lib/pb-protocol/pb-protocol.c | 9 +++++++++ lib/types/types.h | 1 + 5 files changed, 21 insertions(+) diff --git a/discover/ipmi.c b/discover/ipmi.c index 38423b2..2aaf114 100644 --- a/discover/ipmi.c +++ b/discover/ipmi.c @@ -309,6 +309,7 @@ int parse_ipmi_interface_override(struct config *config, uint8_t *buf, i += ipsize; } + ifconf->override = true; pb_log("Applying IPMI network interface override\n"); /* Replace any existing interface config */ diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c index 8fca5bd..2b89121 100644 --- a/discover/platform-powerpc.c +++ b/discover/platform-powerpc.c @@ -635,6 +635,15 @@ static void update_network_config(struct platform_powerpc *platform, unsigned int i; char *val; + /* + * Don't store IPMI overrides to NVRAM. If this was a persistent + * override it was already stored in NVRAM by + * get_ipmi_network_override() + */ + if (config->network.n_interfaces && + config->network.interfaces[0]->override) + return; + val = talloc_strdup(platform, ""); for (i = 0; i < config->network.n_interfaces; i++) { diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c index 52a43b1..581d70f 100644 --- a/lib/pb-config/pb-config.c +++ b/lib/pb-config/pb-config.c @@ -33,6 +33,7 @@ static struct interface_config *config_copy_interface(struct config *ctx, talloc_strdup(dest, src->static_config.url); break; } + dest->override = src->override; return dest; } diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c index 1560ef7..706aec9 100644 --- a/lib/pb-protocol/pb-protocol.c +++ b/lib/pb-protocol/pb-protocol.c @@ -283,6 +283,8 @@ static int pb_protocol_interface_config_len(struct interface_config *conf) len += 4 + optional_strlen(conf->static_config.url); } + len += 4 /* conf->override */; + return len; } @@ -511,6 +513,9 @@ static int pb_protocol_serialise_config_interface(char *buf, conf->static_config.url); } + *(uint32_t *)pos = conf->override; + pos += 4; + return pos - buf; } @@ -1019,6 +1024,10 @@ static int pb_protocol_deserialise_config_interface(const char **buf, return -1; } + if (read_u32(buf, len, &tmp)) + return -1; + iface->override = !!tmp; + return 0; } diff --git a/lib/types/types.h b/lib/types/types.h index 6b607cd..7b9269b 100644 --- a/lib/types/types.h +++ b/lib/types/types.h @@ -129,6 +129,7 @@ struct interface_config { char *url; } static_config; }; + bool override; }; struct network_config {