From: Sarosh Arif <sarosh.arif@emumba.com> To: dev@dpdk.org, thomas@monjalon.net Cc: m.bilal@emumba.com, stable@dpdk.org, john.mcnamara@intel.com, Sarosh Arif <sarosh.arif@emumba.com> Subject: [dpdk-stable] [PATCH v3] usertools/dpdk-setup.sh: fix dpdk-setup's behaviour on non-alphanumeric inputs Date: Mon, 1 Jun 2020 13:40:28 +0500 Message-ID: <20200601084028.20872-1-sarosh.arif@emumba.com> (raw) In-Reply-To: <20200320065002.5410-1-sarosh.arif@emumba.com> Combine https://patches.dpdk.org/patch/67855/ with v2 of this patch to fix the overall behaviour of dpdk-setup.sh on non-alphanumeric inputs. Instead of crashing the script will prompt the user to re-enter the input in case of non-alphanumberic input. Bugzilla ID: 419 Signed-off-by: Sarosh Arif <sarosh.arif@emumba.com> Muhammad Bilal <m.bilal@emumba.com> --- usertools/dpdk-setup.sh | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/usertools/dpdk-setup.sh b/usertools/dpdk-setup.sh index e5bbe9fee..c18a6f3ee 100755 --- a/usertools/dpdk-setup.sh +++ b/usertools/dpdk-setup.sh @@ -320,14 +320,18 @@ set_non_numa_pages() echo " enter '64' to reserve 64 * 2MB pages" echo -n "Number of pages: " read Pages + numeric="^[[:digit:]]+$" + PG_PATH="/sys/kernel/mm/hugepages/hugepages-${HUGEPGSZ}" + if [[ $Pages =~ $numeric ]]; then + echo "echo $Pages > $PG_PATH/nr_hugepages" > .echo_tmp + echo "Reserving hugepages" + sudo sh .echo_tmp + rm -f .echo_tmp + create_mnt_huge + else + echo "Please enter a numeric value" + fi - echo "echo $Pages > /sys/kernel/mm/hugepages/hugepages-${HUGEPGSZ}/nr_hugepages" > .echo_tmp - - echo "Reserving hugepages" - sudo sh .echo_tmp - rm -f .echo_tmp - - create_mnt_huge } # @@ -343,10 +347,16 @@ set_numa_pages() echo " enter '64' to reserve 64 * 2MB pages on each node" echo > .echo_tmp + numeric="^[[:digit:]]+$" for d in /sys/devices/system/node/node? ; do node=$(basename $d) echo -n "Number of pages for $node: " read Pages + while [[ ! "$Pages" =~ $numeric ]]; do + echo "Please enter a numeric value" + echo -n "Number of pages for $node: " + read Pages + done echo "echo $Pages > $d/hugepages/hugepages-${HUGEPGSZ}/nr_hugepages" >> .echo_tmp done echo "Reserving hugepages" @@ -595,7 +605,11 @@ while [ "$QUIT" == "0" ]; do echo -n "Option: " read our_entry echo "" - echo -n "Option: " - read our_entry + read -p "Option: " our_entry + [ $? -eq 0 ] || exit 0 + echo "" - ${OPTIONS[our_entry]} ${our_entry} - + numeric="^[[:digit:]]+$" + if [[ "$our_entry" =~ $numeric ]]; then + ${OPTIONS[our_entry]} ${our_entry} + else + echo "Please enter a numeric value" + fi + if [ "$QUIT" == "0" ] ; then echo -- 2.17.1
next prev parent reply other threads:[~2020-06-01 8:42 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20200319174423.28378> 2020-03-20 6:50 ` [dpdk-stable] [PATCH v2] " Sarosh Arif 2020-04-17 12:50 ` Sarosh Arif 2020-05-24 17:04 ` Thomas Monjalon 2020-06-01 8:40 ` Sarosh Arif [this message] 2020-06-02 7:38 ` [dpdk-stable] [PATCH v4] " Sarosh Arif 2020-07-23 12:13 ` Sarosh Arif 2020-07-23 17:00 ` [dpdk-stable] [dpdk-dev] " Stephen Hemminger 2020-07-24 13:29 ` Thomas Monjalon 2020-07-24 14:05 ` Jerin Jacob 2020-11-26 17:54 ` Thomas Monjalon
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200601084028.20872-1-sarosh.arif@emumba.com \ --to=sarosh.arif@emumba.com \ --cc=dev@dpdk.org \ --cc=john.mcnamara@intel.com \ --cc=m.bilal@emumba.com \ --cc=stable@dpdk.org \ --cc=thomas@monjalon.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git